2005-09-11 Zoltan Varga <vargaz@gmail.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 6cf992abf9600431bb88af0c6771e86ea1797a16..151c98c36f881e4e0d339d9f5c49111148a29f17 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.8)
+AM_INIT_AUTOMAKE(mono,1.1.9)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -55,10 +55,12 @@ case "$host" in
        *-*-mingw*|*-*-cygwin*)
                platform_win32=yes
                AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
-               CC="gcc -mno-cygwin -g"
+               if test "x$cross_compiling" = "xno"; then
+                       CC="gcc -mno-cygwin -g"
+                       # So libgc configure gets -mno-cygwin
+                       export CC
+               fi
                HOST_CC="gcc"
-               # So libgc configure gets -mno-cygwin
-               export CC
                CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024"
                libdl=
                libgc_threads=win32
@@ -393,17 +395,19 @@ GLIB_REQUIRED_VERSION=1.3.11
 
 PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
 
-GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
-GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
-GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
-GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
+if test "x$cross_compiling" = "xno"; then
+   GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
+   GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
+   GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
+   GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
+fi
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-if test x$platform_win32 = xyes; then   
+if test x$platform_win32 = xyes -a x$cross_compiling = xno; then   
    AC_MSG_CHECKING(for cygwin glib2-dev package)
    if [ cygcheck --f /usr/lib/libglib-2.0.dll.a | grep -q glib2-devel ]; then
       AC_MSG_RESULT(found)
@@ -1741,6 +1745,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+dotnet.pc
 mono-uninstalled.pc
 scripts/mono-nunit.pc
 scripts/mono-find-provides
@@ -1816,18 +1821,12 @@ fi
 
   export VERSION
   [myver=$($AWK 'BEGIN {
-    split (ENVIRON["VERSION"] ".0.0.0.0", vsplit, ".")
+    split (ENVIRON["VERSION"] ".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
+
+  # Generate Consts.cs
+  sed -e "s/@MONO_VERSION@/$myver/" $srcdir/$mcsdir/build/common/Consts.cs.in > $srcdir/$mcsdir/build/common/Consts.cs
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}