/hg/icedtea6: Add a fallback to the old way of checking for zlib...

[andrew at icedtea.classpath.org]

changeset 58bdfe3bc688 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=58bdfe3bc688
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 11:24:46 2013 +0000

	Add a fallback to the old way of checking for zlib for older systems.

	2013-12-26  Andrew John Hughes  <gnu.andrew at redhat.com>

		* acinclude.m4:
		(IT_CHECK_FOR_ZLIB): Add a fallback to the old
		way of checking for zlib for older systems.


diffstat:

 ChangeLog    |  6 ++++++
 acinclude.m4 |  3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r d090d5e3c4aa -r 58bdfe3bc688 ChangeLog
--- a/ChangeLog	Thu Dec 26 10:53:52 2013 +0000
+++ b/ChangeLog	Thu Dec 26 11:24:46 2013 +0000
@@ -1,3 +1,9 @@
+2013-12-26  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_FOR_ZLIB): Add a fallback to the old
+	way of checking for zlib for older systems.
+
 2011-09-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r d090d5e3c4aa -r 58bdfe3bc688 acinclude.m4
--- a/acinclude.m4	Thu Dec 26 10:53:52 2013 +0000
+++ b/acinclude.m4	Thu Dec 26 11:24:46 2013 +0000
@@ -1578,7 +1578,8 @@
     PKG_CHECK_MODULES(ZLIB, zlib,[ZLIB_FOUND=yes],[ZLIB_FOUND=no])
     if test "x${ZLIB_FOUND}" = xno
     then
-      AC_MSG_ERROR([Could not find ZLIB; install ZLIB or build with --disable-system-zlib to use the in-tree copy.])
+      AC_CHECK_LIB(z, main, ZLIB_LIBS="-lz",
+        [AC_MSG_ERROR([Could not find ZLIB; install ZLIB or build with --disable-system-zlib to use the in-tree copy.])])
     fi
     AC_SUBST(ZLIB_CFLAGS)
     AC_SUBST(ZLIB_LIBS)