diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-03-22 10:25:20 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-03-22 10:25:20 +0100 |
| commit | fe508576ef1f815b22177d7597796886b91ea0c8 (patch) | |
| tree | 885adbb929453bbbee04db48bdbbafec4e29205e /config/zlib.m4 | |
| parent | 445036bb9882485133750a14a5b3da30efeae2df (diff) | |
| download | cygnal-fe508576ef1f815b22177d7597796886b91ea0c8.tar.gz cygnal-fe508576ef1f815b22177d7597796886b91ea0c8.tar.bz2 cygnal-fe508576ef1f815b22177d7597796886b91ea0c8.zip | |
Sync toplevel with upstream GCC.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'config/zlib.m4')
| -rw-r--r-- | config/zlib.m4 | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/config/zlib.m4 b/config/zlib.m4 index b0174994e..afa57d112 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) ]) - |