aboutsummaryrefslogtreecommitdiff
path: root/gold/configure
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2012-12-07 04:28:52 +0000
committerIan Lance Taylor <ian@airs.com>2012-12-07 04:28:52 +0000
commitae2eea65c66ca86d63e6f46ec9926ae0ac7eb2f7 (patch)
treee861425fbfab2e2b222d1e4a2c4167eb908a4385 /gold/configure
parentdecdd3bc369ed3d5fdc9dc1d0fcf9b0b21cfceef (diff)
downloadgdb-ae2eea65c66ca86d63e6f46ec9926ae0ac7eb2f7.zip
gdb-ae2eea65c66ca86d63e6f46ec9926ae0ac7eb2f7.tar.gz
gdb-ae2eea65c66ca86d63e6f46ec9926ae0ac7eb2f7.tar.bz2
* configure.ac (HAVE_ZLIB): Use AM_ZLIB instead of AC_SEARCH_LIBS.
Use $ac_cv_header_zlib_h = yes as the condition in AM_CONDITIONAL. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate.
Diffstat (limited to 'gold/configure')
-rwxr-xr-xgold/configure23
1 files changed, 21 insertions, 2 deletions
diff --git a/gold/configure b/gold/configure
index 4f74ae3..22d9b48 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