X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=56369722cfac5bd5da71f902b72e9d29e3c41ea6;hb=5b62f8f84bce4f464e07c755e02089e5800398d0;hp=ae2d2b1868d7f567e33db3ea72508622ef302b6c;hpb=14eb67673a078a0ff754aea35ce9fd404aa45346;p=mono.git

diff --git a/configure.in b/configure.in
index ae2d2b1868d..56369722cfa 100644
--- a/configure.in
+++ b/configure.in
@@ -1,31 +1,121 @@
-
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.11)
+AM_INIT_AUTOMAKE(mono,0.25.99.2)
 AM_MAINTAINER_MODE
 
-dnl ****************************************
-dnl *** Check if we're building on win32 ***
-dnl ****************************************
-AC_MSG_CHECKING([if building for some Win32 platform])
+dnl
+dnl libgc checks
+dnl
+
+gc_headers=no
+gc=included
+use_included_gc=no
+
+if test -d $srcdir/libgc ; then
+  gc_default=included
+else
+  gc_default=boehm
+fi
+
+#
+# These are the flags that need to be stored in the mono.pc file for 
+# compiling code that will embed Mono
+#
+libmono_cflags=""
+libmono_ldflags=""
+AC_SUBST(libmono_cflags)
+AC_SUBST(libmono_ldflags)
+
+# Thread configuration inspired by sleepycat's db
+AC_MSG_CHECKING([host platform characteristics])
+libgc_threads=no
 case "$host" in
 	*-*-mingw*|*-*-cygwin*)
 		platform_win32=yes
 		AC_DEFINE(PLATFORM_WIN32)
 		CC="gcc -mno-cygwin"
+		HOST_CC="gcc"
+# latest libgc already defines GC_WIN32_THREADS
+#		CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
+		CPPFLAGS="$CPPFLAGS -DWIN32_THREADS"
+		libdl=
+		libgc_threads=win32
+		gc_default=boehm 
+		;;
+	*-*-*netbsd*)
+		platform_win32=no
+		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+		libmono_cflags="-D_REENTRANT"
+		LDFLAGS="$LDFLAGS -pthread"
+		libmono_ldflags="-pthread"
+		AC_DEFINE(NEED_LINK_UNLINK)
+		libdl=
+		libgc_threads=pthreads
+		;;
+	*-*-*freebsd*|*-*-*openbsd*)
+		platform_win32=no
+		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
+		libmono_cflags="-D_THREAD_SAFE"
+		LDFLAGS="$LDFLAGS -pthread"
+		libmono_ldflags="-pthread"
+		AC_DEFINE(NEED_LINK_UNLINK)
+		AC_DEFINE(PTHREAD_POINTER_ID)
+		libdl=
+		libgc_threads=pthreads
+		;;
+	*-*-linux*)
+		platform_win32=no
+		CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -DMONO_USE_EXC_TABLES -D_GNU_SOURCE -D_REENTRANT -fexceptions"
+		libmono_cflags="-DMONO_USE_EXC_TABLES -fexceptions -D_REENTRANT"
+		libmono_ldflags="-lpthread"
+		libdl="-ldl"
+		libgc_threads=pthreads
+		;;
+	*-*-solaris*)
+		platform_win32=no
+		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
+		AC_DEFINE(NEED_LINK_UNLINK)
+		libmono_cflags="-D_REENTRANT"
+		libgc_threads=solaris
+		;;
+	*-*-darwin*)
+		platform_win32=no
+		CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE"
+		libmono_cflags="-D_THREAD_SAFE"
+		LDFLAGS="$LDFLAGS -pthread"
+		libmono_ldflags="-pthread"
+		AC_DEFINE(NEED_LINK_UNLINK)
+		AC_DEFINE(PTHREAD_POINTER_ID)
+		libdl=
+		libgc_threads=no
+		gc_default=none 
 		;;
 	*)
+		AC_MSG_WARN([*** Please add $host to configure.in checks!])
 		platform_win32=no
+		libdl="-ldl"
 		;;
 esac
