mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

s/use_zlib/with_zlib/ to be consistent

Browse Source
This commit is contained in:
Mark Andrews 2016-03-02 12:37:41 +11:00
parent a97185d9e0
commit e09b40bec4
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -16757,14 +16757,14 @@ $as_echo_n "checking for zlib library... " >&6; }
# Check whether --with-zlib was given. # Check whether --with-zlib was given.
if test "${with_zlib+set}" = set; then : if test "${with_zlib+set}" = set; then :
withval=$with_zlib; use_zlib="$withval" withval=$with_zlib; with_zlib="$withval"
else else
use_zlib="auto" with_zlib="auto"
fi fi
have_zlib="" have_zlib=""
case "$use_zlib" in case "$with_zlib" in
no) no)
zlib_libs="" zlib_libs=""
;; ;;
@ -16783,13 +16783,13 @@ case "$use_zlib" in
done done
;; ;;
*) *)
if test -f "${use_zlib}/zlib.h" if test -f "${with_zlib}/zlib.h"
then then
zlib_cflags="-I${use_zlib}/include" zlib_cflags="-I${with_zlib}/include"
LIBS="$LIBS -L${use_zlib}/lib" LIBS="$LIBS -L${with_zlib}/lib"
have_zlib="yes" have_zlib="yes"
else 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 fi
;; ;;
esac esac
@ -16857,7 +16857,7 @@ else
have_zlib="" have_zlib=""
fi fi
elif test "X$use_zlib" = Xyes elif test "X$with_zlib" = Xyes
then then
as_fn_error $? "include/zlib.h not found." "$LINENO" 5 as_fn_error $? "include/zlib.h not found." "$LINENO" 5
else else

14
configure.in
View File

@ -2214,10 +2214,10 @@ AC_SUBST(JSONSTATS)
AC_MSG_CHECKING(for zlib library) AC_MSG_CHECKING(for zlib library)
AC_ARG_WITH(zlib, AC_ARG_WITH(zlib,
[ --with-zlib[=PATH] build with zlib for HTTP compression [[default=yes]] ], [ --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="" have_zlib=""
case "$use_zlib" in case "$with_zlib" in
no) no)
zlib_libs="" zlib_libs=""
;; ;;
@ -2236,13 +2236,13 @@ case "$use_zlib" in
done done
;; ;;
*) *)
if test -f "${use_zlib}/zlib.h" if test -f "${with_zlib}/zlib.h"
then then
zlib_cflags="-I${use_zlib}/include" zlib_cflags="-I${with_zlib}/include"
LIBS="$LIBS -L${use_zlib}/lib" LIBS="$LIBS -L${with_zlib}/lib"
have_zlib="yes" have_zlib="yes"
else else
AC_MSG_ERROR([$use_zlib/include/zlib.h not found.]) AC_MSG_ERROR([$with_zlib/include/zlib.h not found.])
fi fi
;; ;;
esac esac
@ -2253,7 +2253,7 @@ then
AC_SEARCH_LIBS([deflate], [z], [], AC_SEARCH_LIBS([deflate], [z], [],
[AC_MSG_ERROR([found zlib include but not library.]) [AC_MSG_ERROR([found zlib include but not library.])
have_zlib=""]) have_zlib=""])
elif test "X$use_zlib" = Xyes elif test "X$with_zlib" = Xyes
then then
AC_MSG_ERROR([include/zlib.h not found.]) AC_MSG_ERROR([include/zlib.h not found.])
else else