m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.6.5)
+AM_INIT_AUTOMAKE(mono,1.1.6.9)
AM_MAINTAINER_MODE
AC_PROG_LN_S
libmono_cflags="$PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
- LDFLAGS="$LDFLAGS -lthr"
- libmono_ldflags="-lthr"
+ LDFLAGS="$LDFLAGS -pthread"
+ libmono_ldflags="-pthread"
else
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
libmono_ldflags="$PTHREAD_LIBS"
libmono_cflags="$PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
- LDFLAGS="$LDFLAGS -lthr"
- libmono_ldflags="-lthr"
+ LDFLAGS="$LDFLAGS -pthread"
+ libmono_ldflags="-pthread"
else
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
libmono_ldflags="$PTHREAD_LIBS"
# Set STDC_HEADERS
AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_FAST_INSTALL
AM_PROG_LIBTOOL
# Test whenever ld supports -version-script
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
*-*-*freebsd5*)
- # libthr is preferrable on CURRENT
- AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+ AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
*-*-*freebsd6*)
- # libthr is preferrable on CURRENT
- AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+ AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
AC_CHECK_HEADERS(sys/sendfile.h)
AC_CHECK_HEADERS(sys/statvfs.h)
AC_CHECK_HEADERS(sys/vfstab.h)
+ AC_CHECK_HEADERS(sys/xattr.h)
AC_CHECK_FUNCS(getdomainname)
AC_CHECK_FUNCS(setdomainname)
AC_CHECK_FUNCS(fgetgrent)
AC_SUBST(DISABLE_SHARED_HANDLES)
fi
-#
-# ICU
-#
-ICU_CFLAGS=""
-ICU_LIBS=""
-enable_glob="normal; default"
-
-probe_icu=false
-AC_ARG_WITH(icu, [ --with-icu=yes/no],
- if test x$with_icu = xno; then
- probe_icu=false;
- AC_MSG_RESULT(Will not probe for ICU)
- fi
- if test x$with_icu = xyes; then
- probe_icu=true;
- fi
-)
-
-if $probe_icu; then
- AC_PATH_PROG(ICU_CONFIG, icu-config, no)
- if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then
- enable_glob="ICU not found, using non-ICU globalization code."
- else
- enable_glob="ICU, unsupported. Version: `$ICU_CONFIG --version`"
- AC_DEFINE(HAVE_ICU)
- ICU_CFLAGS=`$ICU_CONFIG --cppflags`
- ICU_LIBS=`$ICU_CONFIG --ldflags`
- fi
-fi
-AC_SUBST(ICU_CFLAGS)
-AC_SUBST(ICU_LIBS)
-
AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests Run the nunit tests of the class library on 'make check'])
AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
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_COMMANDS([runtime/etc/mono/1.0/machine.config],
[ depth=../../../..
(
case $prefix in
- NONE) prefix=/usr/local ;;
+ NONE) prefix=$ac_default_prefix ;;
esac
case $exec_prefix in
- NONE | '${prefix}') exec_prefix=$prefix ;;
+ NONE) exec_prefix='${prefix}' ;;
esac
+ 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 '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
)
libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}