From b040ad30f50520414987cc3d5d558c4ed27d9e07 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@gnat.com>
Date: Tue, 24 Nov 2009 22:59:53 +0000
Subject: [PATCH]         * acinclude.m4: Include ../config/zlib.m4.         *
 configure.ac: Use AM_ZLIB to check for zlib support.         * configure:
 Regenerate.

---
 gdb/ChangeLog    |  6 ++++++
 gdb/acinclude.m4 |  2 ++
 gdb/configure    | 21 ++++++++++++++++++++-
 gdb/configure.ac |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a1056d7d61b..e69bac29e30 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-24  Joel Brobecker  <brobecker@adacore.com>
+
+	* acinclude.m4: Include ../config/zlib.m4.
+	* configure.ac: Use AM_ZLIB to check for zlib support.
+	* configure: Regenerate.
+
 2009-11-24  Joel Brobecker  <brobecker@adacore.com>
 
 	* breakpoint.c (expand_line_sal_maybe): Adjust adjust the SAL
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index c32e1ea4d3b..af4639b3250 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -32,6 +32,8 @@ sinclude([../config/lcmessage.m4])
 dnl For AM_LANGINFO_CODESET.
 sinclude([../config/codeset.m4])
 
+sinclude([../config/zlib.m4])
+
 #
 # Sometimes the native compiler is a bogus stub for gcc or /usr/ucb/cc. This
 # makes configure think it's cross compiling. If --target wasn't used, then
diff --git a/gdb/configure b/gdb/configure
index 25ea875058a..b4492e7e6cb 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -896,6 +896,7 @@ with_curses
 enable_profiling
 with_pkgversion
 with_bugurl
+with_zlib
 with_libiconv_prefix
 with_system_readline
 with_expat
@@ -1590,6 +1591,7 @@ Optional Packages:
                           library
   --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-zlib             include zlib support (auto/yes/no) default=auto
   --with-libiconv-prefix=DIR
                           search for libiconv in DIR/include and DIR/lib
   --with-system-readline  use installed readline library
@@ -8129,7 +8131,19 @@ fi
 
 
 # Link in zlib if we can.  This allows us to read compressed debug 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
@@ -8196,6 +8210,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
+
 
 # On HP/UX we may need libxpdl for dlgetmodinfo (used by solib-pa64.c).
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlgetmodinfo" >&5
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 447663712ed..8a738375a9b 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -423,7 +423,7 @@ AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(socketpair, socket)
 
 # Link in zlib if we can.  This allows us to read compressed debug sections.
-AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+AM_ZLIB
 
 # On HP/UX we may need libxpdl for dlgetmodinfo (used by solib-pa64.c).
 AC_SEARCH_LIBS(dlgetmodinfo, [dl xpdl])
-- 
2.30.2