diff options
Diffstat (limited to 'sim/ppc')
| -rwxr-xr-x | sim/ppc/configure | 21 | ||||
| -rw-r--r-- | sim/ppc/configure.ac | 2 |
2 files changed, 21 insertions, 2 deletions
diff --git a/sim/ppc/configure b/sim/ppc/configure index f2f0be8..b77c097 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -766,6 +766,7 @@ enable_sim_warnings enable_sim_xor_endian with_pkgversion with_bugurl +with_zlib ' ac_precious_vars='build_alias host_alias @@ -1435,6 +1436,7 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=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-zlib include zlib support (auto/yes/no) Some influential environment variables: CC C compiler command @@ -4965,7 +4967,19 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # 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 @@ -5032,6 +5046,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 diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index 55699b2..1970291 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -668,7 +668,7 @@ AC_ARG_PROGRAM # BFD conditionally uses zlib, so we must link it in if libbfd does, by # using the same condition. -AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) +AM_ZLIB . ${srcdir}/../../bfd/configure.host |