Check-in missing changes.

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index a5a4eac433d616a23c128cdf00ae49574db4ab77..8531d428198f1fd907093cc312863f8199e045ad 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.6.5)
+AM_INIT_AUTOMAKE(mono,1.1.7.99)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -252,6 +252,7 @@ AC_SUBST(BUILD_EXEEXT)
 # Set STDC_HEADERS
 AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_FAST_INSTALL
 AM_PROG_LIBTOOL
 
 # Test whenever ld supports -version-script
@@ -1320,38 +1321,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])
 
@@ -1362,6 +1331,9 @@ JIT_SUPPORTED=no
 INTERP_SUPPORTED=no
 LIBC="libc.so.6"
 INTL="libc.so.6"
+SQLITE="libsqlite.so.0"
+SQLITE3="libsqlite3.so.0"
+X11="libX11.so.6.2"
 
 jit_wanted=false
 interp_wanted=false
@@ -1391,8 +1363,12 @@ case "$host" in
                arch_target=sparc;
                JIT_SUPPORTED=yes
                ACCESS_UNALIGNED="no"
-               LIBC="libc.so"
-               INTL="libintl.so"
+               case $host_os in
+                 linux*) ;;
+                 *)
+                       LIBC="libc.so"
+                       INTL="libintl.so"
+               esac
                jit_wanted=true
                if test x"$GCC" = xyes; then
                        CFLAGS="$CFLAGS -Wno-cast-align"
@@ -1405,6 +1381,11 @@ case "$host" in
                INTERP_SUPPORTED=yes
                interp_wanted=true
                arch_target=alpha;
+               case $host_os in
+                 linux*)
+                       LIBC="libc.so.6.1"
+                       INTL="libc.so.6.1"
+               esac
               ;;
        *-*-mingw*|*-*-cygwin*)
                INTL="intl"
@@ -1513,6 +1494,9 @@ case "$host" in
        libsuffix=".dylib"
        LIBC="libc.dylib"
        INTL="libintl.dylib"
+       SQLITE="libsqlite.0.dylib"
+       SQLITE3="libsqlite3.0.dylib"
+       X11="libX11.dylib"
        ;;
      *-*-*netbsd*)
        LIBC="libc.so.12"
@@ -1626,6 +1610,9 @@ AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
 
 AC_SUBST(LIBC)
 AC_SUBST(INTL)
+AC_SUBST(SQLITE)
+AC_SUBST(SQLITE3)
+AC_SUBST(X11)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
@@ -1704,6 +1691,7 @@ mono/arch/s390/Makefile
 mono/arch/s390x/Makefile
 mono/arch/arm/Makefile
 mono/arch/alpha/Makefile
+mono/arch/ia64/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/tests/tests-config
@@ -1733,16 +1721,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}