This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] obey --without-zlib in binutils and ld builds
- From: Roland McGrath <mcgrathr at google dot com>
- To: binutils at sourceware dot org
- Date: Mon, 09 Jan 2012 12:50:43 -0800
- Subject: [PATCH] obey --without-zlib in binutils and ld builds
This makes the binutils/ and ld/ programs' builds obey a --without-zlib
configure option. This makes them consistent with gas, and with
--enable-shared builds, where bfd/configure is the only one that matters.
gold still doesn't behave the same, because something about its
configure.ac is different so it couldn't use the same macro.
(I didn't really investigate.)
Ok for trunk?
Thanks,
Roland
binutils/
2012-01-09 Roland McGrath <mcgrathr@google.com>
* configure.in: Use AM_ZLIB.
* configure: Regenerated.
ld/
2012-01-09 Roland McGrath <mcgrathr@google.com>
* configure.in: Use AM_ZLIB.
* configure: Regenerated.
diff --git a/binutils/configure.in b/binutils/configure.in
index d38b677..d0443cf 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/configure.in b/ld/configure.in
index 44013aa..63936f2 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