X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=64395dd9b3915312cc9adf47deccb87f9ce8c13b;hb=0aa0f24d749566b3c3505d9928227cb6e3797b70;hp=9e79754057a37610ef4a52a2e82d2e3bf01a463a;hpb=524cf73d7851abfcf26687b799b05a6282896cfc;p=mono.git

diff --git a/configure.in b/configure.in
index 9e79754057a..64395dd9b39 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.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.
@@ -502,6 +514,19 @@ dnl
 
 if test x$platform_win32 = xno; then
 
+	dnl ******************************************************************
+	dnl *** Checks for the IKVM JNI interface library                  ***
+	dnl ******************************************************************
+	AC_ARG_WITH(ikvm-native, [  --with-ikvm-native=yes,no  build the IKVM JNI interface library],[with_ikvm_native=$withval],[with_ikvm_native=yes])
+
+	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)
+
 	AC_CHECK_FUNCS(getgrgid_r)
 	AC_CHECK_FUNCS(getgrnam_r)
 	AC_CHECK_FUNCS(getpwnam_r)
@@ -509,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                               ***
@@ -1028,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)
@@ -1037,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)
@@ -1051,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?))
@@ -1556,6 +1599,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+scripts/mono-nunit.pc
 mono/Makefile
 mono/utils/Makefile
 mono/metadata/Makefile
@@ -1584,6 +1628,7 @@ mono/io-layer/Makefile
 mono/handles/Makefile
 mono/mini/Makefile
 mono/profiler/Makefile
+ikvm-native/Makefile
 scripts/Makefile
 man/Makefile
 web/Makefile