aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-04-01 04:51:55 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-04-01 04:51:55 -0700
commit031f1448b68a9eae3392353857c7873f857c2221 (patch)
tree58bc69340809acff56e4cc34854f38f7d7b8b91b /config
parent875b5b9d147d37c99a189aa95354f9bebdd64ef5 (diff)
downloadfsf-binutils-gdb-031f1448b68a9eae3392353857c7873f857c2221.zip
fsf-binutils-gdb-031f1448b68a9eae3392353857c7873f857c2221.tar.gz
fsf-binutils-gdb-031f1448b68a9eae3392353857c7873f857c2221.tar.bz2
Unset zlibdir/zlibinc only for --with-system-zlib
* zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for --with-system-zlib.
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog5
-rw-r--r--config/zlib.m46
2 files changed, 9 insertions, 2 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 945f080..6dc4998 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01 H.J. Lu <hongjiu.lu@intel.com>
+
+ * zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for
+ --with-system-zlib.
+
2015-03-31 H.J. Lu <hongjiu.lu@intel.com>
* zlib.m4 (AM_ZLIB): Replace --with-zlib with --with-system-zlib.
diff --git a/config/zlib.m4 b/config/zlib.m4
index 3664295..aa3ac48 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -9,8 +9,10 @@ AC_DEFUN([AM_ZLIB],
zlibinc="-I\$(srcdir)/../zlib"
AC_ARG_WITH(system-zlib,
[AS_HELP_STRING([--with-system-zlib], [use installed libz])],
- zlibdir=
- zlibinc=
+ if test x$with_system_zlib = xyes ; then
+ zlibdir=
+ zlibinc=
+ fi
)
AC_SUBST(zlibdir)
AC_SUBST(zlibinc)