X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=e16f849a946cdf29f1f83b0fee0895092489e2d1;hb=d107dcfa83262685af6d93f3cd91a92e9b0b11a7;hp=312f25b2f6b42c2a772d406815443bf05d72caf8;hpb=9ee3df9bd0f5d3789146b0bc91b9abb705772de6;p=mono.git

diff --git a/configure.in b/configure.in
index 312f25b2f6b..e16f849a946 100644
--- a/configure.in
+++ b/configure.in
@@ -220,6 +220,7 @@ case "$host" in
 	*-*-darwin*)
 		platform_win32=no
 		CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
+		CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess"
 		libmono_cflags="-D_THREAD_SAFE"
 		LDFLAGS="$LDFLAGS -pthread"
 		libmono_ldflags="-pthread"
@@ -299,8 +300,26 @@ AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
+if test x$have_zlib = xyes; then
+   AC_TRY_COMPILE([#include <zlib.h>], [
+   void main () {
+   #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
+   }
+   #else
+   #error No good zlib found
+   #endif
+   ],[
+	AC_MSG_RESULT(Using system zlib)
+	zlib_msg="system zlib"
+   ],[
+	AC_MSG_RESULT(Using embedded zlib)
+	have_zlib=no
+	zlib_msg="bundled zlib"
+   ])
+fi
 
 AM_CONDITIONAL(HAVE_ZLIB, test x$have_zlib = xyes)
+AC_DEFINE(HAVE_ZLIB,1,[Have system zlib])
 
 # for mono/metadata/debug-symfile.c
 AC_CHECK_HEADERS(elf.h)
@@ -1890,7 +1909,7 @@ AC_SUBST(INTL)
 AC_SUBST(SQLITE)
 AC_SUBST(SQLITE3)
 AC_SUBST(X11)
-
+AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
@@ -2080,6 +2099,7 @@ echo "
 	2.0 Alpha:   $PREVIEW
 	JNI support: $jdk_headers_found
 	libgdiplus:  $libgdiplus_msg
+	zlib:        $zlib_msg
 	$disabled
 
 "
@@ -2087,10 +2107,6 @@ if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then
    AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs)
 fi
 
-if test x$have_zlib = xno; then
-   AC_MSG_WARN(ZLib devel files not available, compression file support in 2.0 won't work.)
-fi
-
 if test x$gc = xsgen; then
         echo IMPORTANT:
 	echo IMPORTANT: You have selected an experimental, work-in-progress