summaryrefslogtreecommitdiff
path: root/bfd/doc
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-03-29 07:12:38 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-03-29 07:13:00 -0700
commit243340ad57e30de3c15cffe6e4af0381995f15d9 (patch)
treed8d22601296073d341535ae9b32336c069553b6e /bfd/doc
parentea6b7543b422836409fe7848abbfcb452ad26398 (diff)
Add --with-system-zlib in bfd
This patch adds --with-system-zlib and remove --with-zlib in bfd. * Makefile.am (ZLIB): New. (ZLIBINC): Likewise. (AM_CFLAGS): Add $(ZLIBINC). (libbfd_la_LIBADD): Add $(ZLIB). * compress.c: Don't check HAVE_ZLIB_H to include <zlib.h>. (decompress_contents): Don't check HAVE_ZLIB_H. (decompress_contents): Likewise. (bfd_compress_section_contents): Likewise. (bfd_get_full_section_contents): Likewise. (bfd_init_section_decompress_status): Likewise. (bfd_init_section_compress_status): Likewise. * configure.ac (AM_ZLIB): Removed (zlibdir): New. AC_SUBST. (zlibinc): Likewise. Add --with-system-zlib. * Makefile.in: Regenerated. * acinclude.m4: Likewise. * config.in: Likewise. * configure: Likewise. * doc/Makefile.in: Likewise.
Diffstat (limited to 'bfd/doc')
-rw-r--r--bfd/doc/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index 72099f1025..6038113c29 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -75,8 +75,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.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 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/zlib.m4 \
- $(top_srcdir)/version.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/version.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
@@ -289,6 +289,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
wordsize = @wordsize@
+zlibdir = @zlibdir@
+zlibinc = @zlibinc@
AUTOMAKE_OPTIONS = 1.9 cygnus
DOCFILES = aoutx.texi archive.texi archures.texi \
bfdt.texi cache.texi coffcode.texi \