You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/17 19:37:33 UTC
svn commit: r945264 - in /trafficserver/traffic/trunk: build/common.m4 config.layout configure.ac proxy/Makefile.am proxy/config/records.config.in

Author: mturk
Date: Mon May 17 17:37:32 2010
New Revision: 945264

URL: http://svn.apache.org/viewvc?rev=945264&view=rev
Log:
OK. Now nothing works except make install :)

Modified:
    trafficserver/traffic/trunk/build/common.m4
    trafficserver/traffic/trunk/config.layout
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/proxy/Makefile.am
    trafficserver/traffic/trunk/proxy/config/records.config.in

Modified: trafficserver/traffic/trunk/build/common.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/common.m4?rev=945264&r1=945263&r2=945264&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/common.m4 (original)
+++ trafficserver/traffic/trunk/build/common.m4 Mon May 17 17:37:32 2010
@@ -322,8 +322,8 @@ AC_DEFUN([ATS_LAYOUT], [
     fi
     eval "$var='$val'"
   done
-  for var in bindir sbindir libexecdir sysconfdir datadir \
-             localstatedir logdir libdir runtimedir $3; do
+  for var in bindir sbindir libexecdir mandir infodir sysconfdir \
+             datadir localstatedir runtimedir logdir libdir $3; do
     eval "val=\"\$$var\""
     org_val=
     exp_val="$val"

Modified: trafficserver/traffic/trunk/config.layout
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/config.layout?rev=945264&r1=945263&r2=945264&view=diff
==============================================================================
--- trafficserver/traffic/trunk/config.layout (original)
+++ trafficserver/traffic/trunk/config.layout Mon May 17 17:37:32 2010
@@ -11,8 +11,8 @@
 ##    (This may become a configurable parameter at some point.)
 ##
 
-#   Classical Trafficserver path layout.
-<Layout Trafficserver>
+#   Classical TrafficServer path layout.
+<Layout TrafficServer>
     prefix:        /usr/local/trafficserver
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
@@ -22,7 +22,7 @@
     infodir:       ${prefix}/info
     mandir:        ${prefix}/man
     sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
+    datadir:       ${prefix}/share
     installbuilddir: ${datadir}/build
     includedir:    ${prefix}/include
     localstatedir: ${prefix}
@@ -63,7 +63,7 @@
     infodir:       ${exec_prefix}/share/info
     mandir:        ${exec_prefix}/share/man
     sysconfdir:    ${prefix}/Configuration
-    datadir:       ${prefix}
+    datadir:       ${prefix}/Share
     installbuilddir: /System/Library/TrafficServer/Build
     includedir:    /System/Library/Frameworks/TrafficServer.framework/Versions/2.0/Headers
     localstatedir: /var

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=945264&r1=945263&r2=945264&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Mon May 17 17:37:32 2010
@@ -66,15 +66,15 @@ AC_SUBST(ATS_VERSION_NUMBER)
 #
 # Generate ./config.nice for reproducing runs of configure
 #
-ATS_CONFIG_NICE(config.nice)
+ATS_CONFIG_NICE([config.nice])
 
 # XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in
 # by configure until it is too late.  Is that how it should be or not?
 # Something seems broken here.
-# AC_PREFIX_DEFAULT(/usr/local/trafficserver)
+AC_PREFIX_DEFAULT([/usr/local/trafficserver])
 
 # Get the layout here, so we can pass the required variables to Trafficserver
-# ATS_ENABLE_LAYOUT(Trafficserver, [cachedir])
+ATS_ENABLE_LAYOUT(TrafficServer, [cachedir])
 
 # Reparse the configure arguments so we can override the layout.
 ATS_PARSE_ARGUMENTS
@@ -115,6 +115,7 @@ esac
 build_person="`id -nu`"
 build_group="`id -ng`"
 build_machine="`uname -n`"
+AC_SUBST([build_machine])
 AC_DEFINE_UNQUOTED(BUILD_PERSON, "$build_person")
 AC_DEFINE_UNQUOTED(BUILD_MACHINE, "$build_machine")
 
@@ -352,36 +353,37 @@ AC_MSG_RESULT([$enable_eventfd])
 
 #
 # Installation directories
-#
-
-# default: /usr/local/var/log
-AC_SUBST([logdir],["$localstatedir/log"])
-
-# default: /usr/local/var/log/trafficserver
-AC_SUBST([pkglogdir],["$logdir/trafficserver"])
-
-# default: /usr/local/var/trafficserver
-AC_SUBST([pkglocalstatedir],["$localstatedir/trafficserver"])
+# For each var the following is evaluated
+# foo      Standard variable  eg. ${prefix}/foo
+# rel_foo  Relative to prefix eg. foo
+#
+ATS_SUBST_LAYOUT_PATH([prefix])
+ATS_SUBST_LAYOUT_PATH([exec_prefix])
+ATS_SUBST_LAYOUT_PATH([bindir])
+ATS_SUBST_LAYOUT_PATH([sbindir])
+ATS_SUBST_LAYOUT_PATH([libdir])
+ATS_SUBST_LAYOUT_PATH([libexecdir])
+ATS_SUBST_LAYOUT_PATH([infodir])
+ATS_SUBST_LAYOUT_PATH([mandir])
+ATS_SUBST_LAYOUT_PATH([sysconfdir])
+ATS_SUBST_LAYOUT_PATH([datadir])
+ATS_SUBST_LAYOUT_PATH([installbuilddir])
+ATS_SUBST_LAYOUT_PATH([includedir])
+ATS_SUBST_LAYOUT_PATH([localstatedir])
+ATS_SUBST_LAYOUT_PATH([runtimedir])
+ATS_SUBST_LAYOUT_PATH([logdir])
+ATS_SUBST_LAYOUT_PATH([cachedir])
+
+ATS_SUBST([pkgbindir])
+ATS_SUBST([pkgsbindir])
+ATS_SUBST([pkglibdir])
+ATS_SUBST([pkglibexecdir])
+ATS_SUBST([pkgsysconfdir])
+ATS_SUBST([pkgdatadir])
+ATS_SUBST([pkglocalstatedir])
+ATS_SUBST([pkgruntimedir])
+ATS_SUBST([pkglogdir])
 
-# default: /usr/local/etc/trafficserver
-AC_SUBST([pkgsysconfdir],["$sysconfdir/trafficserver"])
-
-# default: /usr/local/libexec/trafficserver
-AC_SUBST([pkglibexecdir],["$libexecdir/trafficserver"])
-
-# default: /usr/local/share/trafficserver
-AC_SUBST([pkgdatadir],["$datadir/trafficserver"])
-
-# default: /usr/local/bin
-if test "$exec_prefix" = NONE ; then
-  if test "$prefix" = NONE ; then
-   AC_SUBST([pkgbindir],["$ac_default_prefix/bin"])
-  else
-   AC_SUBST([pkgbindir],["$prefix/bin"])
-  fi
-else
- AC_SUBST([pkgbindir],["$exec_prefix/bin"])
-fi
 
 # -----------------------------------------------------------------------------
 # 3. CHECK FOR PROGRAMS

Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=945264&r1=945263&r2=945264&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Mon May 17 17:37:32 2010
@@ -403,11 +403,11 @@ test_xml_parser_SOURCES = test_xml_parse
 versiondir = $(pkgsysconfdir)
 
 install-data-local:
-	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal $(DESTDIR)$(pkgdatadir)
+	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir)  $(DESTDIR)$(pkgruntimedir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal $(DESTDIR)$(pkgdatadir)
 
 install-data-hook:
 	-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir)
-	-echo $(DESTDIR)$(prefix) > $(DESTDIR)$(prefix)/etc/traffic_server
+	-echo $(DESTDIR)$(prefix) > $(DESTDIR)$(sysconfdir)/trafficserver-root
 	-echo "<TS_VERSION> $(PACKAGE_VERSION)" > $(DESTDIR)$(prefix)/etc/trafficserver-release
 
 install-exec-local:
@@ -417,7 +417,7 @@ install-exec-hook:
 	-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
 
 uninstall-hook:
-	-rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir)
-	-rm -f $(DESTDIR)$(prefix)/etc/traffic_server
+	-rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir)
+	-rm -f $(DESTDIR)$(sysconfdir)/trafficserver-root
 
 

