diff options
| -rw-r--r-- | gold/Makefile.in | 1 | ||||
| -rw-r--r-- | gold/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | gold/configure | 23 | ||||
| -rw-r--r-- | gold/configure.ac | 4 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.in | 1 |
5 files changed, 26 insertions, 4 deletions
diff --git a/gold/Makefile.in b/gold/Makefile.in index 16d2cf4b3f4..8da48cd9c15 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ + $(top_srcdir)/../config/zlib.m4 \ $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/gold/aclocal.m4 b/gold/aclocal.m4 index 00cc0f87300..8321894627a 100644 --- a/gold/aclocal.m4 +++ b/gold/aclocal.m4 @@ -988,4 +988,5 @@ m4_include([../config/nls.m4]) m4_include([../config/override.m4]) m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) +m4_include([../config/zlib.m4]) m4_include([../bfd/warning.m4]) diff --git a/gold/configure b/gold/configure index 4f74ae3ebc3..22d9b48a132 100755 --- a/gold/configure +++ b/gold/configure @@ -786,6 +786,7 @@ enable_werror enable_build_warnings with_gold_ldflags with_gold_ldadd +with_zlib enable_maintainer_mode ' ac_precious_vars='build_alias @@ -1443,6 +1444,7 @@ Optional Packages: --with-lib-path=dir1:dir2... set default LIB_PATH --with-gold-ldflags=FLAGS additional link flags for gold --with-gold-ldadd=LIBS additional libraries for gold + --with-zlib include zlib support (auto/yes/no) default=auto Some influential environment variables: CC C compiler command @@ -6806,7 +6808,19 @@ esac fi # Link in zlib if we can. This allows us to write compressed sections. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5 + + # See if the user specified whether he wants zlib support or not. + +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; +else + with_zlib=auto +fi + + + if test "$with_zlib" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5 $as_echo_n "checking for library containing zlibVersion... " >&6; } if test "${ac_cv_search_zlibVersion+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -6873,7 +6887,12 @@ done fi - if test "$ac_cv_search_zlibVersion" != "no"; then + if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then + as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5 + fi + fi + + if test "$ac_cv_header_zlib_h" = "yes"; then HAVE_ZLIB_TRUE= HAVE_ZLIB_FALSE='#' else diff --git a/gold/configure.ac b/gold/configure.ac index f8297f2fc68..727078d4287 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -486,8 +486,8 @@ else fi # Link in zlib if we can. This allows us to write compressed sections. -AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) -AM_CONDITIONAL(HAVE_ZLIB, test "$ac_cv_search_zlibVersion" != "no") +AM_ZLIB +AM_CONDITIONAL(HAVE_ZLIB, test "$ac_cv_header_zlib_h" = "yes") dnl We have to check these in C, not C++, because autoconf generates dnl tests which have no type information, and current glibc provides diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index 0f625656845..3be07ed736a 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -669,6 +669,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ + $(top_srcdir)/../config/zlib.m4 \ $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |