Add --with-system-zlib to top level configure

The top level configure supports --with-system-zlib.  This patch makes
configure --help to display --with-system-zlib.

	* configure.ac: Add --with-system-zlib.
	* configure: Regenerated.

diff --git a/ChangeLog b/ChangeLog
index 37450f4f9fefe2ab52a017f75f076a25c39eb83f..457a6bb252ddfa955a41d4018136f2e722d675ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.ac: Add --with-system-zlib.
+       * configure: Regenerated.
+
 2015-03-31  H.J. Lu  <hongjiu.lu@intel.com>
 
        * src-release.sh: Don't configure with  --with-target-subdir=.

diff --git a/configure b/configure
index b719d386764f80331ed34d149f2f4a1ad2433016..97250fab504e87341a2ab98e2fe4a337e76929fb 100755 (executable)
--- a/configure
+++ b/configure
@@ -747,6 +747,7 @@ ospace_frag'
 ac_user_opts='
 enable_option_checking
 with_build_libsubdir
+with_system_zlib
 enable_as_accelerator_for
 enable_offload_targets
 enable_gold
@@ -1518,6 +1519,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-build-libsubdir=DIR  Directory where to find libraries for build system
+  --with-system-zlib      use installed libz
   --with-mpc=PATH         specify prefix directory for installed MPC package.
                           Equivalent to --with-mpc-include=PATH/include plus
                           --with-mpc-lib=PATH/lib
@@ -2854,6 +2856,12 @@ if test x$with_gnu_as = xno ; then
 fi
 
 use_included_zlib=
+
+# Check whether --with-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then :
+  withval=$with_system_zlib;
+fi
+
 # Make sure we don't let ZLIB be added if we didn't want it.
 if test x$with_system_zlib = xyes ; then
   use_included_zlib=no

diff --git a/configure.ac b/configure.ac
index a4e4c7d835a21e9b512a03997ec90ec734d53874..ef5f5b1770be50d1350a09a000737271b9c97446 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,8 @@ if test x$with_gnu_as = xno ; then
 fi
 
 use_included_zlib=
+AC_ARG_WITH(system-zlib,
+[AS_HELP_STRING([--with-system-zlib], [use installed libz])])
 # Make sure we don't let ZLIB be added if we didn't want it.
 if test x$with_system_zlib = xyes ; then
   use_included_zlib=no