Modified: trafficserver/traffic/trunk/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.in?rev=945264&r1=945263&r2=945264&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.in Mon May 17 17:37:32 2010
@@ -19,15 +19,15 @@
 # System Variables
 #
 ##############################################################################
-CONFIG proxy.config.proxy_name STRING <proxy_name>
-CONFIG proxy.config.bin_path STRING @pkgbindir@
+CONFIG proxy.config.proxy_name STRING @build_machine@
+CONFIG proxy.config.bin_path STRING @rel_bindir@
 CONFIG proxy.config.proxy_binary STRING traffic_server
 CONFIG proxy.config.proxy_binary_opts STRING -M
 CONFIG proxy.config.manager_binary STRING traffic_manager
 CONFIG proxy.config.cli_binary STRING traffic_line
 CONFIG proxy.config.watch_script STRING traffic_cop
 CONFIG proxy.config.env_prep STRING example_prep.sh
-CONFIG proxy.config.config_dir STRING etc/@PACKAGE@
+CONFIG proxy.config.config_dir STRING @rel_sysconfdir@
 CONFIG proxy.config.temp_dir STRING /tmp
 CONFIG proxy.config.alarm_email STRING @pkgsysuser@
 CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
@@ -56,7 +56,7 @@ CONFIG proxy.config.cluster.mcport INT 8
 CONFIG proxy.config.cluster.mc_group_addr STRING 224.0.1.37
 CONFIG proxy.config.cluster.mc_ttl INT 1
 CONFIG proxy.config.cluster.log_bogus_mc_msgs INT 1
