diff options
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/Makefile.in | 6 | ||||
| -rw-r--r-- | binutils/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | binutils/configure | 13 | ||||
| -rw-r--r-- | binutils/configure.ac | 14 |
5 files changed, 24 insertions, 17 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index e0a3d51..bd3890c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,12 @@ 2015-03-31 H.J. Lu <hongjiu.lu@intel.com> + * configure.ac: Revert the AM_ZLIB change. + * Makefile.in: Regenerated. + * aclocal.m4: Likewise. + * configure: Likewise. + +2015-03-31 H.J. Lu <hongjiu.lu@intel.com> + * Makefile.am (ZLIB): New. (ZLIBINC): Likewise. (AM_CFLAGS): Add $(ZLIBINC). diff --git a/binutils/Makefile.in b/binutils/Makefile.in index d675b79..2c4d81b 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -88,9 +88,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/../bfd/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index fd838a6..074b2ca 100644 --- a/binutils/aclocal.m4 +++ b/binutils/aclocal.m4 @@ -1006,6 +1006,7 @@ m4_include([../config/override.m4]) m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) +m4_include([../config/zlib.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/binutils/configure b/binutils/configure index ad3948c..0fc173b 100755 --- a/binutils/configure +++ b/binutils/configure @@ -13538,14 +13538,18 @@ cat >>confdefs.h <<_ACEOF _ACEOF -# Use the system's zlib library. -zlibdir=-L../zlib -zlibinc="-I\$(srcdir)/../zlib" +# 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). + + # Use the system's zlib library. + zlibdir=-L../zlib + zlibinc="-I\$(srcdir)/../zlib" # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : withval=$with_system_zlib; zlibdir= -zlibinc= + zlibinc= fi @@ -13553,6 +13557,7 @@ fi + case "${host}" in *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*) diff --git a/binutils/configure.ac b/binutils/configure.ac index 0677f9a..31864ec 100644 --- a/binutils/configure.ac +++ b/binutils/configure.ac @@ -201,16 +201,10 @@ fi AC_CHECK_DECLS([environ, fprintf, getc_unlocked, getenv, sbrk, snprintf, stpcpy, strnlen, strstr, vsnprintf]) -# Use the system's zlib library. -zlibdir=-L../zlib -zlibinc="-I\$(srcdir)/../zlib" -AC_ARG_WITH(system-zlib, -[AS_HELP_STRING([--with-system-zlib], [use installed libz])], -zlibdir= -zlibinc= -) -AC_SUBST(zlibdir) -AC_SUBST(zlibinc) +# 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). +AM_ZLIB BFD_BINARY_FOPEN |