X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=6dde1b4360b1e8a1b48134814ec9e196f321963b;hb=3deec715dd8f016faaee3db0911e6052fc0dae4d;hp=c6ccac0e3e39b2e5c8042a25a00f7ac21466d0ce;hpb=7d78bab3843f82bf3b84250084348587be1c7502;p=mono.git diff --git a/configure.in b/configure.in index c6ccac0e3e3..6dde1b4360b 100644 --- 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.30.99) AM_MAINTAINER_MODE dnl @@ -27,6 +27,9 @@ libmono_ldflags="" AC_SUBST(libmono_cflags) AC_SUBST(libmono_ldflags) +dnl if linker handles the version script +no_version_script=no + # Thread configuration inspired by sleepycat's db AC_MSG_CHECKING([host platform characteristics]) libgc_threads=no @@ -74,7 +77,9 @@ case "$host" in ;; *-*-hpux*) platform_win32=no - CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT" + CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT" + CFLAGS="$CFLAGS +ESdbgasm" + LDFLAGS="$LDFLAGS -z" libmono_cflags="-D_REENTRANT" libmono_ldflags="-lpthread" libgc_threads=pthreads @@ -95,6 +100,8 @@ case "$host" in libmono_ldflags="-pthread" AC_DEFINE(NEED_LINK_UNLINK) AC_DEFINE(PTHREAD_POINTER_ID) + AC_DEFINE(USE_MACH_SEMA) + no_version_script=yes libdl= libgc_threads=no gc_default=none @@ -107,6 +114,7 @@ case "$host" in esac AC_MSG_RESULT(ok) AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) +AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes) AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC @@ -145,6 +153,9 @@ AM_PROG_LIBTOOL AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h) +# for mono/mini/tramp-x86.c +AC_CHECK_HEADERS(valgrind/memcheck.h) + # for mono/metadata/debug-symfile.c AC_CHECK_HEADERS(elf.h) @@ -157,8 +168,18 @@ AC_CHECK_SIZEOF(void *, 4) WARN='' if test x"$GCC" = xyes; then WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' + # The runtime code does not respect ANSI C strict aliasing rules + CFLAGS="$CFLAGS -fno-strict-aliasing" +else + # The Sun Forte compiler complains about inline functions that access static variables + # so disable all inlining. + case "$host" in + *-*-solaris*) + CFLAGS="$CFLAGS -Dinline=" + ;; + esac fi -CFLAGS="-g $WARN" +CFLAGS="$CFLAGS -g $WARN" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then @@ -167,8 +188,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 +211,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` @@ -202,6 +223,12 @@ AC_SUBST(GMODULE_LIBS) AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default]) +# Enable support for NPTL only features like fast thread-local storage +# We can't reliably detect nptl at compile & run time +# so this option will stay until nptl becomes more widespread +with_nptl=1 +#AC_ARG_WITH(nptl, [ --with-nptl Enable support for NPTL]) + # assembly bundle support, see metadata/make-bundle.pl for more info AC_ARG_WITH(bundle, [ --with-bundle=bundle_template],[ BUNDLE_FILE=$with_bundle @@ -443,6 +470,8 @@ if test x$platform_win32 = xno; then # Yes, we have it... AC_MSG_RESULT(yes) AC_DEFINE(HAVE_GETHOSTBYNAME2_R) + ], [ + AC_MSG_RESULT(no) ]) dnl ***************************** @@ -519,6 +548,7 @@ if test x$platform_win32 = xno; then dnl *** Checks for libpthread *** dnl ***************************** AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread") + AC_CHECK_HEADERS(pthread.h) AC_CHECK_FUNCS(pthread_mutex_timedlock) AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE) AC_TRY_COMPILE([ #include ], [ @@ -531,11 +561,59 @@ if test x$platform_win32 = xno; then AC_MSG_WARN(Using mono_mutex_t for recursive mutexes) AC_DEFINE(USE_MONO_MUTEX) ]) + AC_CHECK_FUNCS(pthread_attr_setstacksize) + + dnl *********************************** + dnl *** Checks for working __thread *** + dnl *********************************** + AC_MSG_CHECKING(for working __thread) + AC_TRY_RUN([ + #include + + __thread int i; + static int res1, res2; + + void thread_main (void *arg) + { + i = arg; + sleep (1); + if (arg == 1) + res1 = (i == arg); + else + res2 = (i == arg); + } + + int main () { + pthread_t t1, t2; + + i = 5; + + pthread_create (&t1, NULL, thread_main, 1); + pthread_create (&t2, NULL, thread_main, 2); + + pthread_join (t1, NULL); + pthread_join (t2, NULL); + + return !(res1 + res2 == 2); + } + ], [ + if test "x$with_nptl" = "x"; then + AC_MSG_RESULT(disabled) + else + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KW_THREAD) + fi + ], [ + AC_MSG_RESULT(no) + ]) dnl ******************************** dnl *** Checks for semaphore lib *** dnl ******************************** - AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt") + # 'Real Time' functions on Solaris + # posix4 on Solaris 2.6 + # pthread (first!) on Linux + AC_SEARCH_LIBS(sem_init, pthread rt posix4) dnl ******************************** dnl *** Checks for timezone stuff ** @@ -563,16 +641,65 @@ if test x$platform_win32 = xno; then fi fi + dnl ********************************* + 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 ], + [ finite(0.0); ], + AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))) + AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h) + AC_TRY_LINK([#include ], + [ isfinite(0.0); ], + AC_DEFINE(HAVE_ISFINITE) AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))) + dnl **************************************************************** dnl *** Checks for working poll() (macosx defines it but doesn't *** dnl *** have it in the library (duh)) *** dnl **************************************************************** AC_CHECK_FUNCS(poll) + + dnl ************************* + dnl *** Check for signbit *** + dnl ************************* + AC_MSG_CHECKING(for signbit) + AC_TRY_LINK([#include ], [ + int s = signbit(1.0); + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SIGNBIT) + ], [ + AC_MSG_RESULT(no) + ]) else 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 socklen_t check +AC_MSG_CHECKING(for socklen_t) +AC_TRY_COMPILE([ +#include +#include +],[ + socklen_t foo; +],[ +ac_cv_c_socklen_t=yes + AC_DEFINE(HAVE_SOCKLEN_T) + AC_MSG_RESULT(yes) +],[ + AC_MSG_RESULT(no) +]) + +AC_CHECK_FUNCS(truncl, , AC_MSG_CHECKING(for truncl in math.h) + AC_TRY_LINK([#include ], + [ truncl(0.0); ], + AC_DEFINE(HAVE_TRUNCL) AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))) + dnl **************************** dnl *** Look for /dev/random *** dnl **************************** @@ -646,6 +773,22 @@ if test "x$try_shared_handles" != "xyes"; then AC_SUBST(DISABLE_SHARED_HANDLES) fi +ICU_CFLAGS="" +ICU_LIBS="" +enable_icu=no +AC_PATH_PROG(ICU_CONFIG, icu-config, no) +if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then + AC_MSG_WARN([Only invariant locale available; install ICU for I18N support]) + enable_icu="no, if you want full i18n support download it from: http://oss.software.ibm.com/icu/index.html" +else + enable_icu="yes. Version: `$ICU_CONFIG --version`" + AC_DEFINE(HAVE_ICU) + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags` +fi +AC_SUBST(ICU_CFLAGS) +AC_SUBST(ICU_LIBS) + TARGET="unknown" ACCESS_UNALIGNED="yes" @@ -684,6 +827,11 @@ case "$host" in # m68k-*-linux*) # TARGET=M68K # ;; + hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00) + TARGET=HPPA; + arch_target=hppa; + ACCESS_UNALIGNED="no" + ;; macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \ powerpc-*-sysv* | powerpc-*-darwin*) TARGET=POWERPC; @@ -740,6 +888,7 @@ 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(HPPA, test x$TARGET = xHPPA) AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes) @@ -752,6 +901,7 @@ AC_SUBST(LDFLAGS) AC_OUTPUT([ Makefile +mint.pc mono.pc mono/Makefile mono/utils/Makefile @@ -763,6 +913,7 @@ mono/os/Makefile mono/os/win32/Makefile mono/os/unix/Makefile mono/arch/x86/Makefile +mono/arch/hppa/Makefile mono/arch/ppc/Makefile mono/arch/sparc/Makefile mono/arch/s390/Makefile @@ -792,5 +943,5 @@ mono.spec echo " GC: $gc - + ICU: $enable_icu "