-CONFIG proxy.config.admin.html_doc_root STRING share/@PACKAGE@
+CONFIG proxy.config.admin.html_doc_root STRING @rel_datadir@
 CONFIG proxy.config.admin.web_interface_port INT 8081
 CONFIG proxy.config.admin.autoconf_port INT 8083
 CONFIG proxy.config.admin.overseer_port INT 9898
@@ -233,7 +233,7 @@ CONFIG proxy.config.http.cache.ignore_se
    #   2 - cache only for image types
    #   3 - cache for all but text content-types
    #   4 - cache for all but text content-types except OS response
-   #       without "Set-Cookie" or with "Cache-Control: public"   
+   #       without "Set-Cookie" or with "Cache-Control: public"
 CONFIG proxy.config.http.cache.cache_responses_to_cookies INT 1
 CONFIG proxy.config.http.cache.ignore_authentication INT 0
 CONFIG proxy.config.http.cache.cache_urls_that_look_dynamic INT 1
@@ -283,7 +283,7 @@ CONFIG proxy.config.http.cache.vary_defa
    # 2 - enable language-targeted user response pages
 CONFIG proxy.config.body_factory.enable_customizations INT 0
 CONFIG proxy.config.body_factory.enable_logging INT 0
-CONFIG proxy.config.body_factory.template_sets_dir STRING etc/@PACKAGE@/body_factory
+CONFIG proxy.config.body_factory.template_sets_dir STRING @rel_sysconfdir@/body_factory
    # 0 - never suppress generated responses
    # 1 - always suppress generated responses
    # 2 - suppress responses for intercepted traffic
@@ -343,7 +343,7 @@ CONFIG proxy.config.cache.enable_read_wh
 CONFIG proxy.config.dns.search_default_domains INT 1
 CONFIG proxy.config.dns.splitDNS.enabled INT 0
 CONFIG proxy.config.dns.splitdns.def_domain STRING NULL
-   # Additional URL expansions for http DNS lookup 
+   # Additional URL expansions for http DNS lookup
 CONFIG proxy.config.dns.url_expansions STRING NULL
 CONFIG proxy.config.dns.round_robin_nameservers INT 0
 CONFIG proxy.config.dns.nameservers STRING NULL
@@ -369,7 +369,7 @@ CONFIG proxy.config.hostdb.size INT 2000
 CONFIG proxy.config.hostdb.ttl_mode INT 0
    # in minutes...
 CONFIG proxy.config.hostdb.timeout INT 1440
-   # round-robin addresses for single clients 
+   # round-robin addresses for single clients
    # (can cause authentication problems)
 CONFIG proxy.config.hostdb.strict_round_robin INT 0
 ##############################################################################
@@ -388,7 +388,7 @@ CONFIG proxy.config.log2.max_space_mb_fo
 CONFIG proxy.config.log2.max_space_mb_for_orphan_logs INT 25
 CONFIG proxy.config.log2.max_space_mb_headroom INT 3000
 CONFIG proxy.config.log2.hostname STRING localhost
