X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=6f6537bbd37adb3d09fb48e4db9f5906a0e3d4c1;hb=785e52ddc16057c4a726165f48b9448bc5fa9b97;hp=0138ec4ec9038b95dda0b960861bc64a0f94b58d;hpb=888944f0bb56f06e1d83b0f4e5c1ddacdb9c9e13;p=mono.git

diff --git a/configure.in b/configure.in
index 0138ec4ec90..6f6537bbd37 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,23 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
+
+# Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
+# The extra brackets are to foil regex-based scans.
+m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-pax])])
+
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.2.99)
+AM_INIT_AUTOMAKE(mono,1.1.3)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
 
+# In case of cygwin, override LN_S, irrespective of what it determines.
+# The build uses cygwin, but the actual runtime doesn't.
+case $host_os in
+*cygwin* ) LN_S='cp -p';;
+esac
+
+
 dnl
 dnl libgc checks
 dnl
@@ -239,6 +251,18 @@ AC_CHECK_HEADERS(elf.h)
 
 # for mono/dis
 AC_CHECK_HEADERS(wchar.h)
+AC_CHECK_HEADERS(ieeefp.h)
+AC_MSG_CHECKING(for isinf)
+AC_TRY_COMPILE([#include <math.h>], [
+	int f = isinf (1);
+], [
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_ISINF, 1, [isinf available])
+], [
+	# We'll have to use signals
+	AC_MSG_RESULT(no)
+])
+
 
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
@@ -357,13 +381,47 @@ fi
 # This does not work on some platforms (bug #55253)
 AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=no])
 
-# assembly bundle support, see metadata/make-bundle.pl for more info
-AC_ARG_WITH(bundle, [  --with-bundle=bundle_template],[
-	BUNDLE_FILE=$with_bundle
-	AC_SUBST(BUNDLE_FILE)
-	AC_DEFINE(WITH_BUNDLE)
-],[with_bundle=no])
-AM_CONDITIONAL(WITH_BUNDLE, test x$with_bundle != xno)
+AC_ARG_WITH(static_mono, [  --with-static_mono=yes,no      link mono statically to libmono (faster)],[],[with_static_mono=yes])
+
+if test "x$enable_static" = "xno"; then
+   with_static_mono=no
+fi
+
+AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
+
+AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
+  LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, reflection_emit.],
+[
+	for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
+		eval "mono_feature_disable_$feature='yes'"
+		AC_MSG_NOTICE([Disabled support for feature: $feature])
+	done
+	disabled="Disabled:    $enable_minimal"
+],[])
+
+if test "x$mono_feature_disable_aot" = "xyes"; then
+	AC_DEFINE(DISABLE_AOT, 1, [Disable AOT support])
+fi
+
+if test "x$mono_feature_disable_profiler" = "xyes"; then
+	AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support])
+fi
+
+if test "x$mono_feature_disable_decimal" = "xyes"; then
+	AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support])
+fi
+
+if test "x$mono_feature_disable_pinvoke" = "xyes"; then
+	AC_DEFINE(DISABLE_PINVOKE, 1, [Disable P/Invoke support])
+fi
+
+if test "x$mono_feature_disable_debug" = "xyes"; then
+	AC_DEFINE(DISABLE_DEBUG, 1, [Disable runtime debugging support])
+fi
+
+if test "x$mono_feature_disable_reflection_emit" = "xyes"; then
+	AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support])
+fi
 
 LIBGC_CFLAGS=
 LIBGC_LIBS=
@@ -1197,14 +1255,17 @@ fi
 #
 ICU_CFLAGS=""
 ICU_LIBS=""
-enable_icu=no
+enable_icu="no;  default"
 
-probe_icu=true
+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
@@ -1222,14 +1283,19 @@ 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])
+
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
 JIT_SUPPORTED=no
+INTERP_SUPPORTED=no
 LIBC="libc.so.6"
 INTL="libc.so.6"
 
 jit_wanted=false
+interp_wanted=false
 case "$host" in
 #	mips-sgi-irix5.* | mips-sgi-irix6.*)
 #		TARGET=MIPS;
@@ -1259,11 +1325,16 @@ case "$host" in
 		LIBC="libc.so"
 		INTL="libintl.so"
 		jit_wanted=true
+		if test x"$GCC" = xyes; then
+			CFLAGS="$CFLAGS -Wno-cast-align"
+		fi
 		;;
        alpha*-*-linux* | alpha*-*-osf*)
 		TARGET=ALPHA;
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=no
+		INTERP_SUPPORTED=yes
+		interp_wanted=true
 		arch_target=alpha;
 	       ;;
 #	ia64-*-linux* | ia64-*-hpux*)
