diff options
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rwxr-xr-x | binutils/configure | 25 | ||||
| -rw-r--r-- | binutils/configure.in | 2 | ||||
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rwxr-xr-x | ld/configure | 25 | ||||
| -rw-r--r-- | ld/configure.in | 2 |
6 files changed, 55 insertions, 8 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 326432f5b0..c78b13ffe6 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2012-01-09 Roland McGrath <mcgrathr@google.com> + + * configure.in: Use AM_ZLIB. + * configure: Regenerated. + 2012-01-06 Nick Clifton <nickc@redhat.com> * po/ru.po: Updated Russian translation. diff --git a/binutils/configure b/binutils/configure index 028abb93cd..8d324e489a 100755 --- a/binutils/configure +++ b/binutils/configure @@ -776,6 +776,7 @@ enable_werror enable_build_warnings enable_nls enable_maintainer_mode +with_zlib enable_rpath with_libiconv_prefix ' @@ -1433,6 +1434,7 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-zlib include zlib support (auto/yes/no) default=auto --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir @@ -11202,7 +11204,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11205 "configure" +#line 11207 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11308,7 +11310,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11311 "configure" +#line 11313 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12994,7 +12996,19 @@ _ACEOF # Link in zlib if we can. This allows us to read compressed debug # sections. This is used only by readelf.c (objdump uses bfd for # reading compressed 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 @@ -13061,6 +13075,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 + case "${host}" in diff --git a/binutils/configure.in b/binutils/configure.in index d38b677537..d0443cfff6 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -155,7 +155,7 @@ AC_CHECK_DECLS([fprintf, stpcpy, strstr, sbrk, getenv, environ, getc_unlocked, # Link in zlib if we can. This allows us to read compressed debug # sections. This is used only by readelf.c (objdump uses bfd for # reading compressed sections). -AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) +AM_ZLIB BFD_BINARY_FOPEN diff --git a/ld/ChangeLog b/ld/ChangeLog index 555390bcb0..d77917666d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2012-01-09 Roland McGrath <mcgrathr@google.com> + + * configure.in: Use AM_ZLIB. + * configure: Regenerated. For older changes see ChangeLog-2011 diff --git a/ld/configure b/ld/configure index dd705a50d4..f6726e3444 100755 --- a/ld/configure +++ b/ld/configure @@ -787,6 +787,7 @@ with_gnu_ld enable_libtool_lock enable_nls enable_initfini_array +with_zlib ' ac_precious_vars='build_alias host_alias @@ -1450,6 +1451,7 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-zlib include zlib support (auto/yes/no) default=auto Some influential environment variables: CC C compiler command @@ -12138,7 +12140,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12141 "configure" +#line 12143 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12244,7 +12246,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12247 "configure" +#line 12249 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16617,7 +16619,19 @@ _ACEOF # Link in zlib if we can. This is needed only for the bootstrap tests # right now, since those tests use libbfd, which depends on zlib. -{ $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 @@ -16684,6 +16698,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 + # When converting linker scripts into strings for use in emulation # files, use astring.sed if the compiler supports ANSI string diff --git a/ld/configure.in b/ld/configure.in index 44013aa5f1..63936f2dff 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -217,7 +217,7 @@ AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ]) # Link in zlib if we can. This is needed only for the bootstrap tests # right now, since those tests use libbfd, which depends on zlib. -AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) +AM_ZLIB # When converting linker scripts into strings for use in emulation # files, use astring.sed if the compiler supports ANSI string |