X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=5ff1fc49f08e7a98d7a029bcbeeeea8b92468128;hb=bb2cbd5df7eea9ece23c812f22ea4667415d323e;hp=2494e1c5bc1c94d071e5d0cf732f2ebf72ee8f09;hpb=e92e993875469256c6ff56730955d7dcad18f184;p=mono.git

diff --git a/configure.in b/configure.in
index 2494e1c5bc1..5ff1fc49f08 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.15)
+AM_INIT_AUTOMAKE(mono,1.1.17)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -67,6 +67,8 @@ case "$host" in
 		fi
 		HOST_CC="gcc"
 		CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024"
+		libmono_cflags="-mno-cygwin"
+		libmono_ldflags="-mno-cygwin"
 		libdl=
 		libgc_threads=win32
 		gc_default=included
@@ -285,7 +287,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 linux/rtc.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 
@@ -390,13 +392,6 @@ if test "x$PKG_CONFIG" = "xno"; then
 	AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-dnl for use on the build system
-dnl pkg-config is stupid
-BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
-BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
-AC_SUBST(BUILD_GLIB_CFLAGS)
-AC_SUBST(BUILD_GLIB_LIBS)
-
 pkg_config_path=
 AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir],
 	if test x$with_crosspkgdir = "x"; then
@@ -410,20 +405,43 @@ AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir],
 	fi
 )
 
-## Versions of dependencies
-GLIB_REQUIRED_VERSION=1.3.11
-
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
-
-GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
-GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
-GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
-GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
-
+AC_ARG_WITH([glib],
+	[  --with-glib=embedded|system       Choose glib API: system or embedded (default to system)],
+	[], [with_glib=system])
+
+case $with_glib in
+embedded) 
+  GLIB_CFLAGS='-I$(top_srcdir)/eglib/src'
+  GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
+  BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
+  BUILD_GLIB_LIBS="$GLIB_LIBS"
+  AC_CONFIG_SUBDIRS(eglib)
+  ;;
+system)
+  BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
+  BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
+
+  ## Versions of dependencies
+  GLIB_REQUIRED_VERSION=1.3.11
+  
+  PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
+  
+  GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
+  GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
+  GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
+  GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
+  ;;
+*)
+  AC_MSG_ERROR([Invalid argument to --with-glib.])
+esac
+AM_CONDITIONAL(EGLIB_BUILD, test x$with_glib = xembedded)
+  
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
+AC_SUBST(BUILD_GLIB_CFLAGS)
+AC_SUBST(BUILD_GLIB_LIBS)
 
 if test x$cross_compiling$platform_win32 = xnoyes; then
    AC_MSG_CHECKING(for cygwin glib2-dev package)
@@ -699,6 +717,7 @@ if test x$platform_win32 = xno; then
 	AC_CHECK_FUNCS(setresuid)
 	AC_CHECK_FUNCS(kqueue)
 	AC_CHECK_FUNCS(backtrace_symbols)
+	AC_CHECK_FUNCS(mkstemp)
 
 	dnl ******************************************************************
 	dnl *** Check for large file support                               ***
@@ -885,7 +904,7 @@ if test x$platform_win32 = xno; then
 	dnl *****************************
 	dnl *** Checks for libnsl     ***
 	dnl *****************************
-	AC_CHECK_LIB(nsl, gethostbyaddr, LIBS="$LIBS -lnsl")
+	AC_CHECK_FUNC(gethostbyaddr, , AC_CHECK_LIB(nsl, gethostbyaddr, LIBS="$LIBS -lnsl"))
 
 	AC_CHECK_FUNCS(inet_pton inet_aton)
 
@@ -1203,41 +1222,6 @@ if test x$platform_win32 = xno; then
 		AC_MSG_RESULT(no)
 	]) 
 
