* runtime/Makefile.am (all-local): Enclose CC by apostrophes to fix build when CC...

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 8ced2148af936650b815c5349f06243869832c14..4bc5392bb092873756a2cb059956ce15e1308408 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.9)
+AM_INIT_AUTOMAKE(mono,1.1.11)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -202,7 +202,7 @@ case "$host" in
                ;;
        *-*-darwin*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS"
+               CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX"
                libmono_cflags="-D_THREAD_SAFE"
                LDFLAGS="$LDFLAGS -pthread"
                libmono_ldflags="-pthread"
@@ -263,7 +263,8 @@ AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
 # Set STDC_HEADERS
 AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
-AC_DISABLE_FAST_INSTALL
+# This causes monodis to not link correctly
+#AC_DISABLE_FAST_INSTALL
 AM_PROG_LIBTOOL
 
 # Test whenever ld supports -version-script
@@ -1186,6 +1187,13 @@ if test x$platform_win32 = xno; then
        dnl **********************************
        dnl *** Checks for MonoPosixHelper ***
        dnl **********************************
+       AC_CHECK_FUNC(setkey, ,
+               AC_CHECK_LIB(crypt, setkey, [ 
+                       AC_DEFINE(HAVE_SETKEY, 1, [Define if setkey(3) is available]) 
+                       CRYPT_LIBS="-lcrypt" 
+               ])
+       )
+       AC_SUBST(CRYPT_LIBS)
        AC_CHECK_HEADERS(checklist.h)
        AC_CHECK_HEADERS(fstab.h)
        AC_CHECK_HEADERS(attr/xattr.h)
@@ -1194,6 +1202,7 @@ if test x$platform_win32 = xno; then
        AC_CHECK_HEADERS(sys/statvfs.h)
        AC_CHECK_HEADERS(sys/vfstab.h)
        AC_CHECK_HEADERS(sys/xattr.h)
+       AC_CHECK_HEADERS(sys/mman.h)
        AC_CHECK_FUNCS(getdomainname)
        AC_CHECK_FUNCS(setdomainname)
        AC_CHECK_FUNCS(fgetgrent)
@@ -1237,6 +1246,10 @@ if test x$platform_win32 = xno; then
         #endif
        ])
        AC_CHECK_HEADERS([termios.h])
+
+       dnl * This is provided in io-layer, but on windows it's only available
+       dnl * on xp+
+       AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available])
 else
        jdk_headers_found=no
        AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
@@ -1270,6 +1283,7 @@ else
                        AC_MSG_RESULT(no)
                ])
        ])
+       AC_CHECK_FUNCS(GetProcessId)
 fi
 
 dnl socklen_t check
@@ -1414,6 +1428,11 @@ case "$host" in
                arch_target=x86;
                JIT_SUPPORTED=yes
                jit_wanted=true
+               case $host_os in
+                 solaris*)
+                       LIBC="libc.so"
+                       INTL="libintl.so"
+               esac
                ;;
        x86_64-*-* | amd64-*-*)
                TARGET=AMD64;
@@ -1755,6 +1774,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+mono-cairo.pc
 dotnet.pc
 mono-uninstalled.pc
 scripts/mono-nunit.pc
@@ -1837,7 +1857,13 @@ fi
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
     echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
-    echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make
+
+    case $INSTALL in
+    [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
+    *) mcs_INSTALL=$mono_build_root/$INSTALL ;;
+    esac
+
+    echo "INSTALL = $mcs_INSTALL" >> $srcdir/$mcsdir/build/config.make
 
     export VERSION
     [myver=$($AWK 'BEGIN {