2002-03-27 Dan Lewis <dihlewis@yahoo.co.uk>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 60cca61dc527ae087c51cf341c6a6b5cda459f3c..64c21952769c3bcc6d12e172056792c53e591d47 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.9)
+AM_INIT_AUTOMAKE(mono, 0.10)
 AM_MAINTAINER_MODE
 
 AC_CHECK_TOOL(CC, gcc, gcc)
@@ -30,6 +30,9 @@ AM_PROG_LIBTOOL
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h)
 
+# for mono/metadata/debug-symfile.c
+AC_CHECK_HEADERS(elf.h)
+
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
 
@@ -76,30 +79,33 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
 AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes")
+gc=none
+AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
 
-AC_ARG_WITH(gc, [  --with-gc=bohem,none],
-       if test x$with_gc = "xyes"; then
-               with_gc="boehm"
-       fi
-       if test x$with_gc = "xboehm"; then
-               if test x$found_boehm != "xyes"; then
-                       AC_MSG_ERROR(Boehm gc requested but libgc could not be found.)
+case "x$gc" in
+       xboehm|xyes)
+               if test "x$found_boehm" != "xyes"; then
+                       AC_MSG_ERROR("GC requested but libgc not found!")
                fi
-       else
-               AC_MSG_WARN("Compiling mono without GC.")
-       fi,
-       if test x$found_boehm != "xyes"; then
-               AC_MSG_WARN("Compiling mono without GC.")
-       else
-               with_gc="none"
-       fi
-)
-if test x$with_gc = "xboehm"; then
-       AC_DEFINE(HAVE_BOEHM_GC)
-       AC_SUBST(HAVE_BOEHM_GC)
-       LIBS="$LIBS -lgc"
-       AC_MSG_RESULT("Compiling mono with Boehm GC.")
-fi
+
+               AC_DEFINE(HAVE_BOEHM_GC)
+               AC_SUBST(HAVE_BOEHM_GC)
+               LIBS="$LIBS -lgc"
+               ;;
+       *)
+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.")
+               ;;
+esac
 
 dnl ****************************************
 dnl *** Check if we're building on win32 ***
@@ -455,6 +461,7 @@ AC_SUBST(CFLAGS)
 AC_OUTPUT([
 Makefile
 mono/Makefile
+mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
@@ -475,3 +482,9 @@ scripts/Makefile
 man/Makefile
 doc/Makefile
 ])
+
+echo "
+
+       GC:     $gc
+
+"