remove unnecessary argument from AppendChildValues function

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index a06d7fc5ac7cc12341f2f6726388d52843ab71a4..4cf1f6da384923352c86af25c5c80cdfb8f3e26b 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
@@ -1535,24 +1535,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)