Automatically AC_SUBST USE variables.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6cf460d8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6cf460d8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6cf460d8 Branch: refs/heads/master Commit: 6cf460d82121939976cd3cd8254735eb8299b21a Parents: e0f8cf1 Author: James Peach <[email protected]> Authored: Thu Feb 11 10:36:02 2016 -0800 Committer: James Peach <[email protected]> Committed: Thu Feb 18 09:12:09 2016 -0800 ---------------------------------------------------------------------- build/common.m4 | 2 ++ configure.ac | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6cf460d8/build/common.m4 ---------------------------------------------------------------------- diff --git a/build/common.m4 b/build/common.m4 index 1be57e6..42f316c 100644 --- a/build/common.m4 +++ b/build/common.m4 @@ -544,6 +544,7 @@ dnl dnl Note: As with AC_ARG_ENABLE, non-alphanumeric characters are dnl transformed to underscores. dnl +dnl This macro also AC_SUBST's the constructed variable name. AC_DEFUN([TS_ARG_ENABLE_VAR],[ tsl_prefix="AS_TR_SH($1)" tsl_stem="AS_TR_SH($2)" @@ -552,6 +553,7 @@ AC_DEFUN([TS_ARG_ENABLE_VAR],[ [eval "${tsl_prefix}_${tsl_stem}=1"], [eval "${tsl_prefix}_${tsl_stem}=0"] ) + AC_SUBST(m4_join([_], $1, AS_TR_SH($2))) ]) dnl http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6cf460d8/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index d6c74d4..a3aa6ca 100644 --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,6 @@ AC_ARG_ENABLE([fast-sdk], ) AC_MSG_RESULT([$enable_fast_sdk]) TS_ARG_ENABLE_VAR([use], [fast-sdk]) -AC_SUBST(use_fast_sdk) # # Diags @@ -211,7 +210,6 @@ AC_ARG_ENABLE([diags], ) AC_MSG_RESULT([$enable_diags]) TS_ARG_ENABLE_VAR([use], [diags]) -AC_SUBST(use_diags) # # Build regression tests? @@ -225,7 +223,6 @@ AC_ARG_ENABLE([tests], ) AC_MSG_RESULT([$enable_tests]) TS_ARG_ENABLE_VAR([has], [tests]) -AC_SUBST(has_tests) AM_CONDITIONAL([BUILD_TESTS], [test 0 -ne $has_tests]) # @@ -266,7 +263,6 @@ AC_ARG_ENABLE([wccp], ) AC_MSG_RESULT([$enable_wccp]) TS_ARG_ENABLE_VAR([has],[wccp]) -AC_SUBST(has_wccp) AM_CONDITIONAL([BUILD_WCCP], [test 0 -ne $has_wccp]) # Google profiler @@ -353,7 +349,6 @@ AC_ARG_ENABLE([spdy], [enable_spdy="no"]) AC_MSG_RESULT([$enable_spdy]) TS_ARG_ENABLE_VAR([has], [spdy]) -AC_SUBST(has_spdy) AM_CONDITIONAL([BUILD_SPDY], [test 0 -ne $has_spdy]) # @@ -467,7 +462,6 @@ AC_ARG_ENABLE([luajit], AC_MSG_RESULT([$enable_luajit]) AM_CONDITIONAL([BUILD_LUAJIT], [ test "x${enable_luajit}" = "xyes" ]) TS_ARG_ENABLE_VAR([use], [luajit]) -AC_SUBST(use_luajit) # # Check if we should allow builds on 32-bit platforms @@ -1203,7 +1197,6 @@ AS_IF([test "$host_os_def" = "linux"], [ ]) ]) TS_ARG_ENABLE_VAR([use], [remote_unwinding]) -AC_SUBST(use_remote_unwinding) use_epoll=0 use_kqueue=0 @@ -1328,7 +1321,6 @@ AS_IF([test "x$enable_linux_native_aio" = "xyes"], [ AC_MSG_RESULT([$enable_linux_native_aio]) TS_ARG_ENABLE_VAR([use], [linux_native_aio]) -AC_SUBST(use_linux_native_aio) # Check for hwloc library. # If we don't find it, disable checking for header.