-AC_MSG_RESULT($platform_win32)
+AC_MSG_RESULT(ok)
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
+dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
+: ${CCAS='$(CC)'}
+# Set ASFLAGS if not already set.
+: ${CCASFLAGS='$(CFLAGS)'}
+AC_SUBST(CCAS)
+AC_SUBST(CCASFLAGS)
+
+AC_CHECK_PROG(BISON, bison,yes,no)
+if test "x$BISON" = "xno";
+then
+	AC_MSG_ERROR([You need to install bison])
+fi
 
 dnl may require a specific autoconf version
 dnl AC_PROG_CC_FOR_BUILD
@@ -45,14 +135,14 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h)
-
-AC_CHECK_HEADERS(iconv.h)
-AC_CHECK_HEADERS(giconv.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h)
 
 # for mono/metadata/debug-symfile.c
 AC_CHECK_HEADERS(elf.h)
 
+# for mono/dis
+AC_CHECK_HEADERS(wchar.h)
+
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
 
@@ -98,38 +188,84 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes")
-gc=auto
-AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
+AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
+
+# assembly bundle support, see metadata/make-bundle.pl for more info
+AC_ARG_WITH(bundle, [  --with-bundle=bundle_template],[
+	BUNDLE_FILE=$with_bundle
+	AC_SUBST(BUNDLE_FILE)
+	AC_DEFINE(WITH_BUNDLE)
+],[with_bundle=no])
+AM_CONDITIONAL(WITH_BUNDLE, test x$with_bundle != xno)
 
+LIBGC_CFLAGS=
+LIBGC_LIBS=
+libgc_dir=
 case "x$gc" in
-	xboehm|xyes)
+	xboehm|xbohem|xyes)
+		AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
+		AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
+
 		if test "x$found_boehm" != "xyes"; then
-			AC_MSG_ERROR("GC requested but libgc not found!")
+			AC_MSG_ERROR("GC requested but libgc not found! Install libgc or run configure with --with-gc=none.")
+		fi
+		if test "x$gc_headers" != "xyes"; then
+			AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.")
 		fi
 
 		AC_DEFINE(HAVE_BOEHM_GC)
 		AC_SUBST(HAVE_BOEHM_GC)
-		LIBS="$LIBS -lgc"
+		LIBGC_LIBS="-lgc $libdl"
+
+		# AC_CHECK_FUNCS does not work for some reason...
+		AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl)
+		if test "x$found_gcj_malloc" = "xyes"; then
+			AC_DEFINE(HAVE_GC_GCJ_MALLOC)
+		fi
 		;;
+
+	xincluded)
+		AC_CONFIG_SUBDIRS(libgc)
+
+		found_boehm=yes
+		gc_headers=yes
+		use_included_gc=yes
+		libgc_dir=libgc
+
+		LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include'
+		LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
+
+		AC_DEFINE(HAVE_BOEHM_GC)
+		AC_SUBST(HAVE_BOEHM_GC)
+
+		AC_DEFINE(HAVE_GC_H)
+		AC_DEFINE(USE_INCLUDED_LIBGC)
+
+		# The included libgc contains GCJ support
+		AC_DEFINE(HAVE_GC_GCJ_MALLOC)
+		;;
+
 	xnone)
 		AC_MSG_WARN("Compiling mono without GC.")
 		;;
 	*)
-dnl When the JIT works with libgc, use this chunk.
-dnl		# If libgc was found, use it.  Otherwise just warn.
-		if test "x$found_boehm" != "xyes"; then
-			AC_MSG_WARN("Compiling mono without GC.")
-		else
-			AC_DEFINE(HAVE_BOEHM_GC)
-			AC_SUBST(HAVE_BOEHM_GC)
-			LIBS="$LIBS -lgc"
-			gc="boehm"
-		fi
-dnl		AC_MSG_WARN("Compiling mono without GC.")
+		AC_MSG_ERROR([Invalid argument to --with-gc.])
 		;;
 esac
 
