X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=360d5ade3ff955db03dec0ba4506d0f8a2cfe6f4;hb=d747c896bc94f1650a01a46c2fd6228a4088fa17;hp=102d7840c58baac143a0e9d56d938956aa394416;hpb=ffb845b352dadf2a085b2b58aa3cb6c5d5ae4464;p=mono.git diff --git a/configure.in b/configure.in index 102d7840c58..360d5ade3ff 100644 --- 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.1.8) +AM_INIT_AUTOMAKE(mono,1.1.10) AM_MAINTAINER_MODE AC_PROG_LN_S @@ -42,6 +42,11 @@ libmono_ldflags="" AC_SUBST(libmono_cflags) AC_SUBST(libmono_ldflags) +# Variable to have relocatable .pc files (lib, or lib64) +reloc_libdir=`basename ${libdir}` +AC_SUBST(reloc_libdir) + + dnl if linker handles the version script no_version_script=no @@ -55,10 +60,12 @@ case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32]) - CC="gcc -mno-cygwin -g" + if test "x$cross_compiling" = "xno"; then + CC="gcc -mno-cygwin -g" + # So libgc configure gets -mno-cygwin + export CC + fi HOST_CC="gcc" - # So libgc configure gets -mno-cygwin - export CC CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024" libdl= libgc_threads=win32 @@ -195,7 +202,7 @@ case "$host" in ;; *-*-darwin*) platform_win32=no - CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS" + CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX" libmono_cflags="-D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread" libmono_ldflags="-pthread" @@ -251,6 +258,8 @@ AC_SUBST(CC_FOR_BUILD) AC_SUBST(HOST_CC) AC_SUBST(BUILD_EXEEXT) +AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes]) + # Set STDC_HEADERS AC_HEADER_STDC AC_LIBTOOL_WIN32_DLL @@ -348,6 +357,9 @@ fi 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]) + AC_SUBST([mcs_topdir]) AC_SUBST([mcs_topdir_from_srcdir]) @@ -403,7 +415,7 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) -if test x$platform_win32 = xyes; then +if test x$cross_compiling$platform_win32 = xnoyes; then AC_MSG_CHECKING(for cygwin glib2-dev package) if [ cygcheck --f /usr/lib/libglib-2.0.dll.a | grep -q glib2-devel ]; then AC_MSG_RESULT(found) @@ -592,6 +604,8 @@ if test x$platform_win32 = xno; then AC_SUBST(ikvm_native_dir) + AC_CHECK_HEADERS(execinfo.h) + AC_CHECK_FUNCS(getgrgid_r) AC_CHECK_FUNCS(getgrnam_r) AC_CHECK_FUNCS(getpwnam_r) @@ -1172,6 +1186,13 @@ 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) @@ -1223,6 +1244,10 @@ if test x$platform_win32 = xno; then #endif ]) AC_CHECK_HEADERS([termios.h]) + + dnl * This is provided in io-layer, but on windows it's only available + dnl * on xp+ + AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available]) else jdk_headers_found=no AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?)) @@ -1256,6 +1281,7 @@ else AC_MSG_RESULT(no) ]) ]) + AC_CHECK_FUNCS(GetProcessId) fi dnl socklen_t check @@ -1476,7 +1502,7 @@ case "$host" in JIT_SUPPORTED=yes jit_wanted=true ;; - arm*-linux-*) + arm*-linux*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no" @@ -1595,8 +1621,8 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then # rm -f conftest.c conftest.so conftest echo "static __thread int foo; void main () { foo = 5; }" > conftest.c - gcc -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1 - gcc -o conftest conftest.so > /dev/null 2>&1 + $CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1 + $CC -o conftest conftest.so > /dev/null 2>&1 if test ! -f conftest; then AC_MSG_WARN([Disabling usage of __thread.]); with_tls=pthread @@ -1741,6 +1767,7 @@ AC_OUTPUT([ Makefile mint.pc mono.pc +dotnet.pc mono-uninstalled.pc scripts/mono-nunit.pc scripts/mono-find-provides @@ -1793,6 +1820,10 @@ runtime/Makefile if test x$platform_win32 = xyes; then # Get rid of 'cyg' prefixes in library names sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool + # libtool seems to inherit -mno-cygwin from our CFLAGS, and uses it to compile its executable + # wrapper scripts which use exec(). gcc has no problem compiling+linking this, but the resulting + # executable doesn't work... + sed -e "s,-mno-cygwin,,g" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool fi ( @@ -1805,29 +1836,29 @@ fi test -w $srcdir/$mcsdir/build || chmod +w $srcdir/$mcsdir/build - 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 - echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make - 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 - echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make - - export VERSION - [myver=$($AWK 'BEGIN { - split (ENVIRON["VERSION"] ".0.0.0.0", vsplit, ".") - print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] - }')] - - cat > $srcdir/$mcsdir/build/common/MonoVersion.cs < $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 + echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make + 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 + echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make + + export VERSION + [myver=$($AWK 'BEGIN { + split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".") + print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] + }')] + + echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make + fi ) libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} @@ -1835,7 +1866,6 @@ libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} echo " mcs source: $mcs_topdir GC: $gc - Globalization: $enable_glob TLS: $with_tls SIGALTSTACK: $with_sigaltstack Engine: $jit_status