diff options
author | Joel Brobecker <brobecker@gnat.com> | 2009-11-24 22:59:53 +0000 |
---|---|---|
committer | Joel Brobecker <brobecker@gnat.com> | 2009-11-24 22:59:53 +0000 |
commit | b040ad30f50520414987cc3d5d558c4ed27d9e07 (patch) | |
tree | 802d7a8ec132ce6e3c1bfb21f6a2b567d255433a /gdb/configure | |
parent | 5912faddb200cda344c8776b898b31f07a73352a (diff) | |
download | gdb-b040ad30f50520414987cc3d5d558c4ed27d9e07.zip gdb-b040ad30f50520414987cc3d5d558c4ed27d9e07.tar.gz gdb-b040ad30f50520414987cc3d5d558c4ed27d9e07.tar.bz2 |
* acinclude.m4: Include ../config/zlib.m4.
* configure.ac: Use AM_ZLIB to check for zlib support.
* configure: Regenerate.
Diffstat (limited to 'gdb/configure')
-rwxr-xr-x | gdb/configure | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gdb/configure b/gdb/configure index 25ea875..b4492e7 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 |