+we_are_embedded_in_mono=yes
+export we_are_embedded_in_mono
+export libgc_threads
+
+AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
+AC_SUBST(LIBGC_CFLAGS)
+AC_SUBST(LIBGC_LIBS)
+AC_SUBST(libgc_dir)
+
+dnl
+dnl End of libgc checks
+dnl
+
 if test x$platform_win32 = xno; then
 	dnl ******************************************************************
 	dnl *** Check for large file support                               ***
@@ -183,6 +319,21 @@ if test x$platform_win32 = xno; then
 	dnl *****************************
 	AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 
+	dnl *******************************
+	dnl *** Checks for MSG_NOSIGNAL ***
+	dnl *******************************
+	AC_MSG_CHECKING(for MSG_NOSIGNAL)
+	AC_TRY_COMPILE([#include <sys/socket.h>], [
+		int f = MSG_NOSIGNAL;
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_MSG_NOSIGNAL)
+	], [
+		# We'll have to use signals
+		AC_MSG_RESULT(no)
+	])
+
 	dnl *****************************
 	dnl *** Checks for SOL_IP     ***
 	dnl *****************************
@@ -239,8 +390,32 @@ if test x$platform_win32 = xno; then
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_STRUCT_IP_MREQN)
 	], [
-		# We'll just have to use struct ip_mreq
+		# We'll just have to try and use struct ip_mreq
 		AC_MSG_RESULT(no)
+		AC_MSG_CHECKING(for struct ip_mreq)
+		AC_TRY_COMPILE([#include <netinet/in.h>], [
+			struct ip_mreq mreq;
+			mreq.imr_interface.s_addr = 0;
+		], [
+			# Yes, we have it...
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_STRUCT_IP_MREQ)
+		], [
+			# No multicast support
+			AC_MSG_RESULT(no)
+		])
+	])
+	
+	dnl **********************************
+	dnl *** Check for gethostbyname2_r ***
+	dnl **********************************
+	AC_MSG_CHECKING(for gethostbyname2_r)
+		AC_TRY_COMPILE([#include <netdb.h>], [
+		gethostbyname2_r(NULL,0,NULL,NULL,0,NULL,NULL);
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_GETHOSTBYNAME2_R)
 	])
 
 	dnl *****************************
@@ -250,87 +425,67 @@ if test x$platform_win32 = xno; then
 
 	AC_CHECK_FUNCS(inet_pton inet_aton)
 
+	dnl ***********************************************
+	dnl *** Checks for size of sockaddr_un.sun_path ***
+	dnl ***********************************************
+	# AC_CHECK_SIZEOF can't cope with struct members :-(
+	AC_MSG_CHECKING(size of sockaddr_un.sun_path)
+	AC_CACHE_VAL(cv_mono_sizeof_sunpath,
+		[AC_TRY_RUN([
+			#include <sys/types.h>
+			#include <stdio.h>
+			#include <sys/un.h>
+
+			int main(void) {
+				struct sockaddr_un sock_un;
+				FILE *f=fopen("conftestval", "w");
+				if(!f) exit(1);
+				fprintf(f, "%d\n", sizeof(sock_un.sun_path));
+				exit(0);
+			}
+		], cv_mono_sizeof_sunpath=`cat conftestval`,
+		   cv_mono_sizeof_sunpath=0,
+		   cv_mono_sizeof_sunpath=0)])dnl
+	AC_MSG_RESULT($cv_mono_sizeof_sunpath)
+	AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
+
 	dnl *****************************
-	dnl *** Checks for libpthread ***
+	dnl *** Checks for libxnet    ***
 	dnl *****************************
