Replace --with-zlib with --with-system-zlib
* zlib.m4 (AM_ZLIB): Replace --with-zlib with --with-system-zlib.
This commit is contained in:
parent
d33279b3bb
commit
fa1f5da0b6
@ -1,3 +1,7 @@
|
|||||||
|
2015-03-31 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
|
* zlib.m4 (AM_ZLIB): Replace --with-zlib with --with-system-zlib.
|
||||||
|
|
||||||
2015-03-16 H.J. Lu <hongjiu.lu@intel.com>
|
2015-03-16 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
* isl.m4: Sync with GCC tree.
|
* isl.m4: Sync with GCC tree.
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
dnl A function to check for zlib availability. zlib is used by default
|
dnl A function to check if the system's zlib library should be used. The
|
||||||
dnl unless the user configured with --disable-nls.
|
dnl builtin zlib dnl is used by default unless the user configured with
|
||||||
|
dnl --with-system-zlib.
|
||||||
|
|
||||||
AC_DEFUN([AM_ZLIB],
|
AC_DEFUN([AM_ZLIB],
|
||||||
[
|
[
|
||||||
# See if the user specified whether he wants zlib support or not.
|
# Use the system's zlib library.
|
||||||
AC_ARG_WITH(zlib,
|
zlibdir=-L../zlib
|
||||||
[ --with-zlib include zlib support (auto/yes/no) [default=auto]],
|
zlibinc="-I\$(srcdir)/../zlib"
|
||||||
[], [with_zlib=auto])
|
AC_ARG_WITH(system-zlib,
|
||||||
|
[AS_HELP_STRING([--with-system-zlib], [use installed libz])],
|
||||||
if test "$with_zlib" != "no"; then
|
zlibdir=
|
||||||
AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
|
zlibinc=
|
||||||
if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
|
)
|
||||||
AC_MSG_ERROR([zlib (libz) library was explicitly requested but not found])
|
AC_SUBST(zlibdir)
|
||||||
fi
|
AC_SUBST(zlibinc)
|
||||||
fi
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user