* ResXResourceReader.cs (load_data): Make exception more informative.

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index a9beaf4afbc8f9e5cbcb195e9839091ab564a789..64395dd9b3915312cc9adf47deccb87f9ce8c13b 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.3)
+AM_INIT_AUTOMAKE(mono,1.1.4)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -272,6 +272,18 @@ if test x"$GCC" = xyes; then
         WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
                # The runtime code does not respect ANSI C strict aliasing rules
                CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+               ORIG_CFLAGS=$CFLAGS
+               CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+               AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
+               AC_TRY_COMPILE([], [
+                                                  void main () { }
+               ], [
+                  AC_MSG_RESULT(yes)
+               ], [
+                  AC_MSG_RESULT(no)
+                  CFLAGS=$ORIG_CFLAGS
+               ])
 else
        # The Sun Forte compiler complains about inline functions that access static variables
        # so disable all inlining.
@@ -510,6 +522,7 @@ if test x$platform_win32 = xno; then
        ikvm_native_dir=
        if test x$with_ikvm_native = xyes; then
                ikvm_native_dir=ikvm-native
+               jdk_headers_found="IKVM Native"
        fi
 
        AC_SUBST(ikvm_native_dir)
@@ -1074,7 +1087,13 @@ if test x$platform_win32 = xno; then
        dnl *********************************
        dnl *** Check for Console 2.0 I/O ***
        dnl *********************************
-       AC_CHECK_HEADERS([term.h termios.h])
+       AC_CHECK_HEADERS([curses.h])
+       AC_CHECK_HEADERS([term.h], [], [],
+       [#if HAVE_CURSES_H
+        #include <curses.h>
+        #endif
+       ])
+       AC_CHECK_HEADERS([termios.h])
 else
        jdk_headers_found=no
        AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))