2003-08-26 Ben Maurer <bmaurer@users.sourceforge.net>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index bf9ab6371221058a9a0fc1181adfc5209d5281f2..0056408dbdf6c97027f8ec96f87c414af5e9755a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,0.25.99.2)
+AM_INIT_AUTOMAKE(mono,0.26)
 AM_MAINTAINER_MODE
 
 dnl
@@ -167,8 +167,8 @@ fi
 
 dnl for use on the build system
 dnl pkg-config is stupid
-BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0`
-BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
+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)
 
@@ -190,8 +190,8 @@ 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`
-GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
+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`
 
@@ -708,14 +708,13 @@ if test ${TARGET} = ARM; then
        dnl ******************************************
        AC_MSG_CHECKING(which FPU to use)
 
-       echo "double foo () { return 0.0; } \
-               int main () { double d = foo(); }" > conftest.c
-       ${CC} -S conftest.c -o conftest.s
-
-       if test -n "`grep f0 conftest.s`"; then fpu=FPA
-       else if test -n "`grep d0 conftest.s`"; then fpu=VFP
-       else fpu=NONE
-       fi fi
+       AC_TRY_COMPILE([], [
+               __asm__ ("ldfd f0, [r0]");
+               ], fpu=FPA, [
+                       AC_TRY_COMPILE([], [
+                               __asm__ ("fldd d0, [r0]");
+                       ], fpu=VFP, fpu=NONE)
+               ])
 
        AC_MSG_RESULT($fpu)
        CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu"
@@ -785,6 +784,7 @@ man/Makefile
 doc/Makefile
 docs/Makefile
 data/Makefile
+samples/Makefile
 data/config
 mono.spec
 ])