Remove unnecessary DIST_SUBDIRS overrides.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/92a76b03 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/92a76b03 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/92a76b03 Branch: refs/heads/master Commit: 92a76b030c585b082f5c54ecc1ef41183db266fa Parents: 6d7c7a1 Author: James Peach <[email protected]> Authored: Tue Feb 23 08:36:50 2016 -0800 Committer: James Peach <[email protected]> Committed: Tue Feb 23 08:36:50 2016 -0800 ---------------------------------------------------------------------- configure.ac | 146 ++++++++++++++++------------------ lib/Makefile.am | 2 - plugins/Makefile.am | 2 - plugins/experimental/Makefile.am | 2 - 4 files changed, 68 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/92a76b03/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 97768fd..e4e68f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1423,6 +1423,11 @@ if test "x${enable_spdy}" = "xyes"; then PKG_CHECK_MODULES([SPDYLAY],[libspdylay]) fi +AC_CHECK_HEADERS([mysql/mysql.h], [has_mysql=1],[has_mysql=0]) +AC_CHECK_LIB([mysqlclient],[mysql_info],[AC_SUBST([LIB_MYSQLCLIENT],["-lmysqlclient"])],[has_mysql=0]) +AC_SUBST(has_mysql) +AM_CONDITIONAL([HAS_MYSQL], [ test "x${has_mysql}" = "x1" ]) + # ----------------------------------------------------------------------------- # 5. CHECK FOR HEADER FILES @@ -1799,7 +1804,8 @@ AM_CONDITIONAL([BUILD_COLLAPSED_CONNECTION_PLUGIN], # # use modular IOCORE # -iocore_include_dirs="-I\$(top_srcdir)/iocore/eventsystem \ +iocore_include_dirs="\ +-I\$(top_srcdir)/iocore/eventsystem \ -I\$(top_srcdir)/iocore/net \ -I\$(top_srcdir)/iocore/aio \ -I\$(top_srcdir)/iocore/hostdb \ @@ -1854,6 +1860,31 @@ AC_CONFIG_FILES([ iocore/net/Makefile iocore/utils/Makefile lib/Makefile + lib/atscppapi/Makefile + lib/atscppapi/examples/Makefile + lib/atscppapi/examples/async_http_fetch/Makefile + lib/atscppapi/examples/async_http_fetch_streaming/Makefile + lib/atscppapi/examples/async_timer/Makefile + lib/atscppapi/examples/boom/Makefile + lib/atscppapi/examples/clientredirect/Makefile + lib/atscppapi/examples/clientrequest/Makefile + lib/atscppapi/examples/custom_error_remap_plugin/Makefile + lib/atscppapi/examples/customresponse/Makefile + lib/atscppapi/examples/globalhook/Makefile + lib/atscppapi/examples/gzip_transformation/Makefile + lib/atscppapi/examples/helloworld/Makefile + lib/atscppapi/examples/intercept/Makefile + lib/atscppapi/examples/internal_transaction_handling/Makefile + lib/atscppapi/examples/logger_example/Makefile + lib/atscppapi/examples/multiple_transaction_hooks/Makefile + lib/atscppapi/examples/null_transformation_plugin/Makefile + lib/atscppapi/examples/post_buffer/Makefile + lib/atscppapi/examples/remap_plugin/Makefile + lib/atscppapi/examples/serverresponse/Makefile + lib/atscppapi/examples/stat_example/Makefile + lib/atscppapi/examples/timeout_example/Makefile + lib/atscppapi/examples/transactionhook/Makefile + lib/atscppapi/src/Makefile lib/bindings/Makefile lib/perl/Makefile lib/perl/lib/Apache/TS.pm @@ -1871,6 +1902,42 @@ AC_CONFIG_FILES([ plugins/Makefile plugins/cacheurl/Makefile plugins/conf_remap/Makefile + plugins/experimental/Makefile + plugins/experimental/authproxy/Makefile + plugins/experimental/background_fetch/Makefile + plugins/experimental/balancer/Makefile + plugins/experimental/buffer_upload/Makefile + plugins/experimental/cache_promote/Makefile + plugins/experimental/cache_range_requests/Makefile + plugins/experimental/cachekey/Makefile + plugins/experimental/channel_stats/Makefile + plugins/experimental/collapsed_connection/Makefile + plugins/experimental/custom_redirect/Makefile + plugins/experimental/epic/Makefile + plugins/experimental/escalate/Makefile + plugins/experimental/esi/Makefile + plugins/experimental/generator/Makefile + plugins/experimental/geoip_acl/Makefile + plugins/experimental/header_normalize/Makefile + plugins/experimental/hipes/Makefile + plugins/experimental/inliner/Makefile + plugins/experimental/memcache/Makefile + plugins/experimental/memcached_remap/Makefile + plugins/experimental/metalink/Makefile + plugins/experimental/mp4/Makefile + plugins/experimental/multiplexer/Makefile + plugins/experimental/mysql_remap/Makefile + plugins/experimental/regex_revalidate/Makefile + plugins/experimental/remap_stats/Makefile + plugins/experimental/s3_auth/Makefile + plugins/experimental/ssl_cert_loader/Makefile + plugins/experimental/sslheaders/Makefile + plugins/experimental/stale_while_revalidate/Makefile + plugins/experimental/stream_editor/Makefile + plugins/experimental/ts_lua/Makefile + plugins/experimental/url_sig/Makefile + plugins/experimental/webp_transform/Makefile + plugins/experimental/xdebug/Makefile plugins/gzip/Makefile plugins/header_rewrite/Makefile plugins/healthchecks/Makefile @@ -1903,83 +1970,6 @@ AC_CONFIG_FILES([ tools/tsxs ]) -AC_CHECK_HEADERS([mysql/mysql.h], [has_mysql=1],[has_mysql=0]) -AC_CHECK_LIB([mysqlclient],[mysql_info],[AC_SUBST([LIB_MYSQLCLIENT],["-lmysqlclient"])],[has_mysql=0]) -AC_SUBST(has_mysql) -AM_CONDITIONAL([HAS_MYSQL], [ test "x${has_mysql}" = "x1" ]) - -AS_IF([test "x$enable_experimental_plugins" = "xyes"], [ - AC_CONFIG_FILES([ - plugins/experimental/Makefile - plugins/experimental/authproxy/Makefile - plugins/experimental/background_fetch/Makefile - plugins/experimental/balancer/Makefile - plugins/experimental/buffer_upload/Makefile - plugins/experimental/cache_range_requests/Makefile - plugins/experimental/channel_stats/Makefile - plugins/experimental/cachekey/Makefile - plugins/experimental/cache_promote/Makefile - plugins/experimental/collapsed_connection/Makefile - plugins/experimental/custom_redirect/Makefile - plugins/experimental/epic/Makefile - plugins/experimental/escalate/Makefile - plugins/experimental/esi/Makefile - plugins/experimental/generator/Makefile - plugins/experimental/geoip_acl/Makefile - plugins/experimental/header_normalize/Makefile - plugins/experimental/hipes/Makefile - plugins/experimental/inliner/Makefile - plugins/experimental/memcache/Makefile - plugins/experimental/memcached_remap/Makefile - plugins/experimental/metalink/Makefile - plugins/experimental/multiplexer/Makefile - plugins/experimental/mysql_remap/Makefile - plugins/experimental/regex_revalidate/Makefile - plugins/experimental/remap_stats/Makefile - plugins/experimental/s3_auth/Makefile - plugins/experimental/ssl_cert_loader/Makefile - plugins/experimental/sslheaders/Makefile - plugins/experimental/stale_while_revalidate/Makefile - plugins/experimental/ts_lua/Makefile - plugins/experimental/url_sig/Makefile - plugins/experimental/xdebug/Makefile - plugins/experimental/mp4/Makefile - plugins/experimental/stream_editor/Makefile -])]) - -AS_IF([test "x$enable_webp_transform_plugin" = "xyes"], [ - AC_CONFIG_FILES([plugins/experimental/webp_transform/Makefile]) -]) - -AS_IF([test "x$enable_cppapi" = "xyes"], [ - AC_CONFIG_FILES([ - lib/atscppapi/Makefile - lib/atscppapi/examples/Makefile - lib/atscppapi/examples/async_http_fetch/Makefile - lib/atscppapi/examples/async_timer/Makefile - lib/atscppapi/examples/clientredirect/Makefile - lib/atscppapi/examples/clientrequest/Makefile - lib/atscppapi/examples/customresponse/Makefile - lib/atscppapi/examples/boom/Makefile - lib/atscppapi/examples/globalhook/Makefile - lib/atscppapi/examples/gzip_transformation/Makefile - lib/atscppapi/examples/helloworld/Makefile - lib/atscppapi/examples/intercept/Makefile - lib/atscppapi/examples/internal_transaction_handling/Makefile - lib/atscppapi/examples/logger_example/Makefile - lib/atscppapi/examples/multiple_transaction_hooks/Makefile - lib/atscppapi/examples/null_transformation_plugin/Makefile - lib/atscppapi/examples/post_buffer/Makefile - lib/atscppapi/examples/remap_plugin/Makefile - lib/atscppapi/examples/custom_error_remap_plugin/Makefile - lib/atscppapi/examples/serverresponse/Makefile - lib/atscppapi/examples/stat_example/Makefile - lib/atscppapi/examples/timeout_example/Makefile - lib/atscppapi/examples/transactionhook/Makefile - lib/atscppapi/examples/async_http_fetch_streaming/Makefile - lib/atscppapi/src/Makefile -])]) - # ----------------------------------------------------------------------------- # 7. autoheader TEMPLATES http://git-wip-us.apache.org/repos/asf/trafficserver/blob/92a76b03/lib/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/Makefile.am b/lib/Makefile.am index 685b6be..79aaf95 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -30,8 +30,6 @@ if ENABLE_CPPAPI SUBDIRS += atscppapi endif -DIST_SUBDIRS = $(SUBDIRS) - # Some special hacks around building the luajit. # # - Copy the luajit source tree if we're doing out-of-source builds http://git-wip-us.apache.org/repos/asf/trafficserver/blob/92a76b03/plugins/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 0c34f82..2f4d9df 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -30,5 +30,3 @@ SUBDIRS = \ if BUILD_EXPERIMENTAL_PLUGINS SUBDIRS += experimental endif - -DIST_SUBDIRS = $(SUBDIRS) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/92a76b03/plugins/experimental/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am index 0fdb00b..89150a2 100644 --- a/plugins/experimental/Makefile.am +++ b/plugins/experimental/Makefile.am @@ -58,5 +58,3 @@ endif if BUILD_LUAJIT SUBDIRS += ts_lua endif - -DIST_SUBDIRS = $(SUBDIRS)
