moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

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

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

27
configure.ac
View File

@ -941,27 +941,35 @@ 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"])
fi
dnl Add a nonempty path to the compiler flags
if test -n "$OPT_ZLIB"; then
CPPFLAGS="$CPPFLAGS -I$OPT_ZLIB/include" CPPFLAGS="$CPPFLAGS -I$OPT_ZLIB/include"
LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib$libsuff" LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib$libsuff"
fi]) fi
AC_CHECK_HEADER(zlib.h, AC_CHECK_HEADER(zlib.h,
[ [
@ -1004,8 +1012,7 @@ case "$OPT_ZLIB" in
AC_MSG_NOTICE([found both libz and libz.h header]) AC_MSG_NOTICE([found both libz and libz.h header])
curl_zlib_msg="enabled" curl_zlib_msg="enabled"
fi fi
;; fi
esac
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)