You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/06/25 23:06:54 UTC

[1/2] git commit: Tidy up AC_CONFIG_FILES definition

Updated Branches:
  refs/heads/master e4b955aef -> 3a906a4d2


Tidy up AC_CONFIG_FILES definition


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/773a1a04
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/773a1a04
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/773a1a04

Branch: refs/heads/master
Commit: 773a1a04b90bfd5e16ccee2c6f41793c0d8022c7
Parents: e4b955a
Author: James Peach <jp...@apache.org>
Authored: Tue Jun 25 14:04:37 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jun 25 14:04:37 2013 -0700

----------------------------------------------------------------------
 configure.ac | 147 +++++++++++++++++++++++++++---------------------------
 1 file changed, 73 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/773a1a04/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 48ec418..899caa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1809,80 +1809,79 @@ AC_SUBST([TFW_PACKAGE_SUFFIX])
 # -----------------------------------------------------------------------------
 # 6. OUTPUT FILES
 
-AC_CONFIG_FILES([lib/ts/ink_config.h proxy/api/ts/ts.h])
-AC_CONFIG_FILES([tools/tsxs])
-AC_CONFIG_FILES([doc/Doxyfile])
-AC_CONFIG_FILES([doc/Makefile])
-AC_CONFIG_FILES([rc/Makefile])
-AC_CONFIG_FILES([rc/trafficserver])
-AC_CONFIG_FILES([rc/trafficserver.xml])
-AC_CONFIG_FILES([rc/trafficserver.conf])
-AC_CONFIG_FILES([rc/trafficserver.service])
-AC_CONFIG_FILES([iocore/aio/Makefile])
-AC_CONFIG_FILES([iocore/cache/Makefile])
-AC_CONFIG_FILES([iocore/cluster/Makefile])
-AC_CONFIG_FILES([iocore/dns/Makefile])
-AC_CONFIG_FILES([iocore/eventsystem/Makefile])
-AC_CONFIG_FILES([iocore/hostdb/Makefile])
-AC_CONFIG_FILES([iocore/Makefile])
-AC_CONFIG_FILES([iocore/net/Makefile])
-AC_CONFIG_FILES([iocore/utils/Makefile])
-AC_CONFIG_FILES([lib/Makefile])
-AC_CONFIG_FILES([lib/ts/Makefile])
-AC_CONFIG_FILES([lib/records/Makefile])
-AC_CONFIG_FILES([lib/cpp11api/Makefile])
-AC_CONFIG_FILES([lib/tsconfig/Makefile])
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([proxy/config/body_factory/default/Makefile])
-AC_CONFIG_FILES([proxy/config/body_factory/Makefile])
-AC_CONFIG_FILES([proxy/config/records.config.default proxy/config/storage.config.default])
-AC_CONFIG_FILES([proxy/config/Makefile])
-AC_CONFIG_FILES([proxy/congest/Makefile])
-AC_CONFIG_FILES([proxy/hdrs/Makefile])
-AC_CONFIG_FILES([proxy/http/Makefile])
-AC_CONFIG_FILES([proxy/http/remap/Makefile])
-AC_CONFIG_FILES([proxy/logging/Makefile])
-AC_CONFIG_FILES([proxy/Makefile])
-AC_CONFIG_FILES([mgmt/api/Makefile])
-AC_CONFIG_FILES([mgmt/api/remote/Makefile])
-AC_CONFIG_FILES([mgmt/api/include/Makefile])
-AC_CONFIG_FILES([mgmt/cli/Makefile])
-AC_CONFIG_FILES([mgmt/cluster/Makefile])
-AC_CONFIG_FILES([mgmt/Makefile])
-AC_CONFIG_FILES([mgmt/preparse/Makefile])
-AC_CONFIG_FILES([mgmt/stats/Makefile])
-AC_CONFIG_FILES([mgmt/tools/Makefile])
-AC_CONFIG_FILES([mgmt/utils/Makefile])
-AC_CONFIG_FILES([mgmt/web2/Makefile])
-AC_CONFIG_FILES([lib/wccp/Makefile])
-AC_CONFIG_FILES([proxy/api/ts/Makefile])
-# Traffic Cop
-AC_CONFIG_FILES([cop/Makefile])
-# production plugins
-AC_CONFIG_FILES([plugins/Makefile])
-AC_CONFIG_FILES([plugins/conf_remap/Makefile])
-AC_CONFIG_FILES([plugins/regex_remap/Makefile])
-AC_CONFIG_FILES([plugins/header_filter/Makefile])
-AC_CONFIG_FILES([plugins/stats_over_http/Makefile])
-AC_CONFIG_FILES([plugins/cacheurl/Makefile])
-AC_CONFIG_FILES([plugins/header_rewrite/Makefile])
-# experimental plugins
-AC_CONFIG_FILES([plugins/experimental/Makefile])
-AC_CONFIG_FILES([plugins/experimental/esi/Makefile])
-AC_CONFIG_FILES([plugins/experimental/lua/Makefile])
-AC_CONFIG_FILES([plugins/experimental/rfc5861/Makefile])
-AC_CONFIG_FILES([plugins/experimental/tcp_info/Makefile])
-AC_CONFIG_FILES([plugins/experimental/custom_redirect/Makefile])
-AC_CONFIG_FILES([plugins/experimental/metalink/Makefile])
-AC_CONFIG_FILES([plugins/experimental/gzip/Makefile])
-AC_CONFIG_FILES([plugins/experimental/spdy/Makefile])
-AC_CONFIG_FILES([plugins/experimental/channel_stats/Makefile])
-AC_CONFIG_FILES([plugins/experimental/authproxy/Makefile])
-AC_CONFIG_FILES([plugins/experimental/geoip_acl/Makefile])
-# various tools
-AC_CONFIG_FILES([tools/Makefile])
-# example plugins
-AC_CONFIG_FILES([example/Makefile])
+AC_CONFIG_FILES([
+  Makefile
+  cop/Makefile
+  doc/Doxyfile
+  doc/Makefile
+  example/Makefile
+  iocore/Makefile
+  iocore/aio/Makefile
+  iocore/cache/Makefile
+  iocore/cluster/Makefile
+  iocore/dns/Makefile
+  iocore/eventsystem/Makefile
+  iocore/hostdb/Makefile
+  iocore/net/Makefile
+  iocore/utils/Makefile
+  lib/Makefile
+  lib/cpp11api/Makefile
+  lib/records/Makefile
+  lib/ts/Makefile
+  lib/ts/ink_config.h
+  lib/tsconfig/Makefile
+  lib/wccp/Makefile
+  mgmt/Makefile
+  mgmt/api/Makefile
+  mgmt/api/include/Makefile
+  mgmt/api/remote/Makefile
+  mgmt/cli/Makefile
+  mgmt/cluster/Makefile
+  mgmt/preparse/Makefile
+  mgmt/stats/Makefile
+  mgmt/tools/Makefile
+  mgmt/utils/Makefile
+  mgmt/web2/Makefile
+  plugins/Makefile
+  plugins/cacheurl/Makefile
+  plugins/conf_remap/Makefile
+  plugins/experimental/Makefile
+  plugins/experimental/authproxy/Makefile
+  plugins/experimental/channel_stats/Makefile
+  plugins/experimental/custom_redirect/Makefile
+  plugins/experimental/esi/Makefile
+  plugins/experimental/geoip_acl/Makefile
+  plugins/experimental/gzip/Makefile
+  plugins/experimental/lua/Makefile
+  plugins/experimental/metalink/Makefile
+  plugins/experimental/rfc5861/Makefile
+  plugins/experimental/spdy/Makefile
+  plugins/experimental/tcp_info/Makefile
+  plugins/header_filter/Makefile
+  plugins/header_rewrite/Makefile
+  plugins/regex_remap/Makefile
+  plugins/stats_over_http/Makefile
+  proxy/Makefile
+  proxy/api/ts/Makefile
+  proxy/api/ts/ts.h
+  proxy/config/Makefile
+  proxy/config/body_factory/Makefile
+  proxy/config/body_factory/default/Makefile
+  proxy/config/records.config.default
+  proxy/config/storage.config.default
+  proxy/congest/Makefile
+  proxy/hdrs/Makefile
+  proxy/http/Makefile
+  proxy/http/remap/Makefile
+  proxy/logging/Makefile
+  rc/Makefile
+  rc/trafficserver
+  rc/trafficserver.conf
+  rc/trafficserver.service
+  rc/trafficserver.xml
+  tools/Makefile
+  tools/tsxs
+])
 
 # -----------------------------------------------------------------------------
 # 7. autoheader TEMPLATES


