bump

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index f00ffb6ba64c4fa5054a1c98dbe8aa047d52d610..18dc052c02c8ea9f967f19e0c94ee8c3228f9ecf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.18)
+AM_INIT_AUTOMAKE(mono, 0.21)
 AM_MAINTAINER_MODE
 
 #
@@ -9,7 +9,9 @@ AM_MAINTAINER_MODE
 # compiling code that will embed Mono
 #
 libmono_cflags=""
+libmono_ldflags=""
 AC_SUBST(libmono_cflags)
+AC_SUBST(libmono_ldflags)
 
 # Thread configuration inspired by sleepycat's db
 AC_MSG_CHECKING([host platform characteristics])
@@ -19,7 +21,7 @@ case "$host" in
                AC_DEFINE(PLATFORM_WIN32)
                CC="gcc -mno-cygwin"
                HOST_CC="gcc"
-               CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS"
+               CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
                libdl=
                ;;
        *-*-*bsd*)
@@ -27,6 +29,7 @@ case "$host" in
                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
                libmono_cflags="-D_THREAD_SAFE"
                LDFLAGS="$LDFLAGS -pthread"
+               libmono_ldflags="-pthread"
                AC_DEFINE(NEED_LINK_UNLINK)
                AC_DEFINE(PTHREAD_POINTER_ID)
                libdl=
@@ -35,6 +38,7 @@ case "$host" in
                platform_win32=no
                CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -DMONO_USE_EXC_TABLES -D_GNU_SOURCE -D_REENTRANT -fexceptions"
                libmono_cflags="-DMONO_USE_EXC_TABLES -fexceptions -D_REENTRANT"
+               libmono_ldflags="-lpthread"
                libdl="-ldl"
                ;;
        *-*-solaris*)
@@ -43,6 +47,16 @@ case "$host" in
                AC_DEFINE(NEED_LINK_UNLINK)
                libmono_cflags="-D_REENTRANT"
                ;;
+       *-*-darwin*)
+               platform_win32=no
+               CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE"
+               libmono_cflags="-D_THREAD_SAFE"
+               LDFLAGS="$LDFLAGS -pthread"
+               libmono_ldflags="-pthread"
+               AC_DEFINE(NEED_LINK_UNLINK)
+               AC_DEFINE(PTHREAD_POINTER_ID)
+               libdl=
+               ;;
        *)
                AC_MSG_WARN([*** Please add $host to configure.in checks!])
                platform_win32=no
@@ -81,7 +95,7 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h)
 
 # for mono/metadata/debug-symfile.c
 AC_CHECK_HEADERS(elf.h)
@@ -126,15 +140,11 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
 
 GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0`
 GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
-GTHREAD_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
-GTHREAD_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
 GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
 GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
@@ -491,7 +501,7 @@ i*86-*-*) TARGET=X86; arch_target=x86;;
 sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
 #alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";;
 #m68k-*-linux*) TARGET=M68K;;
-macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
+macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv* | powerpc-*-darwin*) TARGET=POWERPC; arch_target=ppc;;
 arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
 s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="no";;
 esac
@@ -521,6 +531,7 @@ AC_SUBST(LIBC)
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
 Makefile
@@ -539,6 +550,7 @@ mono/arch/ppc/Makefile
 mono/arch/sparc/Makefile
 mono/arch/s390/Makefile
 mono/arch/arm/Makefile
+mono/arch/alpha/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/benchmark/Makefile