]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
s/use_zlib/with_zlib/ to be consistent
authorMark Andrews <marka@isc.org>
Wed, 2 Mar 2016 01:37:41 +0000 (12:37 +1100)
committerMark Andrews <marka@isc.org>
Wed, 2 Mar 2016 01:37:41 +0000 (12:37 +1100)
configure
configure.in

index fbdb2b77cbe8ec84f6b16d12d46277f4c2b43826..f565d64e8582ce271e77a76930eecc21f287d58a 100755 (executable)
--- a/configure
+++ b/configure
@@ -16757,14 +16757,14 @@ $as_echo_n "checking for zlib library... " >&6; }
 
 # Check whether --with-zlib was given.
 if test "${with_zlib+set}" = set; then :
-  withval=$with_zlib; use_zlib="$withval"
+  withval=$with_zlib; with_zlib="$withval"
 else
-  use_zlib="auto"
+  with_zlib="auto"
 fi
 
 
 have_zlib=""
-case "$use_zlib" in
+case "$with_zlib" in
        no)
                zlib_libs=""
                ;;
@@ -16783,13 +16783,13 @@ case "$use_zlib" in
                done
                ;;
        *)
-               if test -f "${use_zlib}/zlib.h"
+               if test -f "${with_zlib}/zlib.h"
                then
-                       zlib_cflags="-I${use_zlib}/include"
-                       LIBS="$LIBS -L${use_zlib}/lib"
+                       zlib_cflags="-I${with_zlib}/include"
+                       LIBS="$LIBS -L${with_zlib}/lib"
                        have_zlib="yes"
                else
-                       as_fn_error $? "$use_zlib/include/zlib.h not found." "$LINENO" 5
+                       as_fn_error $? "$with_zlib/include/zlib.h not found." "$LINENO" 5
                fi
                ;;
 esac
@@ -16857,7 +16857,7 @@ else
                        have_zlib=""
 fi
 
-elif test "X$use_zlib" = Xyes
+elif test "X$with_zlib" = Xyes
 then
        as_fn_error $? "include/zlib.h not found." "$LINENO" 5
 else
index ea1023f68166f053f4b1a327a9018c94589eb7f7..5acc87e11a7fe6e96f7a40754683fea0b390260a 100644 (file)
@@ -2214,10 +2214,10 @@ AC_SUBST(JSONSTATS)
 AC_MSG_CHECKING(for zlib library)
 AC_ARG_WITH(zlib,
 [  --with-zlib[=PATH]        build with zlib for HTTP compression [[default=yes]] ],
-    use_zlib="$withval", use_zlib="auto")
+    with_zlib="$withval", with_zlib="auto")
 
 have_zlib=""
-case "$use_zlib" in
+case "$with_zlib" in
        no)
                zlib_libs=""
                ;;
@@ -2236,13 +2236,13 @@ case "$use_zlib" in
                done
                ;;
        *)
-               if test -f "${use_zlib}/zlib.h"
+               if test -f "${with_zlib}/zlib.h"
                then
-                       zlib_cflags="-I${use_zlib}/include"
-                       LIBS="$LIBS -L${use_zlib}/lib"
+                       zlib_cflags="-I${with_zlib}/include"
+                       LIBS="$LIBS -L${with_zlib}/lib"
                        have_zlib="yes"
                else
-                       AC_MSG_ERROR([$use_zlib/include/zlib.h not found.])
+                       AC_MSG_ERROR([$with_zlib/include/zlib.h not found.])
                fi
                ;;
 esac
@@ -2253,7 +2253,7 @@ then
        AC_SEARCH_LIBS([deflate], [z], [],
                       [AC_MSG_ERROR([found zlib include but not library.])
                        have_zlib=""])
-elif test "X$use_zlib" = Xyes
+elif test "X$with_zlib" = Xyes
 then
        AC_MSG_ERROR([include/zlib.h not found.])
 else