[2/2] git commit: Improved build option formatting

Posted by jp...@apache.org.
Improved build option formatting


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3a906a4d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3a906a4d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3a906a4d

Branch: refs/heads/master
Commit: 3a906a4d29e585c414d954180a2f1ceb1507e50a
Parents: 773a1a0
Author: James Peach <jp...@apache.org>
Authored: Tue Jun 25 14:06:11 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jun 25 14:06:11 2013 -0700

----------------------------------------------------------------------
 configure.ac | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3a906a4d/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 899caa5..cfeff5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1771,23 +1771,6 @@ TFW_PACKAGE_SUFFIX=$os_type
 
 MGMT_DEFS="$MGMT_DEFS -DMGMT_USE_SYSLOG"
 
-AC_MSG_NOTICE([Build using CC=$CC])
-AC_MSG_NOTICE([Build using CXX=$CXX])
-AC_MSG_NOTICE([Build using CPP=$CPP])
-AC_MSG_NOTICE([Build using CFLAGS=$CFLAGS])
-AC_MSG_NOTICE([Build using SHARED_CFLAGS=$SHARED_CFLAGS])
-AC_MSG_NOTICE([Build using CXXFLAGS=$CXXFLAGS])
-AC_MSG_NOTICE([Build using SHARED_CXXFLAGS=$SHARED_CXXFLAGS])
-AC_MSG_NOTICE([Build using SHARED_CXXLINKFLAGS=$SHARED_LINKCXXFLAGS])
-AC_MSG_NOTICE([Build using CPPFLAGS=$CPPFLAGS])
-AC_MSG_NOTICE([Build using LDFLAGS=$LDFLAGS])
-AC_MSG_NOTICE([Build using SHARED_LDFLAGS=$SHARED_LDFLAGS])
-AC_MSG_NOTICE([Build using EXTRA_CC_LDFLAGS=$EXTRA_CC_LDFLAGS])
-AC_MSG_NOTICE([Build using EXTRA_CXX_LDFLAGS=$EXTRA_CXX_LDFLAGS])
-AC_MSG_NOTICE([Build using LIBTOOL_LINK_FLAGS=$LIBTOOL_LINK_FLAGS])
-AC_MSG_NOTICE([Build using MGMT_DEFS=$MGMT_DEFS])
-AC_MSG_NOTICE([Build using API_DEFS=$API_DEFS])
-
 AC_SUBST([API_DEFS])
 AC_SUBST([CC])
 AC_SUBST([CFLAGS])
@@ -1887,3 +1870,22 @@ AC_CONFIG_FILES([
 # 7. autoheader TEMPLATES
 
 AC_OUTPUT
+
+AC_MSG_NOTICE([Build option summary:
+    CC:                 $CC
+    CXX:                $CXX
+    CPP:                $CPP
+    CFLAGS:             $CFLAGS
+    SHARED_CFLAGS:      $SHARED_CFLAGS
+    CXXFLAGS:           $CXXFLAGS
+    SHARED_CXXFLAGS:    $SHARED_CXXFLAGS
+    SHARED_CXXLINKFLAGS:$SHARED_LINKCXXFLAGS
+    CPPFLAGS:           $CPPFLAGS
+    LDFLAGS:            $LDFLAGS
+    SHARED_LDFLAGS:     $SHARED_LDFLAGS
+    EXTRA_CC_LDFLAGS:   $EXTRA_CC_LDFLAGS
+    EXTRA_CXX_LDFLAGS:  $EXTRA_CXX_LDFLAGS
+    LIBTOOL_LINK_FLAGS: $LIBTOOL_LINK_FLAGS
+    MGMT_DEFS:          $MGMT_DEFS
+    API_DEFS:           $API_DEFS
+])