2005-07-08 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 95316a3419ea9abc79f27d7768759d50d991a7c5..0cf3c8a38f3af4c7a2ee620dbe8570ac094cd09f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -169,7 +169,7 @@ case "$host" in
                ;;
        *-*-linux*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP"
                libmono_cflags="-D_REENTRANT"
                libmono_ldflags="-lpthread"
                libdl="-ldl"
@@ -187,7 +187,7 @@ case "$host" in
                 ;;
        *-*-solaris*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+               CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP"
                need_link_unlink=yes
                libmono_cflags="-D_REENTRANT"
                libgc_threads=pthreads
@@ -1154,6 +1154,7 @@ if test x$platform_win32 = xno; then
        dnl **********************************
        AC_CHECK_HEADERS(checklist.h)
        AC_CHECK_HEADERS(fstab.h)
+       AC_CHECK_HEADERS(sys/extattr.h)
        AC_CHECK_HEADERS(sys/sendfile.h)
        AC_CHECK_HEADERS(sys/statvfs.h)
        AC_CHECK_HEADERS(sys/vfstab.h)
@@ -1378,6 +1379,15 @@ case "$host" in
                arch_target=amd64;
                JIT_SUPPORTED=yes
                jit_wanted=true
+               ;;
+       ia64-*-*)
+               TARGET=IA64
+               arch_target=ia64
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               jit_wanted=true
+               AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
+
                ;;
        sparc*-*-*)
                if test "x$ac_cv_sizeof_void_p" = "x8"; then
@@ -1515,7 +1525,7 @@ AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
 libsuffix=".so"
 
 case "$host" in
-     powerpc-*-darwin*)
+     *-*-darwin*)
        libsuffix=".dylib"
        LIBC="libc.dylib"
        INTL="libintl.dylib"
@@ -1535,24 +1545,24 @@ case "$host" in
        LIBC="libc.so"
        INTL="libintl.so"
        ;;
-esac
-
-if test "x$X11" = "xlibX11.so"; then
+    *-*-*linux*)
        AC_PATH_X
-       AC_PATH_PROG(OBJDUMP, objdump, no)
-       if test "x$no_x" != "xyes"; then
-               if test "x$OBJDUMP" != xno; then
-                       AC_MSG_CHECKING(for the soname of libX11.so)
-                       X11=$($OBJDUMP -p  $x_libraries/libX11.so | $AWK '/SONAME/ {print $2}')
-                       AC_MSG_RESULT($X11)
-               else
-                       AC_MSG_WARN([Could not find objdump. WinForms will not work if you install this mono on a box without the X -devel package.]);
-               fi
+       AC_MSG_CHECKING(for the soname of libX11.so)
+       for i in $x_libraries /usr/lib /usr/lib64; do
+               for r in 4 5 6; do
+                       if test -f $i/libX11.so.$r; then
+                               X11=libX11.so.$r
+                               AC_MSG_RESULT($X11)
+                       fi
+               done
+       done
        
-       else
+       if test "x$X11" = "xlibX11.so"; then
                AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]);
        fi
-fi
+       ;;
+esac
+
 
 AC_SUBST(libsuffix)
 
@@ -1682,6 +1692,7 @@ AC_SUBST(mono_cfg_dir)
 
 AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
 AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
+AC_CONFIG_FILES([runtime/semdel-wrapper],[chmod +x runtime/semdel-wrapper])
 
 AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
 [   depth=../../../..
@@ -1783,17 +1794,19 @@ runtime/Makefile
   echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
   echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make
 
-  IFS=". "
-  # make sure it has 0's on the end
-  vsplit=( $VERSION 0 0 0 0 )
-  unset IFS
+  export VERSION
+  [myver=$($AWK 'BEGIN {
+    split (ENVIRON["VERSION"] ".0.0.0.0", vsplit, ".")
+    print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
+  }')]
   
   cat > $srcdir/$mcsdir/build/common/MonoVersion.cs <<EOF
 //
 // This version number is generated from configure.in in the mono source tree.
 //
+using System.Reflection;
 
-[[assembly: AssemblyVersion("${vsplit[0]}.${vsplit[1]}.${vsplit[2]}.${vsplit[3]}")]]
+[[assembly: AssemblyVersion("${myver}")]]
 EOF
 )