diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-07-14 14:25:35 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-07-14 14:25:35 +0000 |
| commit | 92827dbf256bf91015fa08d617b502e86e4c580e (patch) | |
| tree | 283d05c62f478517a553de7fb4c73d0181b4189d /config | |
| parent | f2bdc3ffbe53cebc5c6b367499f3b9ed4d10face (diff) | |
This patch syncs zlib.m4 with binutils-gdb and uses AM_ZLIB from zlib.m4
in gcc/configure.ac.
config/
* zlib.m4: Sync with binutils-gdb.
gcc/
* Makefile.in (top_srcdir): New.
* configure.ac: Use AM_ZLIB.
* configure: Regeneated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225774 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 4 | ||||
| -rw-r--r-- | config/zlib.m4 | 27 |
2 files changed, 18 insertions, 13 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 843ad7261e5..311378e2e77 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2015-07-14 H.J. Lu <hongjiu.lu@intel.com> + + * zlib.m4: Sync with binutils-gdb. + 2015-06-30 H.J. Lu <hongjiu.lu@intel.com> * dfp.m4 (enable_decimal_float): Also set to yes for diff --git a/config/zlib.m4 b/config/zlib.m4 index b0174994ec1..afa57d112e7 100644 --- a/config/zlib.m4 +++ b/config/zlib.m4 @@ -1,18 +1,19 @@ -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 + # Use the system's zlib library. + zlibdir="-L\$(top_builddir)/../zlib" + zlibinc="-I\$(top_srcdir)/../zlib" + AC_ARG_WITH(system-zlib, + [AS_HELP_STRING([--with-system-zlib], [use installed libz])], + if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= fi + ) + AC_SUBST(zlibdir) + AC_SUBST(zlibinc) ]) - |