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

[deliverable/binutils-gdb.git] / sim / mips / configure

diff --git a/sim/mips/configure b/sim/mips/configure
index 0de1a5e9896e08b6e81d60fb51f1c55451992402..7c8acce8c2aa3e7f7811a48c3b6190d8720b7678 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -716,6 +716,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_zlib
 enable_maintainer_mode
 enable_sim_bswap
 enable_sim_cflags
@@ -1392,6 +1393,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
   --with-x                use the X Window System
@@ -2288,6 +2290,10 @@ ac_config_headers="$ac_config_headers config.h:config.in"
 
 
 
+
+
+
+
 
 
 
@@ -2449,7 +2455,6 @@ sim_inline="-DDEFAULT_INLINE=0"
 
 
 
-
 
 
 # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
@@ -4219,7 +4224,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
@@ -4286,6 +4303,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