@@ -1284,15 +1355,20 @@ case "$host" in
 		arch_target=hppa; 
 		LIBC="libc.sl"
 		ACCESS_UNALIGNED="no"
+		INTERP_SUPPORTED=yes
+		interp_wanted=true
 		;;
 	hppa*linux*)
 		TARGET=HPPA;
 		arch_target=hppa; 
 		ACCESS_UNALIGNED="no"
+		INTERP_SUPPORTED=yes
+		interp_wanted=true
 		;;
 	macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
         powerpc-*-sysv* | powerpc-*-darwin*)
 		TARGET=POWERPC;
+		AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
 		arch_target=ppc;
 		JIT_SUPPORTED=yes
 		jit_wanted=true
@@ -1301,15 +1377,19 @@ case "$host" in
 		TARGET=ARM;
 		arch_target=arm;
 		ACCESS_UNALIGNED="no"
+		INTERP_SUPPORTED=yes
+		interp_wanted=true
 		;;
 	s390-*-linux*)
 		TARGET=S390;
+		AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
 		arch_target=s390;
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=yes
 		;;
 	s390x-*-linux*)
 		TARGET=S390x;
+		AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
 		arch_target=s390x;
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=yes
@@ -1324,16 +1404,32 @@ AC_ARG_WITH(jit, [  --with-jit=yes,no       If you want to build scripts that de
 	fi
 ])
 
+AC_ARG_WITH(interp, [  --with-interp=yes,no    If you want to build scripts that default to the interpreter],[
+	if test x$withval = xyes; then
+	   interp_wanted=true
+	else
+	   interp_wanted=false
+	fi
+])
+
 USEJIT=false
 if test x$JIT_SUPPORTED = xyes; then
    if $jit_wanted; then
       USEJIT=true
       jit_status="Building and using the JIT"
    else
-      jit_status="Building the JIT, defaulting to the interpreter"
+      if $interp_wanted; then
+         jit_status="Building the JIT, defaulting to the interpreter"
+      else
+         AC_ERROR(No JIT or interpreter support available or selected.)
+      fi
    fi
 else
-   jit_status="interpreter"
+   if $interp_wanted; then
+      jit_status="interpreter"
+   else
+      AC_ERROR(No JIT or interpreter support available or selected.)
+   fi
 fi
 
 AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
@@ -1445,6 +1541,7 @@ AM_CONDITIONAL(S390x, test x$TARGET = xS390x)
 AM_CONDITIONAL(HPPA, test x$TARGET = xHPPA)
 
 AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
+AM_CONDITIONAL(INTERP_SUPPORTED, test x$interp_wanted = xtrue)
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
 
 AC_SUBST(LIBC)
@@ -1455,6 +1552,54 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
+mono_build_root=`pwd`
+AC_SUBST(mono_build_root)
+
+if test x$USEJIT = xtrue; then
+  mono_runtime=mono/mini/mono
+else
+  mono_runtime=mono/interpreter/mint
+fi
+AC_SUBST(mono_runtime)
+
+mono_cfg_root=$mono_build_root/runtime
+if test x$platform_win32 = xyes; then
+  mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
+else
+  mono_cfg_dir=$mono_cfg_root/etc
+fi
+AC_SUBST(mono_cfg_dir)
+
+AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [\\/$]* | ?:[\\/]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/1.0
+    cd runtime/etc/mono/1.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_1_1/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [\\/$]* | ?:[\\/]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
+    cd runtime/etc/mono/2.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_2_0/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
 AC_OUTPUT([
 Makefile
 mint.pc
@@ -1488,9 +1633,6 @@ mono/handles/Makefile
 mono/mini/Makefile
 mono/profiler/Makefile
 ikvm-jni/Makefile
-runtime/Makefile
-runtime/net_1_1/Makefile
-runtime/net_2_0/Makefile
 scripts/Makefile
 man/Makefile
 web/Makefile
@@ -1504,8 +1646,21 @@ data/config
 mono.spec
 tools/Makefile
 tools/locale-builder/Makefile
+runtime/Makefile
 ])
 
+(
+  case $prefix in
+  NONE) prefix=/usr/local ;;
+  esac
+  case $exec_prefix in
+  NONE | '${prefix}') exec_prefix=$prefix ;;
+  esac
+
+  echo "prefix=$exec_prefix" > $srcdir/$mcsdir/build/config.make
+  echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
+)
+
 echo "
         mcs source:  $mcs_topdir
 	GC:	     $gc
@@ -1515,5 +1670,6 @@ echo "
 	Engine:      $jit_status
 	2.0 Alpha:   $PREVIEW
 	JNI support: $jdk_headers_found
+	$disabled
 
 "