2005-04-25 Ben Maurer <bmaurer@ximian.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index fbf95af18bf90178f5ea7c9f54bed612e27db497..3924a4f78308ffce7a8a80bd606c9fcf088a63e4 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.9)
 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 -lthr"
-                       libmono_ldflags="-lthr"
+                       LDFLAGS="$LDFLAGS -pthread"
+                       libmono_ldflags="-pthread"
                else
                        LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
                        libmono_ldflags="$PTHREAD_LIBS"
@@ -140,8 +140,8 @@ case "$host" in
                        libmono_cflags="$PTHREAD_CFLAGS"
                fi
                if test "x$PTHREAD_LIBS" = "x"; then
-                       LDFLAGS="$LDFLAGS -lthr"
-                       libmono_ldflags="-lthr"
+                       LDFLAGS="$LDFLAGS -pthread"
+                       libmono_ldflags="-pthread"
                else
                        LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
                        libmono_ldflags="$PTHREAD_LIBS"
@@ -187,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
@@ -842,12 +842,10 @@ if test x$platform_win32 = xno; then
                        AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
                ;;
                *-*-*freebsd5*)
-                       # libthr is preferrable on CURRENT 
-                       AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
                ;;
                *-*-*freebsd6*)
-                       # libthr is preferrable on CURRENT 
-                       AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
                ;;
                *)
                        AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
@@ -1135,6 +1133,7 @@ if test x$platform_win32 = xno; then
        AC_CHECK_HEADERS(sys/sendfile.h)
        AC_CHECK_HEADERS(sys/statvfs.h)
        AC_CHECK_HEADERS(sys/vfstab.h)
+       AC_CHECK_HEADERS(sys/xattr.h)
        AC_CHECK_FUNCS(getdomainname)
        AC_CHECK_FUNCS(setdomainname)
        AC_CHECK_FUNCS(fgetgrent)
@@ -1321,38 +1320,6 @@ if test "x$try_shared_handles" != "xyes"; then
        AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
-#
-# ICU 
-#
-ICU_CFLAGS=""
-ICU_LIBS=""
-enable_glob="normal;  default"
-
-probe_icu=false
-AC_ARG_WITH(icu, [  --with-icu=yes/no],
-       if test x$with_icu = xno; then
-          probe_icu=false;
-          AC_MSG_RESULT(Will not probe for ICU)
-       fi
-       if test x$with_icu = xyes; then
-          probe_icu=true;
-       fi
-)
-
-if $probe_icu; then
-       AC_PATH_PROG(ICU_CONFIG, icu-config, no)
-       if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then
-               enable_glob="ICU not found, using non-ICU globalization code."
-       else
-               enable_glob="ICU, unsupported. Version: `$ICU_CONFIG --version`"
-               AC_DEFINE(HAVE_ICU)
-               ICU_CFLAGS=`$ICU_CONFIG --cppflags`
-               ICU_LIBS=`$ICU_CONFIG --ldflags`
-       fi
-fi
-AC_SUBST(ICU_CFLAGS)
-AC_SUBST(ICU_LIBS)
-
 AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests      Run the nunit tests of the class library on 'make check'])
 AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
 
@@ -1652,6 +1619,7 @@ fi
 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_COMMANDS([runtime/etc/mono/1.0/machine.config],
 [   depth=../../../..
@@ -1733,16 +1701,22 @@ runtime/Makefile
 
 (
   case $prefix in
-  NONE) prefix=/usr/local ;;
+  NONE) prefix=$ac_default_prefix ;;
   esac
   case $exec_prefix in
-  NONE | '${prefix}') exec_prefix=$prefix ;;
+  NONE) exec_prefix='${prefix}' ;;
   esac
 
+  test -w $srcdir/$mcsdir/build || chmod +w $srcdir/$mcsdir/build
+
   echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
   echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
-  echo "mono_libdir=$exec_prefix/lib" >> $srcdir/$mcsdir/build/config.make
+  echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
   echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
+  echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
+  echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
+  echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
+  echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}