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

	* zlib.m4 (AM_ZLIB): Replace --with-zlib with --with-system-zlib.

diff --git a/config/ChangeLog b/config/ChangeLog
index 8a8386d5e94801b91354b802e3069d4f9317188d..945f080249c19b4cf04d19235ce3c5a116649fa0 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -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.

diff --git a/config/zlib.m4 b/config/zlib.m4
index b0174994ec16782d27a8aa65c47d5c0f2cfbf71a..366429568e99eb2dda46b6470a9ad20531994f96 100644 (file)
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -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)
 ])
-