moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Fixed the --with-zlib configure option so that it always adds the specified

Browse Source 
path to the compiler flags.  Before, a zlib installation in the default
path was always used in preference to the one in the desired location.
This commit is contained in:
Dan Fandrich 2005-03-08 03:24:49 +00:00
parent dc59795629
commit 18d87edd6d
1 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
configure.ac
View File

@ -941,71 +941,78 @@ dnl Check for & handle argument to --with-zlib.
_cppflags=$CPPFLAGS _cppflags=$CPPFLAGS
_ldflags=$LDFLAGS _ldflags=$LDFLAGS
OPT_ZLIB="/usr/local"
AC_ARG_WITH(zlib, AC_ARG_WITH(zlib,
AC_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH]) AC_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
AC_HELP_STRING([--without-zlib],[disable use of zlib]), AC_HELP_STRING([--without-zlib],[disable use of zlib]),
[OPT_ZLIB="$withval"]) [OPT_ZLIB="$withval"])
case "$OPT_ZLIB" in if test "$OPT_ZLIB" = "no" ; then
no) AC_MSG_WARN([zlib disabled])
AC_MSG_WARN([zlib disabled]) ;; else
*) if test "$OPT_ZLIB" = "yes" ; then
OPT_ZLIB=""
fi
if test -z "$OPT_ZLIB" ; then
dnl check for the lib first without setting any new path, since many dnl check for the lib first without setting any new path, since many
dnl people have it in the default path dnl people have it in the default path
AC_CHECK_LIB(z, inflateEnd, AC_CHECK_LIB(z, inflateEnd,
dnl libz found, set the variable dnl libz found, set the variable
[HAVE_LIBZ="1"], [HAVE_LIBZ="1"],
dnl if no lib found, try to add the given library dnl if no lib found, try /usr/local
[if test -d "$OPT_ZLIB"; then [OPT_ZLIB="/usr/local"])
CPPFLAGS="$CPPFLAGS -I$OPT_ZLIB/include"
LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib$libsuff"
fi])
AC_CHECK_HEADER(zlib.h, fi
[
dnl zlib.h was found
HAVE_ZLIB_H="1"
dnl if the lib wasn't found already, try again with the new paths
if test "$HAVE_LIBZ" != "1"; then
AC_CHECK_LIB(z, gzread,
[
dnl the lib was found!
HAVE_LIBZ="1"
],
[ CPPFLAGS=$_cppflags
LDFLAGS=$_ldflags])
fi
],
[
dnl zlib.h was not found, restore the flags
CPPFLAGS=$_cppflags
LDFLAGS=$_ldflags]
)
if test "$HAVE_LIBZ" = "1" && test "$HAVE_ZLIB_H" != "1" dnl Add a nonempty path to the compiler flags
then if test -n "$OPT_ZLIB"; then
AC_MSG_WARN([configure found only the libz lib, not the header file!]) CPPFLAGS="$CPPFLAGS -I$OPT_ZLIB/include"
elif test "$HAVE_LIBZ" != "1" && test "$HAVE_ZLIB_H" = "1" LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib$libsuff"
then fi
AC_MSG_WARN([configure found only the libz header file, not the lib!])
elif test "$HAVE_LIBZ" = "1" && test "$HAVE_ZLIB_H" = "1"
then
dnl both header and lib were found!
AC_SUBST(HAVE_LIBZ)
AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available])
LIBS="$LIBS -lz" AC_CHECK_HEADER(zlib.h,
[
dnl replace 'HAVE_LIBZ' in the automake makefile.ams dnl zlib.h was found
AMFIXLIB="1" HAVE_ZLIB_H="1"
AC_MSG_NOTICE([found both libz and libz.h header]) dnl if the lib wasn't found already, try again with the new paths
curl_zlib_msg="enabled" if test "$HAVE_LIBZ" != "1"; then
AC_CHECK_LIB(z, gzread,
[
dnl the lib was found!
HAVE_LIBZ="1"
],
[ CPPFLAGS=$_cppflags
LDFLAGS=$_ldflags])
fi fi
;; ],
esac [
dnl zlib.h was not found, restore the flags
CPPFLAGS=$_cppflags
LDFLAGS=$_ldflags]
)
if test "$HAVE_LIBZ" = "1" && test "$HAVE_ZLIB_H" != "1"
then
AC_MSG_WARN([configure found only the libz lib, not the header file!])
elif test "$HAVE_LIBZ" != "1" && test "$HAVE_ZLIB_H" = "1"
then
AC_MSG_WARN([configure found only the libz header file, not the lib!])
elif test "$HAVE_LIBZ" = "1" && test "$HAVE_ZLIB_H" = "1"
then
dnl both header and lib were found!
AC_SUBST(HAVE_LIBZ)
AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available])
LIBS="$LIBS -lz"
dnl replace 'HAVE_LIBZ' in the automake makefile.ams
AMFIXLIB="1"
AC_MSG_NOTICE([found both libz and libz.h header])
curl_zlib_msg="enabled"
fi
fi
dnl set variable for use in automakefile(s) dnl set variable for use in automakefile(s)
AM_CONDITIONAL(HAVE_LIBZ, test x"$AMFIXLIB" = x1) AM_CONDITIONAL(HAVE_LIBZ, test x"$AMFIXLIB" = x1)