Browse Source

[2367] Rename AM conditional variable

Mukund Sivaraman 11 years ago
parent
commit
cef692f035
4 changed files with 11 additions and 11 deletions
  1. 7 7
      configure.ac
  2. 1 1
      src/bin/Makefile.am
  3. 1 1
      src/lib/Makefile.am
  4. 2 2
      tests/lettuce/setup_intree_bind10.sh.in

+ 7 - 7
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

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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