aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac2
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 37450f4..457a6bb 100644
--- 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 b719d38..97250fa 100755
--- 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 a4e4c7d..ef5f5b1 100644
--- 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