sim/

     * common/aclocal.m4: Add include of ../../config/zlib.m4.
     * common/common.m4: Use AM_ZLIB to check for zlib support.
     * ppc/configure.ac: Likewise.
     * arm/configure, avr/configure, common/configure, cr16/configure,
     cris/configure, d10v/configure, erc32/configure, frv/configure,
     h8300/configure, iq2000/configure, lm32/configure, m32c/configure,
     m32r/configure, m68hc11/configure, mcore/configure, microblaze/configure,
     mips/configure, mn10300/configure, moxie/configure, ppc/configure,
     sh/configure, sh64/configure, v850/configure: Regenerate.

---
 sim/arm/configure        |   26 +-
 sim/avr/configure        |   26 +-
 sim/common/aclocal.m4    |    1 +
 sim/common/common.m4     |    2 +-
 sim/common/configure     |   21 +-
 sim/cr16/configure       |   26 +-
 sim/cris/configure       |   26 +-
 sim/d10v/configure       |   26 +-
 sim/erc32/configure      |   26 +-
 sim/frv/configure        |   26 +-
 sim/h8300/configure      |   26 +-
 sim/iq2000/configure     |   26 +-
 sim/lm32/configure       |   26 +-
 sim/m32c/configure       |   26 +-
 sim/m32r/configure       |   26 +-
 sim/m68hc11/configure    |   26 +-
 sim/mcore/configure      |   26 +-
 sim/microblaze/configure | 3748 ++++++++++++++++------------------------------
 sim/mips/configure       |   26 +-
 sim/mn10300/configure    |   26 +-
 sim/moxie/configure      |   36 +-
 sim/ppc/configure        |   21 +-
 sim/ppc/configure.ac     |    2 +-
 sim/sh/configure         |   26 +-
 sim/sh64/configure       |   26 +-
 sim/v850/configure       |   26 +-
 26 files changed, 1841 insertions(+), 2484 deletions(-)

diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4
index 7beaebd..9a6a4c8 100644
--- a/sim/common/aclocal.m4
+++ b/sim/common/aclocal.m4
@@ -20,6 +20,7 @@
 
 # Include global overrides and fixes for Autoconf.
 m4_include(../../config/override.m4)
+sinclude([../../config/zlib.m4])
 
 AC_DEFUN([SIM_AC_COMMON],
 [
diff --git a/sim/common/common.m4 b/sim/common/common.m4
index 215208d..97a2c61 100644
--- a/sim/common/common.m4
+++ b/sim/common/common.m4
@@ -56,7 +56,7 @@ AC_CHECK_LIB(nsl, gethostbyname)
 
 # BFD conditionally uses zlib, so we must link it in if libbfd does, by
 # using the same condition.
-AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+AM_ZLIB
 
 . ${srcdir}/../../bfd/configure.host
 
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index e8ccfe9..ae26d54 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -668,7 +668,7 @@ AC_ARG_PROGRAM
 
 # BFD conditionally uses zlib, so we must link it in if libbfd does, by
 # using the same condition.
-AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+AM_ZLIB
 
 . ${srcdir}/../../bfd/configure.host
 
-- 
1.6.0.4