X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=308887e654dc925405438d910448d20c1686d37f;hb=b902e053239c79426409608496e89a9bff70d7b4;hp=6758f274cc80dcb105db992e6df1dcd0cc84b499;hpb=b3a8a22c4c1f06da5f9fe1c7f3028374262e8e4b;p=mono.git diff --git a/configure.in b/configure.in index 6758f274cc8..308887e654d 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.7.99) +AM_INIT_AUTOMAKE(mono,1.1.8) AM_MAINTAINER_MODE AC_PROG_LN_S @@ -169,7 +169,7 @@ case "$host" in ;; *-*-linux*) platform_win32=no - CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT" + CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP" libmono_cflags="-D_REENTRANT" libmono_ldflags="-lpthread" libdl="-ldl" @@ -187,7 +187,7 @@ case "$host" in ;; *-*-solaris*) platform_win32=no - CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" + 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 @@ -223,6 +223,7 @@ AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC AM_PROG_CC_STDC AC_PROG_INSTALL +AC_PROG_AWK dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4 : ${CCAS='$(CC)'} # Set ASFLAGS if not already set. @@ -603,7 +604,7 @@ if test x$platform_win32 = xno; then # potential compiler bugs. Defines LARGE_FILE_SUPPORT, adds $1 to # CPPFLAGS and sets $large_offt to yes if the test succeeds large_offt=no - AC_DEFUN(LARGE_FILES, [ + AC_DEFUN([LARGE_FILES], [ large_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $1" AC_TRY_RUN([ @@ -1153,6 +1154,8 @@ if test x$platform_win32 = xno; then dnl ********************************** AC_CHECK_HEADERS(checklist.h) AC_CHECK_HEADERS(fstab.h) + AC_CHECK_HEADERS(attr/xattr.h) + AC_CHECK_HEADERS(sys/extattr.h) AC_CHECK_HEADERS(sys/sendfile.h) AC_CHECK_HEADERS(sys/statvfs.h) AC_CHECK_HEADERS(sys/vfstab.h) @@ -1163,6 +1166,8 @@ if test x$platform_win32 = xno; then AC_CHECK_FUNCS(fgetpwent) AC_CHECK_FUNCS(fgetpwent) AC_CHECK_FUNCS(getfsstat) + AC_CHECK_FUNCS(mremap) + AC_CHECK_FUNCS(remap_file_pages) AC_CHECK_FUNCS(posix_fadvise) AC_CHECK_FUNCS(posix_fallocate) AC_CHECK_FUNCS(posix_madvise) @@ -1182,6 +1187,12 @@ if test x$platform_win32 = xno; then [#include #include ]) + dnl Favour xattr through glibc, but use libattr if we have to + AC_CHECK_FUNC(lsetxattr, , + AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",) + ) + AC_SUBST(XATTR_LIB) + dnl ********************************* dnl *** Check for Console 2.0 I/O *** dnl ********************************* @@ -1375,6 +1386,16 @@ case "$host" in arch_target=amd64; JIT_SUPPORTED=yes jit_wanted=true + ;; + ia64-*-*) + TARGET=IA64 + arch_target=ia64 + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + jit_wanted=true + LIBC="libc.so.6.1" + AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)]) + ;; sparc*-*-*) if test "x$ac_cv_sizeof_void_p" = "x8"; then @@ -1412,19 +1433,6 @@ case "$host" in *-*-mingw*|*-*-cygwin*) INTL="intl" ;; -# ia64-*-linux* | ia64-*-hpux*) -# TARGET=IA64; -# arch_target=ia64; -# JIT_SUPPORTED=no; -# ACCESS_UNALIGNED="no"; -# case "$host_os" in -# linux*) LIBC="libc.so.6.1";; -# hpux*) LIBC="libc.so.1";; -# esac -# ;; -# m68k-*-linux*) -# TARGET=M68K -# ;; hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00) TARGET=HPPA; arch_target=hppa; @@ -1512,7 +1520,7 @@ AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue) libsuffix=".so" case "$host" in - powerpc-*-darwin*) + *-*-darwin*) libsuffix=".dylib" LIBC="libc.dylib" INTL="libintl.dylib" @@ -1532,14 +1540,24 @@ case "$host" in LIBC="libc.so" INTL="libintl.so" ;; -esac - -if test "x$X11" = "xlibX11.so"; then + *-*-*linux*) AC_PATH_X - if test "x$no_x" != "xyes"; then - X11=`readlink $x_libraries/libX11.so` + AC_MSG_CHECKING(for the soname of libX11.so) + for i in $x_libraries /usr/lib /usr/lib64; do + for r in 4 5 6; do + if test -f $i/libX11.so.$r; then + X11=libX11.so.$r + AC_MSG_RESULT($X11) + fi + done + done + + if test "x$X11" = "xlibX11.so"; then + AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]); fi -fi + ;; +esac + AC_SUBST(libsuffix) @@ -1669,6 +1687,7 @@ 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=../../../.. @@ -1702,6 +1721,7 @@ AC_OUTPUT([ Makefile mint.pc mono.pc +mono-uninstalled.pc scripts/mono-nunit.pc scripts/mono-find-provides scripts/mono-find-requires @@ -1745,7 +1765,6 @@ data/net_2_0/Makefile samples/Makefile support/Makefile data/config -mono.spec tools/Makefile tools/locale-builder/Makefile runtime/Makefile @@ -1769,6 +1788,21 @@ runtime/Makefile 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 <