-CONFIG proxy.config.log2.logfile_dir STRING var/log/@PACKAGE@
+CONFIG proxy.config.log2.logfile_dir STRING @rel_logdir@
 CONFIG proxy.config.log2.logfile_perm STRING rw-r--r--
 CONFIG proxy.config.log2.custom_logs_enabled INT 0
 # 0: old log format, 1: new xml log format (default)
@@ -447,7 +447,7 @@ CONFIG proxy.config.url_remap.pristine_h
 ##############################################################################
    # proxy.config.ssl.enabled should be:
    #   0 - none
-   #   1 - SSL enabled 
+   #   1 - SSL enabled
 CONFIG proxy.config.ssl.enabled INT 0
    # proxy.config.ssl.accelerator_required should be:
    #   0 - not required
@@ -467,7 +467,7 @@ CONFIG proxy.config.ssl.TLSv1 INT 1
    #   3 - Compaq Atalla accelerator card
 CONFIG proxy.config.ssl.accelerator.type INT 0
    # the following accelerator library paths only need
-   # to be changed if the default path was not used 
+   # to be changed if the default path was not used
    # while installing the accelerator card.
 CONFIG proxy.config.ssl.atalla.lib.path STRING /opt/atalla/lib
 CONFIG proxy.config.ssl.ncipher.lib.path STRING /opt/nfast/toolkits/hwcrhk
@@ -483,12 +483,12 @@ CONFIG proxy.config.ssl.client.certifica
    # for a multiple cert system.
 CONFIG proxy.config.ssl.server.cert.filename STRING server.pem
    # Server cert chain filename is the name of the cert chain file
-   # for a single cert system. 
+   # for a single cert system.
 CONFIG proxy.config.ssl.server.cert_chain.filename STRING NULL
    # This is the path that will be used for both single and
    # multi cert systems.
-CONFIG proxy.config.ssl.server.cert.path STRING etc/@PACKAGE@
-   # Fill in private key file and path only if the server's 
+CONFIG proxy.config.ssl.server.cert.path STRING @rel_sysconfdir@
+   # Fill in private key file and path only if the server's
    # private key is not contained in the server certificate file.
    # For multiple cert systems, if any private key is not contained
    # in the cert file, you must fill in the private key path.
@@ -496,7 +496,7 @@ CONFIG proxy.config.ssl.server.private_k
 CONFIG proxy.config.ssl.server.private_key.path STRING NULL
    # The CA file name and path are the
    # certificate authority certificate that
-   # client certificates will be verified against.   
+   # client certificates will be verified against.
 CONFIG proxy.config.ssl.CA.cert.filename STRING NULL
 CONFIG proxy.config.ssl.CA.cert.path STRING NULL
    ################################
@@ -504,14 +504,14 @@ CONFIG proxy.config.ssl.CA.cert.path STR
    ################################
 CONFIG proxy.config.ssl.client.verify.server INT 0
 CONFIG proxy.config.ssl.client.cert.filename STRING NULL
-CONFIG proxy.config.ssl.client.cert.path STRING etc/@PACKAGE@
-   # Fill in private key file and path only if the client's 
+CONFIG proxy.config.ssl.client.cert.path STRING @rel_sysconfdir@
+   # Fill in private key file and path only if the client's
    # private key is not contained in the client certificate file.
 CONFIG proxy.config.ssl.client.private_key.filename STRING NULL
 CONFIG proxy.config.ssl.client.private_key.path STRING NULL
    # The CA file name and path are the
    # certificate authority certificate that
-   # server certificates will be verified against.   
+   # server certificates will be verified against.
 CONFIG proxy.config.ssl.client.CA.cert.filename STRING NULL
 CONFIG proxy.config.ssl.client.CA.cert.path STRING NULL
 ##############################################################################
@@ -544,7 +544,7 @@ CONFIG proxy.config.update.concurrent_up
 #
 ##############################################################################
    # Directory in which to find plugins
-CONFIG proxy.config.plugin.plugin_dir STRING libexec/@PACKAGE@
+CONFIG proxy.config.plugin.plugin_dir STRING @rel_libexecdir@
 ##############################################################################
 #
 # Remote Access Framework