2005-04-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index babeee4444cc470ca8908cd711f5a7b4b6565449..b150125a8711971d064666287f23de0db1778a80 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.7)
+AM_INIT_AUTOMAKE(mono,1.1.6.5)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -114,8 +114,8 @@ case "$host" in
                        libmono_cflags="$PTHREAD_CFLAGS"
                fi
                if test "x$PTHREAD_LIBS" = "x"; then
-                       LDFLAGS="$LDFLAGS -lpthread"
-                       libmono_ldflags="-lpthread"
+                       LDFLAGS="$LDFLAGS -lthr"
+                       libmono_ldflags="-lthr"
                else
                        LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
                        libmono_ldflags="$PTHREAD_LIBS"
@@ -123,35 +123,10 @@ case "$host" in
                need_link_unlink=yes
                AC_DEFINE(PTHREAD_POINTER_ID)
                libdl=
+               with_sigaltstack=yes
                libgc_threads=pthreads
 # TLS is only partially implemented on 5-STABLE (compiler support
 # but NOT library support)
-#
-               with_nptl=no
-               with_tls=pthread
-               ;;
-       *-*-*freebsd6*)
-               platform_win32=no
-               if test "x$PTHREAD_CFLAGS" = "x"; then
-                       CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-                       libmono_cflags=
-               else
-                       CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
-                       libmono_cflags="$PTHREAD_CFLAGS"
-               fi
-               if test "x$PTHREAD_LIBS" = "x"; then
-                       LDFLAGS="$LDFLAGS -pthread"
-                       libmono_ldflags="-pthread"
-               else
-                       LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
-                       libmono_ldflags="$PTHREAD_LIBS"
-               fi
-               need_link_unlink=yes
-               AC_DEFINE(PTHREAD_POINTER_ID)
-               libdl=
-               libgc_threads=pthreads
-# TLS is only partially implemented on -CURRENT (compiler support
-# but NOT library support)
 #
                with_tls=pthread
                ;;
@@ -165,8 +140,8 @@ case "$host" in
                        libmono_cflags="$PTHREAD_CFLAGS"
                fi
                if test "x$PTHREAD_LIBS" = "x"; then
-                       LDFLAGS="$LDFLAGS -lpthread"
-                       libmono_ldflags="-lpthread"
+                       LDFLAGS="$LDFLAGS -lthr"
+                       libmono_ldflags="-lthr"
                else
                        LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
                        libmono_ldflags="$PTHREAD_LIBS"
@@ -212,7 +187,7 @@ case "$host" in
                 ;;
        *-*-solaris*)
                platform_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
+               CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
                need_link_unlink=yes
                libmono_cflags="-D_REENTRANT"
                libgc_threads=pthreads
@@ -866,6 +841,14 @@ if test x$platform_win32 = xno; then
                *-*-*freebsd4*)
                        AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
                ;;
+               *-*-*freebsd5*)
+                       # libthr is preferrable on CURRENT 
+                       AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+               ;;
+               *-*-*freebsd6*)
+                       # libthr is preferrable on CURRENT 
+                       AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+               ;;
                *)
                        AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
                ;;
@@ -1134,6 +1117,16 @@ if test x$platform_win32 = xno; then
                AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
        fi
 
+       dnl **********************************
+       dnl *** epoll                      ***
+       dnl **********************************
+       AC_CHECK_HEADERS(sys/epoll.h)
+       haveepoll=no
+       AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
+       if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes" ; then
+               AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
+       fi
+
        dnl **********************************
        dnl *** Checks for MonoPosixHelper ***
        dnl **********************************
@@ -1452,8 +1445,6 @@ case "$host" in
                arch_target=ppc;
                JIT_SUPPORTED=yes
                jit_wanted=true
-               # HACK: PPC -O2 is locking wiht io-layer-no-daemon; remove me when #74562 is fixed
-               CFLAGS=`echo $CFLAGS | sed -e 's/-O2 //'`
                ;;
        arm-*-linux-* | armv4l-*-linux-*)
                TARGET=ARM;
@@ -1608,8 +1599,8 @@ fi
 
 PREVIEW=yes
 AC_ARG_WITH(preview, [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
-       if test x$with_preview = xyes; then
-             PREVIEW=yes
+       if test x$with_preview = xno; then
+             PREVIEW=no
        fi
 ])
 
@@ -1720,8 +1711,8 @@ mono/benchmark/Makefile
 mono/monoburg/Makefile
 mono/monograph/Makefile
 mono/io-layer/Makefile
-mono/handles/Makefile
 mono/mini/Makefile
+mono/handles/Makefile
 mono/profiler/Makefile
 ikvm-native/Makefile
 scripts/Makefile