X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=05857266bd95b3fe9c1bb7e0a3e9168fae805331;hb=3a390e91fc940ce8c5c5c19334f1b328cefe7702;hp=35b280fd09f786ead09e92ab2e8500020a56815a;hpb=3c8c47d41c9c9552fed3bc2b8217b32a9b28e368;p=mono.git

diff --git a/configure.in b/configure.in
index 35b280fd09f..05857266bd9 100644
--- 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.99)
+AM_INIT_AUTOMAKE(mono,1.1.8)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -169,7 +169,7 @@ case "$host" in
 		;;
 	*-*-linux*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+		CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP"
 		libmono_cflags="-D_REENTRANT"
 		libmono_ldflags="-lpthread"
 		libdl="-ldl"
@@ -187,7 +187,7 @@ case "$host" in
                 ;;
 	*-*-solaris*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP"
 		need_link_unlink=yes
 		libmono_cflags="-D_REENTRANT"
 		libgc_threads=pthreads
@@ -223,6 +223,7 @@ AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
+AC_PROG_AWK
 dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
 : ${CCAS='$(CC)'}
 # Set ASFLAGS if not already set.
@@ -1377,6 +1378,15 @@ case "$host" in
 		arch_target=amd64;
 		JIT_SUPPORTED=yes
 		jit_wanted=true
+		;;
+	ia64-*-*)
+		TARGET=IA64
+		arch_target=ia64
+		ACCESS_UNALIGNED="no"
+		JIT_SUPPORTED=yes
+		jit_wanted=true
+		AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
+
 		;;
 	sparc*-*-*)
 		if test "x$ac_cv_sizeof_void_p" = "x8"; then
@@ -1514,7 +1524,7 @@ AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
 libsuffix=".so"
 
 case "$host" in
-     powerpc-*-darwin*)
+     *-*-darwin*)
 	libsuffix=".dylib"
 	LIBC="libc.dylib"
 	INTL="libintl.dylib"
@@ -1534,14 +1544,24 @@ case "$host" in
     	LIBC="libc.so"
 	INTL="libintl.so"
 	;;
-esac
-
-if test "x$X11" = "xlibX11.so"; then
+    *-*-*linux*)
 	AC_PATH_X
-	if test "x$no_x" != "xyes"; then
-		X11=`readlink $x_libraries/libX11.so`
+	AC_MSG_CHECKING(for the soname of libX11.so)
+	for i in $x_libraries /usr/lib /usr/lib64; do
+		for r in 4 5 6; do
+			if test -f $i/libX11.so.$r; then
+				X11=libX11.so.$r
+				AC_MSG_RESULT($X11)
+			fi
+		done
+	done
+	
+	if test "x$X11" = "xlibX11.so"; then
+		AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]);
 	fi
-fi
+	;;
+esac
+
 
 AC_SUBST(libsuffix)
 
@@ -1704,6 +1724,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+mono-uninstalled.pc
 scripts/mono-nunit.pc
 scripts/mono-find-provides
 scripts/mono-find-requires
@@ -1770,6 +1791,21 @@ runtime/Makefile
   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
+
+  export VERSION
+  [myver=$($AWK 'BEGIN {
+    split (ENVIRON["VERSION"] ".0.0.0.0", vsplit, ".")
+    print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
+  }')]
+  
+  cat > $srcdir/$mcsdir/build/common/MonoVersion.cs <<EOF
+//
+// This version number is generated from configure.in in the mono source tree.
+//
+using System.Reflection;
+
+[[assembly: AssemblyVersion("${myver}")]]
+EOF
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}