* ResXResourceReader.cs (load_data): Make exception more informative.
[mono.git] / configure.in
index fe79c527ac7605c27c27e07d4eb83da7330946cc..64395dd9b3915312cc9adf47deccb87f9ce8c13b 100644 (file)
@@ -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
@@ -240,7 +240,7 @@ fi
 
 AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 
@@ -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.
@@ -505,56 +517,15 @@ if test x$platform_win32 = xno; then
        dnl ******************************************************************
        dnl *** Checks for the IKVM JNI interface library                  ***
        dnl ******************************************************************
-       AC_ARG_WITH(ikvm-jni, [  --with-ikvm-jni=yes,no  build the IKVM JNI interface library],[with_ikvm_jni=$withval],[with_ikvm_jni=yes])
-       AC_ARG_WITH(jdk, [  --with-jdk=DIRECTORY    Use JDK from DIRECTORY],[with_jdk_dir=$withval],[with_jdk_dir=])
-
-       ikvm_jni_dir=
-       if test x$with_ikvm_jni = xyes; then
-               AC_MSG_CHECKING([JDK headers])
-
-               if test x$with_jdk_dir = x; then
-                       # Try JAVA_HOME variable
-                       if test x$JAVA_HOME != x; then
-                               with_jdk_dir=$JAVA_HOME
-                       fi
-               fi
-       
-               jdk_platform=
-               if test -d $with_jdk_dir/include; then
-                       jdk_headers_found=yes
-
-                       if test -d $with_jdk_dir/include/linux; then
-                               jdk_platform=linux
-                       else
-                       if test -d $with_jdk_dir/include/solaris; then
-                               jdk_platform=solaris
-                       else
-                       if test -f $with_jdk_dir/include/jni_md.h; then
-                               # GNU Classpath sources
-                               jdk_platform=
-                       else
-                               jdk_headers_found=no
-                       fi
-                       fi
-                       fi
-               else
-                       jdk_headers_found=no
-               fi
+       AC_ARG_WITH(ikvm-native, [  --with-ikvm-native=yes,no  build the IKVM JNI interface library],[with_ikvm_native=$withval],[with_ikvm_native=yes])
 
-               if test x$jdk_headers_found = xyes; then
-                       AC_MSG_RESULT($with_jdk_dir/include $with_jdk_dir/include/$jdk_platform)
-               else
-                       AC_MSG_RESULT(not found)
-               fi
-
-               if test x$jdk_headers_found = xyes; then
-                       ikvm_jni_dir=ikvm-jni
-                       IKVM_JNI_CFLAGS="-I$with_jdk_dir/include -I$with_jdk_dir/include/$jdk_platform"
-               fi
+       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_jni_dir)
-       AC_SUBST(IKVM_JNI_CFLAGS)
+       AC_SUBST(ikvm_native_dir)
 
        AC_CHECK_FUNCS(getgrgid_r)
        AC_CHECK_FUNCS(getgrnam_r)
@@ -563,6 +534,7 @@ if test x$platform_win32 = xno; then
        AC_CHECK_FUNCS(getresuid)
        AC_CHECK_FUNCS(setresuid)
        AC_CHECK_FUNCS(kqueue)
+       AC_CHECK_FUNCS(backtrace_symbols)
 
        dnl ******************************************************************
        dnl *** Check for large file support                               ***
@@ -1082,8 +1054,13 @@ if test x$platform_win32 = xno; then
        dnl **********************************
        dnl *** Checks for MonoPosixHelper ***
        dnl **********************************
+       AC_CHECK_HEADERS(checklist.h)
+       AC_CHECK_HEADERS(fstab.h)
        AC_CHECK_HEADERS(sys/sendfile.h)
        AC_CHECK_HEADERS(sys/statvfs.h)
+       AC_CHECK_HEADERS(sys/vfstab.h)
+       AC_CHECK_FUNCS(getdomainname)
+       AC_CHECK_FUNCS(setdomainname)
        AC_CHECK_FUNCS(fgetgrent)
        AC_CHECK_FUNCS(fgetpwent)
        AC_CHECK_FUNCS(fgetpwent)
@@ -1091,6 +1068,7 @@ if test x$platform_win32 = xno; then
        AC_CHECK_FUNCS(posix_fadvise)
        AC_CHECK_FUNCS(posix_fallocate)
        AC_CHECK_FUNCS(posix_madvise)
+       AC_CHECK_FUNCS(vsnprintf)
        AC_CHECK_FUNCS(sendfile)
        AC_CHECK_FUNCS(sethostid)
        AC_CHECK_FUNCS(statfs)
@@ -1105,6 +1083,17 @@ if test x$platform_win32 = xno; then
                [struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, 
                [#include <sys/types.h>
                 #include <dirent.h>])
+
+       dnl *********************************
+       dnl *** Check for Console 2.0 I/O ***
+       dnl *********************************
+       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?))
@@ -1610,6 +1599,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+scripts/mono-nunit.pc
 mono/Makefile
 mono/utils/Makefile
 mono/metadata/Makefile
@@ -1638,7 +1628,7 @@ mono/io-layer/Makefile
 mono/handles/Makefile
 mono/mini/Makefile
 mono/profiler/Makefile
-ikvm-jni/Makefile
+ikvm-native/Makefile
 scripts/Makefile
 man/Makefile
 web/Makefile