2008-03-19 Marek Safar <marek.safar@gmail.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 90ffc85cf952f9e3ba908ae0addad2e35ad690f5..b7f322ac902f09ededddfbb3b0b89e32c95a010c 100644 (file)
--- 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.2.6)
+AM_INIT_AUTOMAKE(mono,1.9)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -232,6 +232,9 @@ case "$host" in
                no_version_script=yes
                libdl=
                libgc_threads=pthreads
+               if test "x$cross_compiling" = "xyes"; then
+                       has_broken_apple_cpp=yes
+               fi
                ;;
        *)
                AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -451,14 +454,17 @@ AC_ARG_WITH([glib],
        [  --with-glib=embedded|system       Choose glib API: system or embedded (default to system)],
        [], [with_glib=system])
 
+eglib_dir=
+
 case $with_glib in
 embedded) 
-  GLIB_CFLAGS='-I$(top_srcdir)/eglib/src'
+  GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
   GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
   BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
   BUILD_GLIB_LIBS="$GLIB_LIBS"
   GMODULE_CFLAGS="$GLIB_CFLAGS"
   GMODULE_LIBS="$GLIB_LIBS"
+  eglib_dir=eglib
   AC_CONFIG_SUBDIRS(eglib)
   ;;
 system)
@@ -486,6 +492,7 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 AC_SUBST(BUILD_GLIB_CFLAGS)
 AC_SUBST(BUILD_GLIB_LIBS)
+AC_SUBST(eglib_dir)
 
 if test x$cross_compiling$platform_win32 = xnoyes; then
    AC_MSG_CHECKING(for cygwin glib2-dev package)
@@ -725,6 +732,9 @@ dnl
 
 if test x$platform_win32 = xno; then
 
+       dnl hires monotonic clock support
+       AC_SEARCH_LIBS(clock_gettime, rt)
+
        dnl dynamic loader support
        AC_CHECK_FUNC(dlopen, DL_LIB="",
                AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", dl_support=no)
@@ -1293,11 +1303,13 @@ if test x$platform_win32 = xno; then
        dnl *** Checks for math functions ***
        dnl *********************************
         LIBS="$LIBS -lm";
-        AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
-                AC_TRY_LINK([#include <math.h>], 
-                [ finite(0.0); ], 
-                AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes),
-                AC_MSG_RESULT(no)))
+       if text "x$has_broken_apple_cpp" != "xyes"; then
+               AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
+                       AC_TRY_LINK([#include <math.h>], 
+                       [ finite(0.0); ], 
+                       AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes),
+                       AC_MSG_RESULT(no)))
+       fi
         AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h)
                 AC_TRY_LINK([#include <math.h>], 
                 [ isfinite(0.0); ], 
@@ -1772,6 +1784,14 @@ case "$host" in
                JIT_SUPPORTED=yes
                jit_wanted=true
                ;;
+       arm*-darwin*)
+               TARGET=ARM;
+               arch_target=arm;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
+               jit_wanted=true
+               ;;
        arm*-linux*)
                TARGET=ARM;
                arch_target=arm;
@@ -1942,7 +1962,7 @@ if test "x$with_tls" = "x__thread"; then
        ])
 fi
 
-if test ${TARGET} = ARM; then
+if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
        dnl ******************************************
        dnl *** Check to see what FPU is available ***
        dnl ******************************************
@@ -1980,6 +2000,20 @@ AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no   If you want to build the Moonl
        fi
 ])
 
+OPROFILE=no
+AC_ARG_WITH(oprofile,[ --with-oprofile=no,<path>   Enable oprofile support (defaults to NO)],[
+       if test x$with_oprofile != xno; then
+             OPROFILE=yes
+             OPROFILE_CFLAGS="-I$with_oprofile/include"
+             OPROFILE_LIBS=
+             AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
+       fi
+])
+
+AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
+AC_SUBST(OPROFILE_CFLAGS)
+AC_SUBST(OPROFILE_LIBS)
+
 libmono_ldflags="$libmono_ldflags $LIBS"
 
 AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
@@ -2036,7 +2070,6 @@ AC_SUBST(mono_cfg_dir)
 
 AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
 AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
-AC_CONFIG_FILES([runtime/semdel-wrapper],[chmod +x runtime/semdel-wrapper])
 
 AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
 [   depth=../../../..
@@ -2189,7 +2222,6 @@ fi
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
     echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
-
     case $INSTALL in
     [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
     *) mcs_INSTALL=$mono_build_root/$INSTALL ;;
@@ -2243,6 +2275,7 @@ echo "
        JNI support: $jdk_headers_found
        libgdiplus:  $libgdiplus_msg
        zlib:        $zlib_msg
+       oprofile:    $OPROFILE
        $disabled
 
 "