* common/aclocal.m4: Add include of ../../config/zlib.m4.

        * common/common.m4: Use AM_ZLIB to check for zlib support.
        * ppc/configure.ac: Likewise.
        * arm/configure, avr/configure, common/configure, cr16/configure,
        cris/configure, d10v/configure, erc32/configure, frv/configure,
        h8300/configure, iq2000/configure, lm32/configure, m32c/configure,
        m32r/configure, m68hc11/configure, mcore/configure,
        microblaze/configure, mips/configure, mn10300/configure,
        moxie/configure, ppc/configure, sh/configure, sh64/configure,
        v850/configure: Regenerate.

1 files changed, 24 insertions, 2 deletions

diff --git a/sim/m32r/configure b/sim/m32r/configure
index e7e789a..533ec9f 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -709,6 +709,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_zlib
 enable_maintainer_mode
 enable_sim_bswap
 enable_sim_cflags
@@ -1373,6 +1374,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-zlib             include zlib support (auto/yes/no)
   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
   --with-bugurl=URL       Direct users to URL to report a bug
 
@@ -2272,6 +2274,10 @@ ac_config_headers="$ac_config_headers config.h:config.in"
 
 
 
+
+
+
+
 sim_inline="-DDEFAULT_INLINE=0"
 
 
@@ -2430,7 +2436,6 @@ sim_inline="-DDEFAULT_INLINE=0"
 
 
 
-
 # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
 # it by inlining the macro's contents.
 # This file contains common code used by all simulators.
@@ -4198,7 +4203,19 @@ fi
 
 # BFD conditionally uses zlib, so we must link it in if libbfd does, by
 # using the same condition.
-{ $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
@@ -4265,6 +4282,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
+
 
 . ${srcdir}/../../bfd/configure.host