[kaffe] CVS kaffe (robilad): configure.ac : Check if zlib is recent enough (1.2.3, or later).

[Kaffe CVS]

PatchSet 7497 
Date: 2007/07/02 03:46:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-07-02  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac : Check if zlib is recent enough (1.2.3, or later).

        Reported by:  Kiyo Inaba <inaba at src.ricoh.co.jp>

Members: 
	ChangeLog:1.4996->1.4997 
	configure:1.586->1.587 
	configure.ac:1.262->1.263 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4996 kaffe/ChangeLog:1.4997
--- kaffe/ChangeLog:1.4996	Mon Jul  2 02:58:27 2007
+++ kaffe/ChangeLog	Mon Jul  2 03:46:35 2007
@@ -1,5 +1,13 @@
 2007-07-02  Dalibor Topic  <robilad at kaffe.org>
 
+	* configure.ac : Check if zlib is recent enough (1.2.3, or later).
+
+	Reported by:  Kiyo Inaba <inaba at src.ricoh.co.jp>
+
+2007-07-02  Dalibor Topic  <robilad at kaffe.org>
+
+	Fixed --with-staticlib --disable-zlib-zip build.
+
 	* kaffe/kaffe/Makefile.am (kaffe_bin_LDADD),
 	test/internal/Makefile.am (jitBasic_LDADD),
 	test/jni/Makefile.am (jniBase_LDADD, jniExecClass_LDADD,
@@ -7,8 +15,12 @@
 
 	* test/internal/Makefile.am (LIBNATIVE) Removed.
 
+	Reported by:  Kiyo Inaba <inaba at src.ricoh.co.jp>
+
 2007-07-01  Dalibor Topic  <robilad at kaffe.org>
 
+	Fixed --with-staticvm --disable-zlib-zip build.
+
 	* kaffe/kaffevm/Makefile.am (native_LTLIBRARIES) Added libkaffe.la
 	for the core VM.
 	(libkaffe_la_CFLAGS, libkaffe_la_LDFLAGS, libkaffe_la_DEPENDENCIES,
@@ -61,6 +73,8 @@
 	* kaffe/kaffevm/readClass.c (readAttributes): Added debugging messages.
 
 	* kaffe/kaffevm/string.c (stringJava2C): Simplified.
+
+	Reported by:  Kiyo Inaba <inaba at src.ricoh.co.jp>
 
 2007-06-29  Ito Kazumitsu  <kaz at maczuka.gcd.org>
 
Index: kaffe/configure
diff -u kaffe/configure:1.586 kaffe/configure:1.587
--- kaffe/configure:1.586	Thu Jun 14 13:17:19 2007
+++ kaffe/configure	Mon Jul  2 03:46:36 2007
@@ -47401,6 +47401,32 @@
 echo "$as_me: error: Can't find system zlib or can't find function deflate in it" >&2;}
    { (exit 1); exit 1; }; }
 fi
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zlib.h>
+
+#if ZLIB_VERNUM >= 0x1230
+  yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then
+  is_recent_zlib=yes
+else
+  is_recent_zlib=no
+fi
+rm -f conftest*
+
+if test x"$is_recent_zlib" != x"yes" ; then
+  { { echo "$as_me:$LINENO: error: Can't find zlib 1.2.3 or later" >&5
+echo "$as_me: error: Can't find zlib 1.2.3 or later" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 
 
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.262 kaffe/configure.ac:1.263
--- kaffe/configure.ac:1.262	Wed Jun 13 02:19:29 2007
+++ kaffe/configure.ac	Mon Jul  2 03:46:37 2007
@@ -2296,6 +2296,16 @@
 if test x"$ac_cv_lib_z_deflate" != x"yes" ; then
   AC_MSG_ERROR([Can't find system zlib or can't find function deflate in it])
 fi
+AC_EGREP_CPP(yes,
+[#include <zlib.h>
+
+#if ZLIB_VERNUM >= 0x1230
+  yes
+#endif
+], is_recent_zlib=yes, is_recent_zlib=no)
+if test x"$is_recent_zlib" != x"yes" ; then
+  AC_MSG_ERROR([Can't find zlib 1.2.3 or later])
+fi
 
 dnl =========================================================================
 dnl Configure Binreloc support