Forgot to remove the function prototype when removing the function.

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index c7aea831875feb6107eb05c99e9542ca60a71a14..63f89604658a74b87955b051c44120c468634d26 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.7.99)
+AM_INIT_AUTOMAKE(mono,1.1.8)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -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.
@@ -603,7 +604,7 @@ if test x$platform_win32 = xno; then
        # potential compiler bugs.  Defines LARGE_FILE_SUPPORT, adds $1 to
        # CPPFLAGS and sets $large_offt to yes if the test succeeds
        large_offt=no
-       AC_DEFUN(LARGE_FILES, [
+       AC_DEFUN([LARGE_FILES], [
                large_CPPFLAGS=$CPPFLAGS
                CPPFLAGS="$CPPFLAGS $1"
                AC_TRY_RUN([
@@ -1163,6 +1164,8 @@ if test x$platform_win32 = xno; then
        AC_CHECK_FUNCS(fgetpwent)
        AC_CHECK_FUNCS(fgetpwent)
        AC_CHECK_FUNCS(getfsstat)
+       AC_CHECK_FUNCS(mremap)
+       AC_CHECK_FUNCS(remap_file_pages)
        AC_CHECK_FUNCS(posix_fadvise)
        AC_CHECK_FUNCS(posix_fallocate)
        AC_CHECK_FUNCS(posix_madvise)
@@ -1532,14 +1535,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)
 
@@ -1702,6 +1715,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+mono-uninstalled.pc
 scripts/mono-nunit.pc
 scripts/mono-find-provides
 scripts/mono-find-requires
@@ -1768,6 +1782,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}