X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=0b6b84b2a11be39c72d44e06cbb8730380f7dc5c;hb=67f3d5f1270bf785f11f4d2264a374ae17900227;hp=94e05b8c39b535d71bc65b4d46c9e9102dd40c01;hpb=b3c26c8890651569d3790068de150d01667d70c3;p=mono.git

diff --git a/configure.in b/configure.in
index 94e05b8c39b..0b6b84b2a11 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_CANONICAL_SYSTEM
 
 # Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
 # The extra brackets are to foil regex-based scans.
-m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-pax])])
+m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(mono,1.1.3)
@@ -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])
 
@@ -251,6 +251,18 @@ AC_CHECK_HEADERS(elf.h)
 
 # for mono/dis
 AC_CHECK_HEADERS(wchar.h)
+AC_CHECK_HEADERS(ieeefp.h)
+AC_MSG_CHECKING(for isinf)
+AC_TRY_COMPILE([#include <math.h>], [
+	int f = isinf (1);
+], [
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_ISINF, 1, [isinf available])
+], [
+	# We'll have to use signals
+	AC_MSG_RESULT(no)
+])
+
 
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
@@ -493,56 +505,14 @@ 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=])
+	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_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
-
-		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
 	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)
@@ -551,6 +521,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                               ***
@@ -1070,15 +1041,27 @@ if test x$platform_win32 = xno; then
 	dnl **********************************
 	dnl *** Checks for MonoPosixHelper ***
 	dnl **********************************
-	AC_CHECK_FUNCS(posix_fadvise)
-	AC_CHECK_FUNCS(posix_madvise)
-	AC_CHECK_FUNCS(posix_fallocate)
+	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)
-	AC_CHECK_HEADERS(sys/sendfile.h)
+	AC_CHECK_FUNCS(getfsstat)
+	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)
+	AC_CHECK_FUNCS(fstatfs)
+	AC_CHECK_FUNCS(statvfs)
+	AC_CHECK_FUNCS(fstatvfs)
 	AC_CHECK_FUNCS(stime)
 	AC_CHECK_FUNCS(strerror_r)
 	AC_CHECK_FUNCS(ttyname_r)
@@ -1592,6 +1575,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+scripts/mono-nunit.pc
 mono/Makefile
 mono/utils/Makefile
 mono/metadata/Makefile
@@ -1620,7 +1604,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