-	AC_SEARCH_LIBS(pthread_create, pthread c_r, [
-		AM_CONDITIONAL(THREADS_PTHREAD, true)
-		AC_DEFINE(HAVE_PTHREAD)
-
-		# Need pthread_mutex_timedlock
-		pthread_CFLAGS=""
-		orig_CPPFLAGS=$CPPFLAGS
-		# This is a gcc-specific error, but we already set
-		# gcc-specific options in CFLAGS
-		CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
-		AC_MSG_CHECKING(for pthread_mutex_timedlock)
-		AC_TRY_COMPILE([ #include <pthread.h>], [
-			pthread_mutex_t mut=PTHREAD_MUTEX_INITIALIZER;
-			pthread_mutex_timedlock(&mut, NULL);
-		], [
-			# Works!
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
-		], [
-			AC_MSG_RESULT(no)
+	case "${host}" in
+		*solaris* )
+			AC_MSG_CHECKING(for Solaris XPG4 support)
+			if test -f /usr/lib/libxnet.so; then
+				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+	    			CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
+           			LIBS="$LIBS -lxnet"
+  	    			AC_MSG_RESULT(yes)
+			else
+  	    			AC_MSG_RESULT(no)
+			fi
+
+			if test "$GCC" = "yes"; then
+		    		CFLAGS="$CFLAGS -Wno-char-subscripts"
+			fi
+    		;;
+	esac
 
-			# glibc requires -D_GNU_SOURCE before it will declare
-			# this function
-			AC_MSG_CHECKING(whether _GNU_SOURCE is needed for pthread_mutex_timedlock)
-			CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-			AC_TRY_COMPILE([ #include <pthread.h>], [
-				pthread_mutex_t mut=PTHREAD_MUTEX_INITIALIZER;
-				pthread_mutex_timedlock(&mut, NULL);
-			], [
-				AC_MSG_RESULT(yes)
-				pthread_CFLAGS="-D_GNU_SOURCE"
-				AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
-			], [
-				AC_MSG_RESULT(no)
-				dnl Add other variants here
-				AC_MSG_WARN(Working around pthread_mutex_timedlock)
-			])
-		])
-		CPPFLAGS=$orig_CPPFLAGS
-		CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
-
-		# Need PTHREAD_MUTEX_RECURSIVE
-		pthread_CFLAGS=""
-		orig_CPPFLAGS=$CPPFLAGS
-		# This is a gcc-specific error, but we already set
-		# gcc-specific options in CFLAGS
-		CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
-		AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
-		AC_TRY_COMPILE([ #include <pthread.h>], [
-			pthread_mutexattr_t attr;
-			pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-		], [
-			# Works!
-			AC_MSG_RESULT(ok)
-		], [
-			AC_MSG_RESULT(no)
-
-			# glibc requires -D_GNU_SOURCE before it will declare
-			# this macro
-			AC_MSG_CHECKING(whether _GNU_SOURCE is needed for PTHREAD_MUTEX_RECURSIVE)
-			CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-			AC_TRY_COMPILE([ #include <pthread.h>], [
-				pthread_mutexattr_t attr;
-				pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-			], [
-				AC_MSG_RESULT(ok)
-				pthread_CFLAGS="-D_GNU_SOURCE"
-			], [
-				AC_MSG_RESULT(no)
-				dnl Add other variants here
-				AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
-				AC_DEFINE(USE_MONO_MUTEX)
-			])
-		])
-		CPPFLAGS=$orig_CPPFLAGS
-		CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
+	dnl *****************************
+	dnl *** Checks for libpthread ***
+	dnl *****************************
+	AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+	AC_CHECK_FUNCS(pthread_mutex_timedlock)
+	AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
+	AC_TRY_COMPILE([ #include <pthread.h>], [
+		pthread_mutexattr_t attr;
+		pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+	], [
+		AC_MSG_RESULT(ok)
 	], [
-		AC_MSG_ERROR([libpthread is required on non-win32 hosts])
+		AC_MSG_RESULT(no)
+		AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
+		AC_DEFINE(USE_MONO_MUTEX)
 	])
 
 	dnl ********************************
@@ -341,35 +496,31 @@ if test x$platform_win32 = xno; then
 	dnl ********************************
 	dnl *** Checks for timezone stuff **
 	dnl ********************************
-	AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+	AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
 		AC_TRY_COMPILE([
 			#include <time.h>
-		], [
-			timezone = 1;
-		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
-	if test $ac_cv_var_timezone = yes; then
-		AC_DEFINE(HAVE_TIMEZONE)
+			], [
+			struct tm tm;
+			tm.tm_gmtoff = 1;
+			], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+	if test $ac_cv_struct_tm_gmtoff = yes; then
+		AC_DEFINE(HAVE_TM_GMTOFF)
 	else
-		AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+		AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
 			AC_TRY_COMPILE([
 				#include <time.h>
-				], [
-				struct tm tm;
-				tm.tm_gmtoff = 1;
-				], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
-		if test $ac_cv_struct_tm_gmtoff = yes; then
-			AC_DEFINE(HAVE_TM_GMTOFF)
+			], [
+				timezone = 1;
+			], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+		if test $ac_cv_var_timezone = yes; then
+			AC_DEFINE(HAVE_TIMEZONE)
 		else
 			AC_ERROR(unable to find a way to determine timezone)
 		fi
 	fi
 else
-	AM_CONDITIONAL(THREADS_PTHREAD, false)
-	# This is a kludge, we really ought to test for libws2_32, but
-	# I can't make AC_CHECK_LIB link (the symbols seem to be mangled
-	# with @num suffixes)
-	LIBS="$LIBS -lws2_32"
-	CFLAGS="$CFLAGS -mno-cygwin"
+	AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
+	AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
 fi
 
 dnl ****************************
@@ -437,27 +588,6 @@ if test "x$ac_cv_have_dev_random" = "xno" \
 ***]])
 fi
  
