2009-01-22 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index c76b3449e298bf9b46ccab9829b299258191d866..952e9b0a8b7fbc8ccfcc97d42d5647b269725202 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,8 @@ case "$host" in
                AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
                libdl=
                libgc_threads=pthreads
-               with_sigaltstack=yes
+               # This doesn't seem to work as of 7.0 on amd64
+               with_sigaltstack=no
 # TLS is only partially implemented on -CURRENT (compiler support
 # but NOT library support)
 #
@@ -175,6 +176,7 @@ case "$host" in
                ;;
        *-*-darwin*)
                platform_win32=no
+               platform_darwin=yes
                CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
                CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
                libmono_cflags="-D_THREAD_SAFE"
@@ -266,7 +268,7 @@ fi
 AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
-AC_CHECK_HEADERS(sys/user.h sys/ipc.h sys/sem.h alloca.h ucontext.h)
+AC_CHECK_HEADERS(sys/user.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 if test x$have_zlib = xyes; then
@@ -391,6 +393,14 @@ fi
 # we do not configure the full gettext, as we consume it dynamically from C#
 AM_PO_SUBDIRS
 
+if test "x$USE_NLS" = "xyes"; then
+   AC_CHECK_PROG(HAVE_MSGFMT, msgfmt,yes,no)
+
+   if test "x$HAVE_MSGFMT" = "xno"; then
+         AC_MSG_ERROR([msgfmt not found. You need to install the 'gettext' package, or pass --enable-nls=no to configure.])
+   fi
+fi
+
 AC_ARG_WITH([libgdiplus], 
        [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
        [], [with_libgdiplus=installed])
@@ -1405,9 +1415,12 @@ if test x$platform_win32 = xno; then
        AC_CHECK_HEADERS(sys/extattr.h)
        AC_CHECK_HEADERS(sys/sendfile.h)
        AC_CHECK_HEADERS(sys/statvfs.h)
+       AC_CHECK_HEADERS(sys/statfs.h)
        AC_CHECK_HEADERS(sys/vfstab.h)
        AC_CHECK_HEADERS(sys/xattr.h)
        AC_CHECK_HEADERS(sys/mman.h)
+       AC_CHECK_HEADERS(sys/param.h)
+       AC_CHECK_HEADERS(sys/mount.h)
        AC_CHECK_FUNCS(getdomainname)
        AC_CHECK_FUNCS(setdomainname)
        AC_CHECK_FUNCS(fgetgrent)
@@ -2136,12 +2149,16 @@ AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no   If you want to build the Moonl
 ])
 
 OPROFILE=no
-AC_ARG_WITH(oprofile,[ --with-oprofile=no,<path>   Enable oprofile support (defaults to NO)],[
+AC_ARG_WITH(oprofile,[ --with-oprofile=no,<oprofile install dir>   Enable oprofile support (defaults to NO)],[
        if test x$with_oprofile != xno; then
-             OPROFILE=yes
-             OPROFILE_CFLAGS="-I$with_oprofile/include"
-             OPROFILE_LIBS=
-             AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
+           oprofile_include=$with_oprofile/include
+           if test ! -f $oprofile_include/opagent.h; then
+                 AC_MSG_ERROR([oprofile include file not found at $oprofile_include/opagent.h])
+               fi
+           OPROFILE=yes
+               OPROFILE_CFLAGS="-I$oprofile_include"
+           OPROFILE_LIBS="-L$with_oprofile/lib/oprofile -lopagent"
+           AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
        fi
 ])
 
@@ -2292,7 +2309,7 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
 ],[LN_S='$LN_S'])
 
 if test x$enable_quiet_build = xyes; then
-   AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do $srcdir/scripts/patch-quiet.sh $i; done], [shell=$SHELL])
+   AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL])
    AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
 fi
 
@@ -2356,6 +2373,7 @@ data/wcf.pc
 data/cecil.pc
 data/smcs.pc
 data/system.web.extensions_1.0.pc
+data/system.web.extensions.design_1.0.pc
 samples/Makefile
 support/Makefile
 data/config
@@ -2418,6 +2436,10 @@ fi
     echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
   fi
 
+  if test x$platform_darwin = xyes; then
+       echo "PLATFORM = darwin" >> $srcdir/$mcsdir/build/config.make
+  fi
+
   if test x$TARGET = xAMD64 -a x$platform_win32 = xno -a "x$AOT_SUPPORTED" = "xyes"; then
         echo "ENABLE_AOT = 1" >> $srcdir/$mcsdir/build/config.make
   fi