darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace --with-zlib with --with-system-zlib

Browse source 
* zlib.m4 (AM_ZLIB): Replace --with-zlib with --with-system-zlib.
This commit is contained in:
H.J. Lu 2015-03-31 05:53:39 -07:00
parent d33279b3bb
commit fa1f5da0b6
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/ChangeLog
View file

@ -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>
* isl.m4: Sync with GCC tree.

27
config/zlib.m4
View file

@ -1,18 +1,17 @@
dnl A function to check for zlib availability. zlib is used by default
dnl unless the user configured with --disable-nls.
dnl A function to check if the system's zlib library should be used. The
dnl builtin zlib dnl is used by default unless the user configured with
dnl --with-system-zlib.
AC_DEFUN([AM_ZLIB],
[
# See if the user specified whether he wants zlib support or not.
AC_ARG_WITH(zlib,
[ --with-zlib include zlib support (auto/yes/no) [default=auto]],
[], [with_zlib=auto])
if test "$with_zlib" != "no"; then
AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
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])
fi
fi
# Use the system's zlib library.
zlibdir=-L../zlib
zlibinc="-I\$(srcdir)/../zlib"
AC_ARG_WITH(system-zlib,
[AS_HELP_STRING([--with-system-zlib], [use installed libz])],
zlibdir=
zlibinc=
)
AC_SUBST(zlibdir)
AC_SUBST(zlibinc)
])