[2367] Rename AM conditional variable

diff --git a/configure.ac b/configure.ac
index 8b86b6ace44796f1dc89694318784b8b76a27263..ed51ce393812b24610688fe5e39e8a6be5934c0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,18 +24,18 @@ AC_CONFIG_MACRO_DIR([m4macros])
 # Checks for programs.
 AC_PROG_CXX
 
-build_experimental_resolver=no
+want_experimental_resolver=no
 AC_ARG_ENABLE(experimental-resolver,
   [AC_HELP_STRING([--enable-experimental-resolver],
   [enable building of the experimental resolver [default=no]])],
-  [build_experimental_resolver=$enableval])
-AM_CONDITIONAL([BUILD_EXPERIMENTAL_RESOLVER], [test "$build_experimental_resolver" = "yes"])
-if test "$build_experimental_resolver" = "yes"; then
-   BUILD_EXPERIMENTAL_RESOLVER=yes
+  [want_experimental_resolver=$enableval])
+AM_CONDITIONAL([WANT_EXPERIMENTAL_RESOLVER], [test "$want_experimental_resolver" = "yes"])
+if test "$want_experimental_resolver" = "yes"; then
+   WANT_EXPERIMENTAL_RESOLVER=yes
 else
-   BUILD_EXPERIMENTAL_RESOLVER=no
+   WANT_EXPERIMENTAL_RESOLVER=no
 fi
-AC_SUBST(BUILD_EXPERIMENTAL_RESOLVER)
+AC_SUBST(WANT_EXPERIMENTAL_RESOLVER)
 
 # Enable low-performing debugging facilities? This option optionally
 # enables some debugging aids that perform slowly and hence aren't built

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ea2f1b293f9a561488c4f76e9374cb34ff07b125..2e0e32f03ae59c063c6b09f0deb1e3b1118e1565 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,4 +1,4 @@
-if BUILD_EXPERIMENTAL_RESOLVER
+if WANT_EXPERIMENTAL_RESOLVER
 # Build resolver only with --enable-experimental-resolver
 experimental_resolver = resolver
 endif

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 59cb8e18794d7807632070a69bcc875ad4d1d7c2..df0c57ca5f5b38fa8e4340cf1d46a8999e4101b5 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,4 @@
-if BUILD_EXPERIMENTAL_RESOLVER
+if WANT_EXPERIMENTAL_RESOLVER
 # Build resolver only with --enable-experimental-resolver
 experimental_resolver = resolve
 endif

diff --git a/tests/lettuce/setup_intree_bind10.sh.in b/tests/lettuce/setup_intree_bind10.sh.in
index 600f5c4c5631b41c93204da5eac56c86d5c8f8d6..d23c13ae5569e47bfc605c6f0938d961fe3aedaf 100755 (executable)
--- a/tests/lettuce/setup_intree_bind10.sh.in
+++ b/tests/lettuce/setup_intree_bind10.sh.in
@@ -34,8 +34,8 @@ if test $SET_ENV_LIBRARY_PATH = yes; then
        export @ENV_LIBRARY_PATH@
 fi
 
-BUILD_EXPERIMENTAL_RESOLVER=@BUILD_EXPERIMENTAL_RESOLVER@
-if test $BUILD_EXPERIMENTAL_RESOLVER = yes; then
+WANT_EXPERIMENTAL_RESOLVER=@WANT_EXPERIMENTAL_RESOLVER@
+if test $WANT_EXPERIMENTAL_RESOLVER = yes; then
     cp -f @srcdir@/features/resolver_basic.feature.disabled @srcdir@/features/resolver_basic.feature
 fi