diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/Makefile.in | 3 | ||||
| -rw-r--r-- | bfd/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | bfd/configure | 12 | ||||
| -rw-r--r-- | bfd/configure.ac | 13 | ||||
| -rw-r--r-- | bfd/doc/Makefile.in | 3 |
6 files changed, 24 insertions, 16 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 25bec34..52ee750 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +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. + * doc/Makefile.in: Likewise. + 2015-03-30 H.J. Lu <hongjiu.lu@intel.com> PR ld/18169 diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 92eb33d..aac3eb2 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -75,7 +75,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/stdint.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.m4 $(top_srcdir)/warning.m4 \ diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4 index d9e743e..d3243c6 100644 --- a/bfd/aclocal.m4 +++ b/bfd/aclocal.m4 @@ -979,6 +979,7 @@ m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) m4_include([../config/stdint.m4]) +m4_include([../config/zlib.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/bfd/configure b/bfd/configure index b8f1b2b..2231e78 100755 --- a/bfd/configure +++ b/bfd/configure @@ -13853,20 +13853,24 @@ 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 compress.c. + + # 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 + # If we are configured native, pick a core file support file. COREFILE= COREFLAG= diff --git a/bfd/configure.ac b/bfd/configure.ac index 5426781..a1b2035 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -236,16 +236,9 @@ AC_CHECK_DECLS(snprintf) AC_CHECK_DECLS(vsnprintf) AC_CHECK_DECLS(strnlen) -# 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 compress.c. +AM_ZLIB # If we are configured native, pick a core file support file. COREFILE= diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index 6038113..cb9a214 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -71,7 +71,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/stdint.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.m4 $(top_srcdir)/warning.m4 \ |