2010-05-20 Marek Safar <marek.safar@gmail.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index bd7d58b4b43fee118efb280c28545cc6c1273ec2..c6ca4f2db3b73d94cabb280fc63648346b1d0a93 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -235,18 +235,6 @@ case "$host" in
                dnl its gcc defaults to 64-bit mode.  They have also deprecated the usage of ucontext
                dnl we need to set some flags to build our 32-bit binaries on 10.6 properly
                case "$host" in
-                       dnl MacPorts config.guess reports as this
-                       x86_64-*-darwin10*)
-                               BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE -mmacosx-version-min=10.5"
-                               CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_FLAGS"
-                               CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS"
-                               CXXFLAGS="$CXXFLAGS $BROKEN_DARWIN_FLAGS"
-                               CCASFLAGS="$CCASFLAGS $BROKEN_DARWIN_FLAGS"
-                               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS"
-                               CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS"
-                               CPPFLAGS_FOR_EGLIB="$CPPFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS"
-                               CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS"
-                               ;;
                        dnl Snow Leopard config.guess reports as this
                        i*86-*-darwin10*)
                                BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE -mmacosx-version-min=10.5"
@@ -362,8 +350,14 @@ 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 sys/uio.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 sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h)
+AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h)
 
+AC_CHECK_HEADERS(sys/user.h, [], [],
+[
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+])
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 if test x$have_zlib = xyes; then
@@ -544,8 +538,8 @@ AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir      Chan
 )
 
 AC_ARG_WITH([glib],
-       [  --with-glib=embedded|system    Choose glib API: system or embedded (default to system)],
-       [], [with_glib=system])
+       [  --with-glib=embedded|system    Choose glib API: system or embedded (default to embedded)],
+       [], [with_glib=embedded])
 
 eglib_dir=
 
@@ -1531,7 +1525,7 @@ if test x$target_win32 = xno; then
        dnl *********************************
        dnl *** Checks for math functions ***
        dnl *********************************
-        LIBS="$LIBS -lm";
+       AC_SEARCH_LIBS(sqrtf, m)
        if test "x$has_broken_apple_cpp" != "xyes"; then
                AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
                        AC_TRY_LINK([#include <math.h>], 
@@ -1578,7 +1572,15 @@ if test x$target_win32 = xno; then
        dnl *** Checks for SIOCGIFCONF ***
        dnl ******************************
        AC_CHECK_HEADERS(sys/ioctl.h)
-       AC_CHECK_HEADERS(net/if.h)
+       AC_CHECK_HEADERS(net/if.h, [], [],
+          [
+          #ifdef HAVE_SYS_TYPES_H
+          # include <sys/types.h>
+          #endif
+          #ifdef HAVE_SYS_SOCKET_H
+          # include <sys/socket.h>
+          #endif
+          ])
        AC_MSG_CHECKING(for ifreq)
        AC_TRY_COMPILE([
                #include <stdio.h>
@@ -1642,6 +1644,12 @@ if test x$target_win32 = xno; then
        AC_CHECK_HEADERS(sys/xattr.h)
        AC_CHECK_HEADERS(sys/mman.h)
        AC_CHECK_HEADERS(sys/param.h)
+       AC_CHECK_HEADERS(sys/mount.h, [], [],
+               [
+               #ifdef HAVE_SYS_PARAM_H
+               # include <sys/param.h>
+               #endif
+               ])
        AC_CHECK_HEADERS(sys/mount.h)
        AC_CHECK_FUNCS(confstr)
        AC_CHECK_FUNCS(seekdir telldir)
@@ -2356,10 +2364,14 @@ case "$host" in
     *-*-*freebsd*)
        LIBC="libc.so"
        INTL="libintl.so"
+       SQLITE="libsqlite.so"
+       SQLITE3="libsqlite3.so"
        ;;
     *-*-*openbsd*)
        LIBC="libc.so"
        INTL="libintl.so"
+        SQLITE="libsqlite.so"
+        SQLITE3="libsqlite3.so"
        ;;
     *-*-*linux*)
        AC_PATH_X