From 5912faddb200cda344c8776b898b31f07a73352a Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@gnat.com>
Date: Tue, 24 Nov 2009 22:58:08 +0000
Subject:         * 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.

---
 sim/cris/configure | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'sim/cris')

diff --git a/sim/cris/configure b/sim/cris/configure
index 49cb9c8..16dcc28 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -707,6 +707,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+with_zlib
 enable_maintainer_mode
 enable_sim_bswap
 enable_sim_cflags
@@ -1375,6 +1376,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
 
@@ -2274,6 +2276,10 @@ ac_config_headers="$ac_config_headers config.h:config.in"
 
 
 
+
+
+
+
 sim_inline="-DDEFAULT_INLINE=0"
 
 
@@ -2432,7 +2438,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.
@@ -4200,7 +4205,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
@@ -4267,6 +4284,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
 
-- 
cgit v1.1