* InstrTable.cs: Fix instructions that have dots in their name

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index a92b9f37df6afce23abb00f0cab8ccfc9e4d2a56..26641fb36928bf3c871f280b8a2cd18b95470053 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,18 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.16)
+AM_INIT_AUTOMAKE(mono, 0.23)
 AM_MAINTAINER_MODE
 
+#
+# These are the flags that need to be stored in the mono.pc file for 
+# 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])
 case "$host" in
@@ -12,26 +21,41 @@ 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*)
                platform_win32=no
                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=
                ;;
        *-*-linux*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+               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*)
                platform_win32=no
                CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
                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!])
@@ -71,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)
@@ -368,24 +392,24 @@ if test x$platform_win32 = xno; then
        dnl ********************************
        dnl *** Checks for timezone stuff **
        dnl ********************************
-       AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+       AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
                AC_TRY_COMPILE([
                        #include <time.h>
-               ], [
-                       timezone = 1;
-               ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
-       if test $ac_cv_var_timezone = yes; then
-               AC_DEFINE(HAVE_TIMEZONE)
+                       ], [
+                       struct tm tm;
+                       tm.tm_gmtoff = 1;
+                       ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+       if test $ac_cv_struct_tm_gmtoff = yes; then
+               AC_DEFINE(HAVE_TM_GMTOFF)
        else
-               AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+               AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
                        AC_TRY_COMPILE([
                                #include <time.h>
-                               ], [
-                               struct tm tm;
-                               tm.tm_gmtoff = 1;
-                               ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
-               if test $ac_cv_struct_tm_gmtoff = yes; then
-                       AC_DEFINE(HAVE_TM_GMTOFF)
+                       ], [
+                               timezone = 1;
+                       ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+               if test $ac_cv_var_timezone = yes; then
+                       AC_DEFINE(HAVE_TIMEZONE)
                else
                        AC_ERROR(unable to find a way to determine timezone)
                fi
@@ -477,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
@@ -507,6 +531,7 @@ AC_SUBST(LIBC)
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
 Makefile
@@ -525,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