-if test "x$cross_compiling" = "xno"; then
-# check for new iconv version
-AC_MSG_CHECKING(for new iconv)
-AC_CACHE_VAL(new_iconv,[
-	AC_TRY_RUN([#include <stdio.h> 
-	        #include <iconv.h>
- 
-		int main()
-		{
-		  exit (iconv_open ("UTF-16le", "UTF-8") == (iconv_t)-1);
-		}
-		],
-		new_iconv=yes,new_iconv=)])
-if test -n "$new_iconv"; then
-   	AC_MSG_RESULT(yes)
-	AC_DEFINE(HAVE_NEW_ICONV)
-else
-	AC_MSG_RESULT(no)
-fi
-fi
-
 AC_MSG_CHECKING([if inter-process shared handles are requested])
 AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
 AC_MSG_RESULT($try_shared_handles)
@@ -469,18 +599,21 @@ fi
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
+JIT_SUPPORTED=no
+
 case "$host" in
 #mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS; ACCESS_UNALIGNED="no";;
-i*86-*-*) TARGET=X86; arch_target=x86;;
+i*86-*-*) TARGET=X86; arch_target=x86; JIT_SUPPORTED=yes;;
 sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
 #alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";;
 #m68k-*-linux*) TARGET=M68K;;
-powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
+macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv* | powerpc-*-darwin*) TARGET=POWERPC; arch_target=ppc; JIT_SUPPORTED=yes;;
 arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
+s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="no";;
 esac
 
 if test ${TARGET} = unknown; then
-	CFLAGS="$CFLAGS -DNO_PORT"
+	CPPFLAGS="$CPPFLAGS -DNO_PORT"
 	AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
 fi
 
@@ -496,35 +629,52 @@ AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
 AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
 AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
+AM_CONDITIONAL(S390, test x$TARGET = xS390)
+
+AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
+
+LIBC="libc.so.6"
+AC_SUBST(LIBC)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
 Makefile
+mono.pc
 mono/Makefile
 mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
 mono/arch/Makefile
+mono/os/Makefile
+mono/os/win32/Makefile
+mono/os/unix/Makefile
 mono/arch/x86/Makefile
 mono/arch/ppc/Makefile
 mono/arch/sparc/Makefile
+mono/arch/s390/Makefile
 mono/arch/arm/Makefile
+mono/arch/alpha/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/benchmark/Makefile
 mono/monoburg/Makefile
 mono/monograph/Makefile
-mono/jit/Makefile
 mono/io-layer/Makefile
 mono/handles/Makefile
+mono/mini/Makefile
+mono/profiler/Makefile
 runtime/Makefile
 scripts/Makefile
 man/Makefile
 doc/Makefile
 docs/Makefile
+data/Makefile
+mono.spec
 ])
 
 echo "