-	dnl *********************
-	dnl *** Check for AIO ***
-	dnl *********************
-	AC_MSG_CHECKING([for SIGEV_THREAD definition])
-	dnl Some systems (FreeBSD at least) may have aio_read
-	dnl but don't support/define SIGEV_THREAD.
-	AC_TRY_COMPILE([
-	#include <sys/signal.h>
-	],[
-	int x = SIGEV_THREAD;
-	],[
-		ac_cv_c_sigev_thread=yes
-		AC_MSG_RESULT(yes)
-	],[
-		AC_MSG_RESULT(no)
-	])
-
-	if test "$ac_cv_c_sigev_thread" = "yes" ; then
-		AC_CHECK_HEADERS(aio.h sys/aio.h)
-		AC_CHECK_LIB(rt, aio_read, [ LIBS="$LIBS -lrt" ],)
-		SIGVAL_PTR="undefined"
-		if test "$ac_cv_header_aio_h" = "yes" -o "$ac_cv_header_sys_aio_h" = "yes" ; then
-			AC_CHECK_MEMBER(union sigval.sigval_ptr,SIGVAL_PTR="sigval_ptr",, [
-					#include <sys/signal.h>
-					])
-			AC_CHECK_MEMBER(union sigval.sival_ptr,SIGVAL_PTR="sival_ptr",, [
-					#include <sys/signal.h>
-					])
-			if test "$SIGVAL_PTR" = "undefined" ; then
-				AC_MSG_ERROR([Unable to detect field name in 'union sigval'])
-			fi
-		fi
-		AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
-	fi
-
 	dnl **********************************
 	dnl *** epoll			   ***
 	dnl **********************************
@@ -1273,13 +1257,6 @@ if test x$platform_win32 = xno; then
 	dnl **********************************
 	dnl *** Checks for MonoPosixHelper ***
 	dnl **********************************
-	AC_CHECK_FUNC(setkey, ,
-		AC_CHECK_LIB(crypt, setkey, [ 
-			AC_DEFINE(HAVE_SETKEY, 1, [Define if setkey(3) is available]) 
-			CRYPT_LIBS="-lcrypt" 
-		])
-	)
-	AC_SUBST(CRYPT_LIBS)
 	AC_CHECK_HEADERS(checklist.h)
 	AC_CHECK_HEADERS(fstab.h)
 	AC_CHECK_HEADERS(attr/xattr.h)
@@ -1532,6 +1509,8 @@ case "$host" in
 			# foo.c:6: warning: visibility attribute not supported in this configuration; ignored
 			# ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally
 			have_visibility_hidden=no
+
+			libmono_ldflags="$libmono_ldflags $LIBS"
 		esac
 		;;
 	x86_64-*-* | amd64-*-*)
@@ -1579,10 +1558,10 @@ case "$host" in
        alpha*-*-linux* | alpha*-*-osf*)
 		TARGET=ALPHA;
 		ACCESS_UNALIGNED="no"
-		JIT_SUPPORTED=no
-		INTERP_SUPPORTED=yes
-		interp_wanted=true
+		JIT_SUPPORTED=yes
+		jit_wanted=true
 		arch_target=alpha;
+		CFLAGS="$CFLAGS -mieee"
 		case $host_os in
 		  linux*)
 			LIBC="libc.so.6.1"
@@ -1629,6 +1608,8 @@ case "$host" in
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=yes
 		jit_wanted=true
+		# Required CFLAGS for s390[x].  USE_STRING_INLINES is automatic with gcc 4.1
+		CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
 		;;
 	s390x-*-linux*)
 		TARGET=S390x;
@@ -1637,6 +1618,7 @@ case "$host" in
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=yes
 		jit_wanted=true
+		CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
 		;;
 esac
 
@@ -2035,6 +2017,14 @@ echo "
 	$disabled
 
 "
+if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then
+   AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs)
+fi
+
+if test x$have_zlib = xno; then
+   AC_MSG_WARN(ZLib devel files not available, compression file support in 2.0 won't work.)
+fi
+
 if test x$gc = xsgen; then
         echo IMPORTANT:
 	echo IMPORTANT: You have selected an experimental, work-in-progress