X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=eea5483f4f1a57fbf105bf5d9bb55ffe5ca7a5c8;hb=c93d3e694b0ebb3040d8966bfdf660381581275b;hp=b1b3b4b9fb504e7d524c6353ae1d89fce4114056;hpb=b2b79df36de909cdaffaf7d5a1cc0f9184ef22a2;p=mono.git diff --git a/configure.in b/configure.in index b1b3b4b9fb5..eea5483f4f1 100644 --- a/configure.in +++ b/configure.in @@ -6,9 +6,12 @@ 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.1.15) +AM_INIT_AUTOMAKE(mono,1.2) AM_MAINTAINER_MODE +API_VER=1.0 +AC_SUBST(API_VER) + AC_PROG_LN_S # In case of cygwin, override LN_S, irrespective of what it determines. @@ -67,10 +70,11 @@ case "$host" in fi HOST_CC="gcc" CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024" + libmono_cflags="-mno-cygwin" + libmono_ldflags="-mno-cygwin" libdl= libgc_threads=win32 gc_default=included - with_nptl=default with_sigaltstack=no LN_S=cp # This forces libgc to use the DllMain based thread registration code on win32 @@ -111,7 +115,6 @@ case "$host" in libdl= libgc_threads=pthreads # TLS isn't implemented at all on 4-STABLE - with_nptl=no with_tls=pthread ;; *-*-*freebsd5*) @@ -187,26 +190,36 @@ case "$host" in libdl="-ldl" libgc_threads=pthreads ;; - *-*-hpux*) - platform_win32=no + *-*-hpux*) + platform_win32=no CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT" + # +ESdbgasm only valid on bundled cc on RISC + # silently ignored for ia64 + if test $GCC != "yes"; then + CFLAGS="$CFLAGS +ESdbgasm" + # Arrange for run-time dereferencing of null + # pointers to produce a SIGSEGV signal. + LDFLAGS="$LDFLAGS -z" + fi CFLAGS="$CFLAGS +ESdbgasm" LDFLAGS="$LDFLAGS -z" libmono_cflags="-D_REENTRANT" libmono_ldflags="-lpthread" libgc_threads=pthreads need_link_unlink=yes - ;; + ;; *-*-solaris*) platform_win32=no CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP" need_link_unlink=yes libmono_cflags="-D_REENTRANT" libgc_threads=pthreads + # This doesn't seem to work on solaris/x86, but the configure test runs + with_tls=pthread ;; *-*-darwin*) platform_win32=no - CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX" + CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" libmono_cflags="-D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread" libmono_ldflags="-pthread" @@ -283,7 +296,7 @@ fi AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes) -AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h) +AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h) AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no]) @@ -366,7 +379,7 @@ mcs_topdir='$(top_srcdir)/'$mcsdir mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir ## Maybe should also disable if mcsdir is invalid. Let's punt the issue for now. -AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno]) +AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno]) AC_SUBST([mcs_topdir]) AC_SUBST([mcs_topdir_from_srcdir]) @@ -388,13 +401,6 @@ if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]) fi -dnl for use on the build system -dnl pkg-config is stupid -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) - pkg_config_path= AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], if test x$with_crosspkgdir = "x"; then @@ -408,20 +414,43 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], fi ) -## Versions of dependencies -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 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` - +AC_ARG_WITH([glib], + [ --with-glib=embedded|system Choose glib API: system or embedded (default to system)], + [], [with_glib=system]) + +case $with_glib in +embedded) + GLIB_CFLAGS='-I$(top_srcdir)/eglib/src' + GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm' + BUILD_GLIB_CFLAGS="$GLIB_CFLAGS" + BUILD_GLIB_LIBS="$GLIB_LIBS" + AC_CONFIG_SUBDIRS(eglib) + ;; +system) + BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` + BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` + + ## Versions of dependencies + 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 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` + ;; +*) + AC_MSG_ERROR([Invalid argument to --with-glib.]) +esac +AM_CONDITIONAL(EGLIB_BUILD, test x$with_glib = xembedded) + AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) +AC_SUBST(BUILD_GLIB_CFLAGS) +AC_SUBST(BUILD_GLIB_LIBS) if test x$cross_compiling$platform_win32 = xnoyes; then AC_MSG_CHECKING(for cygwin glib2-dev package) @@ -450,20 +479,6 @@ AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default] # Some systems have broken support, so we allow to disable it. AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage implementation],[],[with_tls=__thread]) -# Kept for compatibility -AC_ARG_WITH(nptl, [ --with-nptl=yes,no deprecated, use --with-tls instead],[],[with_nptl=default]) - -if test "x$with_nptl" != "xdefault"; then - if test "x$with_nptl" = "xyes"; then - AC_MSG_WARN([--with-nptl=yes is deprecated, use --with-tls=__thread option instead.]) - with_tls=__thread - fi - if test "x$with_nptl" = "xno"; then - AC_MSG_WARN([--with-nptl=no is deprecated, use --with-tls=pthread option instead.]) - with_tls=pthread - fi -fi - # Enable support for using sigaltstack for SIGSEGV and stack overflow handling # This does not work on some platforms (bug #55253) AC_ARG_WITH(sigaltstack, [ --with-sigaltstack=yes,no enable/disable support for sigaltstack],[],[with_sigaltstack=no]) @@ -480,6 +495,7 @@ if test "x$platform_win32" = "xyes"; then fi AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno) +AC_ARG_ENABLE(mcs-build, [ --disable-mcs-build disable the build of the mcs directory], try_mcs_build=$enableval, enable_mcs_build=yes) AC_ARG_WITH(xen_opt, [ --with-xen_opt=yes,no Enable Xen-specific behaviour],[],[with_xen_opt=yes]) if test "x$with_xen_opt" = "xyes"; then @@ -674,6 +690,41 @@ dnl if test x$platform_win32 = xno; then + dnl dynamic loader support + AC_CHECK_FUNC(dlopen, DL_LIB="", + AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", dl_support=no) + ) + if test x$dl_support = xno; then + AC_MSG_WARN([No dynamic loading support available]) + else + LIBS="$LIBS $DL_LIB" + AC_DEFINE(HAVE_DL_LOADER,1,[dlopen-based dynamic loader available]) + dnl from glib's configure.in + AC_CACHE_CHECK([for preceeding underscore in symbols], + mono_cv_uscore,[ + AC_TRY_RUN([#include + int mono_underscore_test (void) { return 42; } + int main() { + void *f1 = (void*)0, *f2 = (void*)0, *handle; + handle = dlopen ((void*)0, 0); + if (handle) { + f1 = dlsym (handle, "mono_underscore_test"); + f2 = dlsym (handle, "_mono_underscore_test"); + } return (!f2 || f1); + }], + [mono_cv_uscore=yes], + [mono_cv_uscore=no], + []) + ]) + if test "x$mono_cv_uscore" = "xyes"; then + MONO_DL_NEED_USCORE=1 + else + MONO_DL_NEED_USCORE=0 + fi + AC_SUBST(MONO_DL_NEED_USCORE) + AC_CHECK_FUNC(dlerror) + fi + dnl ****************************************************************** dnl *** Checks for the IKVM JNI interface library *** dnl ****************************************************************** @@ -697,6 +748,9 @@ if test x$platform_win32 = xno; then AC_CHECK_FUNCS(setresuid) AC_CHECK_FUNCS(kqueue) AC_CHECK_FUNCS(backtrace_symbols) + AC_CHECK_FUNCS(mkstemp) + AC_CHECK_FUNCS(mmap) + AC_CHECK_FUNCS(madvise) dnl ****************************************************************** dnl *** Check for large file support *** @@ -883,7 +937,7 @@ if test x$platform_win32 = xno; then dnl ***************************** dnl *** Checks for libnsl *** dnl ***************************** - AC_CHECK_LIB(nsl, gethostbyaddr, LIBS="$LIBS -lnsl") + AC_CHECK_FUNC(gethostbyaddr, , AC_CHECK_LIB(nsl, gethostbyaddr, LIBS="$LIBS -lnsl")) AC_CHECK_FUNCS(inet_pton inet_aton) @@ -1201,41 +1255,6 @@ if test x$platform_win32 = xno; then AC_MSG_RESULT(no) ]) - dnl ********************* - dnl *** Check for AIO *** - dnl ********************* - AC_MSG_CHECKING([for SIGEV_THREAD definition]) - dnl Some systems (FreeBSD at least) may have aio_read - dnl but don't support/define SIGEV_THREAD. - AC_TRY_COMPILE([ - #include - ],[ - int x = SIGEV_THREAD; - ],[ - ac_cv_c_sigev_thread=yes - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - - if test "$ac_cv_c_sigev_thread" = "yes" ; then - AC_CHECK_HEADERS(aio.h sys/aio.h) - AC_CHECK_LIB(rt, aio_read, [ LIBS="$LIBS -lrt" ],) - SIGVAL_PTR="undefined" - if test "$ac_cv_header_aio_h" = "yes" -o "$ac_cv_header_sys_aio_h" = "yes" ; then - AC_CHECK_MEMBER(union sigval.sigval_ptr,SIGVAL_PTR="sigval_ptr",, [ - #include - ]) - AC_CHECK_MEMBER(union sigval.sival_ptr,SIGVAL_PTR="sival_ptr",, [ - #include - ]) - if test "$SIGVAL_PTR" = "undefined" ; then - AC_MSG_ERROR([Unable to detect field name in 'union sigval']) - fi - fi - AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval']) - fi - dnl ********************************** dnl *** epoll *** dnl ********************************** @@ -1271,13 +1290,6 @@ if test x$platform_win32 = xno; then dnl ********************************** dnl *** Checks for MonoPosixHelper *** dnl ********************************** - AC_CHECK_FUNC(setkey, , - AC_CHECK_LIB(crypt, setkey, [ - AC_DEFINE(HAVE_SETKEY, 1, [Define if setkey(3) is available]) - CRYPT_LIBS="-lcrypt" - ]) - ) - AC_SUBST(CRYPT_LIBS) AC_CHECK_HEADERS(checklist.h) AC_CHECK_HEADERS(fstab.h) AC_CHECK_HEADERS(attr/xattr.h) @@ -1310,6 +1322,28 @@ if test x$platform_win32 = xno; then AC_CHECK_FUNCS(strerror_r) AC_CHECK_FUNCS(ttyname_r) AC_CHECK_SIZEOF(size_t) + AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], , + [#include + #include + #include ]) + AC_CHECK_TYPES([blkcnt_t], [AC_DEFINE(HAVE_BLKCNT_T)], , + [#include + #include + #include ]) + AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], , + [#include ]) + AC_CHECK_TYPES([struct pollfd], [AC_DEFINE(HAVE_STRUCT_POLLFD)], , + [#include ]) + AC_CHECK_TYPES([struct stat], [AC_DEFINE(HAVE_STRUCT_STAT)], , + [#include + #include + #include ]) + AC_CHECK_TYPES([struct timeval], [AC_DEFINE(HAVE_STRUCT_TIMEVAL)], , + [#include + #include + #include ]) + AC_CHECK_TYPES([struct timezone], [AC_DEFINE(HAVE_STRUCT_TIMEZONE)], , + [#include ]) AC_CHECK_MEMBERS( [struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, [#include @@ -1509,6 +1543,13 @@ case "$host" in # TARGET=MIPS; # ACCESS_UNALIGNED="no" # ;; + mips*) + TARGET=MIPS; + arch_target=mips; + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + jit_wanted=true + ;; i*86-*-*) TARGET=X86; arch_target=x86; @@ -1530,6 +1571,8 @@ case "$host" in # foo.c:6: warning: visibility attribute not supported in this configuration; ignored # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally have_visibility_hidden=no + + libmono_ldflags="$libmono_ldflags $LIBS" esac ;; x86_64-*-* | amd64-*-*) @@ -1563,6 +1606,7 @@ case "$host" in *) LIBC="libc.so" INTL="libintl.so" + libmono_ldflags="$libmono_ldflags $LIBS" esac jit_wanted=true if test x"$GCC" = xyes; then @@ -1576,10 +1620,10 @@ case "$host" in alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no" - JIT_SUPPORTED=no - INTERP_SUPPORTED=yes - interp_wanted=true + JIT_SUPPORTED=yes + jit_wanted=true arch_target=alpha; + CFLAGS="$CFLAGS -mieee" case $host_os in linux*) LIBC="libc.so.6.1" @@ -1587,6 +1631,8 @@ case "$host" in esac ;; *-*-mingw*|*-*-cygwin*) + # When this is enabled, it leads to very strange crashes at runtime (gcc-3.4.4) + have_visibility_hidden=no INTL="intl" ;; hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00) @@ -1626,6 +1672,8 @@ case "$host" in ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes jit_wanted=true + # Required CFLAGS for s390[x]. USE_STRING_INLINES is automatic with gcc 4.1 + CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES" ;; s390x-*-linux*) TARGET=S390x; @@ -1634,6 +1682,7 @@ case "$host" in ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes jit_wanted=true + CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES" ;; esac @@ -1794,7 +1843,7 @@ if test ${TARGET} = ARM; then ]) AC_MSG_RESULT($fpu) - CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu" + CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" unset fpu fi @@ -1825,6 +1874,7 @@ AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64) AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA) AM_CONDITIONAL(IA64, test x$TARGET = xIA64) AM_CONDITIONAL(M68K, test x$TARGET = xM68K) +AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS) AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC) AM_CONDITIONAL(ARM, test x$TARGET = xARM) AM_CONDITIONAL(S390, test x$TARGET = xS390) @@ -1937,6 +1987,7 @@ mono/arch/s390x/Makefile mono/arch/arm/Makefile mono/arch/alpha/Makefile mono/arch/ia64/Makefile +mono/arch/mips/Makefile mono/interpreter/Makefile mono/tests/Makefile mono/tests/tests-config @@ -1992,7 +2043,7 @@ fi # any existing config.make. This allows people to share the same source tree # with different build directories, one native and one cross # - if test x$cross_compiling = xno; then + if test x$cross_compiling = xno && test x$enable_mcs_build != xno; then echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make @@ -2032,6 +2083,14 @@ echo " $disabled " +if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then + AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs) +fi + +if test x$have_zlib = xno; then + AC_MSG_WARN(ZLib devel files not available, compression file support in 2.0 won't work.) +fi + if test x$gc = xsgen; then echo IMPORTANT: echo IMPORTANT: You have selected an experimental, work-in-progress