X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=0bf4e6f9b66ab3def981501a382506184bd03111;hb=786f8547f0d2f75ee87f502ccc359e781a33f9ba;hp=63664d9c44ddc46447baaf49f050df63f8756dec;hpb=e7a3ce974028a888f2a2b3f1ef7b8b86b3ea994a;p=mono.git

diff --git a/configure.in b/configure.in
index 63664d9c44d..0bf4e6f9b66 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,10 @@
 AC_INIT(README)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.5)
+AM_INIT_AUTOMAKE(mono, 0.7)
 AM_MAINTAINER_MODE
 
+AC_CANONICAL_HOST
+
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
@@ -11,6 +13,8 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 
+AC_CHECK_SIZEOF(void *)
+
 dnl ***************************
 dnl *** Checks for glib 1.2 ***
 dnl ***************************
@@ -29,10 +33,55 @@ GMODULE_LIBS=`glib-config --libs gmodule`
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-AC_CHECK_LIB(ffi, ffi_prep_cif, ,[
-AC_MSG_ERROR(libffi 1.20 or higher is required.  You can get this from http://sources.redhat.com/libffi)])
+dnl *****************************
+dnl *** Checks for libpthread ***
+dnl *****************************
+AC_CHECK_LIB(pthread, pthread_create, [
+		THREAD_LIBS=-lpthread
+		AM_CONDITIONAL(THREADS_PTHREAD, true)
+		AC_DEFINE(HAVE_PTHREAD)
+	], [
+		AC_MSG_RESULT([Cannot find libpthread])
+		# Check for other thread systems here, set THREAD_LIBS to
+		# whatever is needed, and define
+		# AM_CONDITIONAL(THREADS_foo, true), and add it to the
+		# section in mono/metadata/Makefile.am, AC_DEFINE(HAVE_foo),
+		# add that to acconfig.h, add the section for that in
+		# mono/metadata/threads.h
+	])
+AC_SUBST(THREAD_LIBS)
 
 CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations'
+
+TARGET="unknown"
+
+case "$host" in
+#mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS;;
+i*86-*-*) TARGET=X86; arch_target=x86;;
+#sparc-sun-4*) TARGET=SPARC;;
+#sparc-sun-*) TARGET=SPARC;;
+#sparc*-*-linux*) TARGET=SPARC;;
+#alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA;;
+#m68k-*-linux*) TARGET=M68K;;
+#powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC;;
+#arm-*-linux-*) TARGET=ARM;;
+esac
+
+if test ${TARGET} = unknown; then
+	CFLAGS="$CFLAGS -DNO_PORT"
+	AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
+fi
+
+AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
+AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
+AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+AM_CONDITIONAL(X86, test x$TARGET = xX86)
+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)
+
+AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
 
 AC_OUTPUT([
@@ -41,8 +90,13 @@ mono/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
-mono/cli/Makefile
+mono/arch/Makefile
+mono/arch/x86/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
+mono/wrapper/Makefile
+mono/monoburg/Makefile
+mono/jit/Makefile
+runtime/Makefile
 doc/Makefile
 ])