binutils/

	* configure.in: Use AM_ZLIB.
	* configure: Regenerated.

ld/
	* configure.in: Use AM_ZLIB.
	* configure: Regenerated.

3 files changed, 27 insertions, 4 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 555390b..d779176 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-09  Roland McGrath  <mcgrathr@google.com>
+
+	* configure.in: Use AM_ZLIB.
+	* configure: Regenerated.
 
 For older changes see ChangeLog-2011
 
diff --git a/ld/configure b/ld/configure
index dd705a5..f6726e3 100755
--- a/ld/configure
+++ b/ld/configure
@@ -787,6 +787,7 @@ with_gnu_ld
 enable_libtool_lock
 enable_nls
 enable_initfini_array
+with_zlib
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1450,6 +1451,7 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-zlib             include zlib support (auto/yes/no) default=auto
 
 Some influential environment variables:
   CC          C compiler command
@@ -12138,7 +12140,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12141 "configure"
+#line 12143 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12244,7 +12246,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12247 "configure"
+#line 12249 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16617,7 +16619,19 @@ _ACEOF
 
 # Link in zlib if we can.  This is needed only for the bootstrap tests
 # right now, since those tests use libbfd, which depends on zlib.
-{ $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
@@ -16684,6 +16698,11 @@ done
 
 fi
 
+    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
+
 
 # When converting linker scripts into strings for use in emulation
 # files, use astring.sed if the compiler supports ANSI string
diff --git a/ld/configure.in b/ld/configure.in
index 44013aa..63936f2 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -217,7 +217,7 @@ AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ])
 
 # Link in zlib if we can.  This is needed only for the bootstrap tests
 # right now, since those tests use libbfd, which depends on zlib.
-AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+AM_ZLIB
 
 # When converting linker scripts into strings for use in emulation
 # files, use astring.sed if the compiler supports ANSI string