X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;fp=configure.in;h=5e34f9d203cc64a5a895c746d0dc854803ca54af;hb=9e1f34dd2d7be45b2a3a6b1c133a4a1de8c3d864;hp=19cfe2c0ac884932ead162cac980b9e3cabf1bd9;hpb=05972f1287dd96633578d843b6fe46d1a25c4539;p=mono.git

diff --git a/configure.in b/configure.in
index 19cfe2c0ac8..5e34f9d203c 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(mono,2.7)
 AM_MAINTAINER_MODE
 
-API_VER=1.0
+API_VER=2.0
 AC_SUBST(API_VER)
 
 AC_PROG_LN_S
@@ -204,6 +204,7 @@ case "$host" in
 		with_tls=pthread
 		has_dtrace=yes
 		use_sigposix=yes
+		enable_solaris_tar_check=yes
 		;;
 	*-*-darwin*)
 		parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
@@ -261,6 +262,7 @@ AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
+AC_CHECK_TOOL(CXX, g++, g++)
 AC_PROG_CXX
 AM_PROG_AS
 AM_PROG_CC_STDC
@@ -273,6 +275,16 @@ dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
 AC_SUBST(CCAS)
 AC_SUBST(CCASFLAGS)
 
+# AC_PROG_CXX helpfully sets CXX to g++ even if no c++ compiler is found so check
+# GXX instead. See http://lists.gnu.org/archive/html/bug-autoconf/2002-04/msg00056.html
+if test "x$CXX" = "xg++"; then
+	if test "x$GXX" != "xyes"; then
+		# automake/libtool is so broken, it requires g++ even if the c++ sources
+		# are inside automake conditionals
+		AC_MSG_ERROR([You need to install g++])
+	fi
+fi
+
 AC_CHECK_PROG(BISON, bison,yes,no)
 if test "x$BISON" = "xno";
 then
@@ -417,7 +429,7 @@ AC_ARG_ENABLE(solaris-tar-check,
 [  --disable-solaris-tar-check    disable solaris tar check],
    do_solaris_tar_check=no, do_solaris_tar_check=yes)
 
-if test x"$do_solaris_tar_check" = xyes; then
+if test x"$do_solaris_tar_check" = xyes -a x"$enable_solaris_tar_check" = xyes; then
    	AC_MSG_CHECKING(integrity of package)
    	if test -f $srcdir/$mcsdir/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
    	then
@@ -1913,7 +1925,9 @@ if test "x$enable_llvm" = "xyes"; then
 
    # The output of --cflags seems to include optimizations flags too
    LLVM_CFLAGS=`$LLVM_CONFIG --cflags | sed -e 's/-O2//g' | sed -e 's/-O0//g' | sed -e 's/-fomit-frame-pointer//g' | sed -e 's/-fPIC//g'`
-   LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags`
+   # LLVM is compiled with -fno-rtti, so we need this too, since our classes inherit
+   # from LLVM classes.
+   LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
    LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
    LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen`
    LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
@@ -2308,16 +2322,19 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
 fi
 
 mono_debugger_supported=no
-if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xALPHA"; then
-	if test x$use_included_gc = xyes; then
-		case "$host" in
-		*-*-*linux*)
-			mono_debugger_supported=yes
-			;;
-		*86-apple-darwin*)
-			mono_debugger_supported=yes
-			;;		
-		esac
+AC_ARG_ENABLE(mono-debugger, [  --disable-mono-debugger disable support for the mdb debugger], try_mono_debugger=$enableval, try_mono_debugger=yes)
+if test "x$try_mono_debugger" = "xyes"; then
+	if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xALPHA"; then
+		if test x$use_included_gc = xyes; then
+			case "$host" in
+			*-*-*linux*)
+				mono_debugger_supported=yes
+				;;
+			*86-apple-darwin*)
+				mono_debugger_supported=yes
+				;;		
+			esac
+		fi
 	fi
 fi
 
@@ -2650,7 +2667,7 @@ data/net_2_0/Makefile
 data/net_4_0/Makefile
 data/net_2_0/Browsers/Makefile
 data/mint.pc
-data/mono.pc
+data/mono-2.pc
 data/mono-cairo.pc
 data/mono-nunit.pc
 data/mono-options.pc