m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.2.5)
+AM_INIT_AUTOMAKE(mono,1.2.6)
AM_MAINTAINER_MODE
API_VER=1.0
;;
*-*-solaris*)
platform_win32=no
- CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP"
+ CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DPLATFORM_SOLARIS"
need_link_unlink=yes
libmono_cflags="-D_REENTRANT"
libgc_threads=pthreads
*-*-darwin*)
platform_win32=no
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
- CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess"
+ CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
libmono_cflags="-D_THREAD_SAFE"
LDFLAGS="$LDFLAGS -pthread"
libmono_ldflags="-pthread"
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 sys/syscall.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 sys/mkdev.h)
AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
if test x$have_zlib = xyes; then
AC_SUBST([mcs_topdir])
AC_SUBST([mcs_topdir_from_srcdir])
+# Where's the 'olive' source tree?
+if test -d $srcdir/olive; then
+ olivedir=olive
+else
+ olivedir=../olive
+fi
+
+if test -d $srcdir/$olivedir; then
+olive_topdir='$(top_srcdir)/'$olivedir
+fi
+
AC_ARG_WITH([libgdiplus],
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to NO)],
[], [with_libgdiplus=installed])
[ --with-glib=embedded|system Choose glib API: system or embedded (default to system)],
[], [with_glib=system])
+eglib_dir=
+
case $with_glib in
embedded)
- GLIB_CFLAGS='-I$(top_srcdir)/eglib/src'
+ GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
BUILD_GLIB_LIBS="$GLIB_LIBS"
+ GMODULE_CFLAGS="$GLIB_CFLAGS"
+ GMODULE_LIBS="$GLIB_LIBS"
+ eglib_dir=eglib
AC_CONFIG_SUBDIRS(eglib)
;;
system)
AC_SUBST(GMODULE_LIBS)
AC_SUBST(BUILD_GLIB_CFLAGS)
AC_SUBST(BUILD_GLIB_LIBS)
+AC_SUBST(eglib_dir)
if test x$cross_compiling$platform_win32 = xnoyes; then
AC_MSG_CHECKING(for cygwin glib2-dev package)
AC_CHECK_FUNCS(mmap)
AC_CHECK_FUNCS(madvise)
AC_CHECK_FUNCS(getrusage)
+ AC_CHECK_FUNCS(getpriority)
+ AC_CHECK_FUNCS(setpriority)
AC_CHECK_FUNCS(sched_setaffinity)
AC_MSG_RESULT(no)
])
dnl **********************************
+ dnl *** Checks for sin_len ***
+ dnl **********************************
+ AC_MSG_CHECKING(for sockaddr_in.sin_len)
+ AC_TRY_COMPILE([
+ #include <netinet/in.h>
+ ], [
+ struct sockaddr_in saddr;
+ saddr.sin_len = sizeof (saddr);
+ ],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN, 1, [sockaddr_in has sin_len])
+ ], [
+ AC_MSG_RESULT(no)
+ ])
+ dnl **********************************
+ dnl *** Checks for sin6_len ***
+ dnl **********************************
+ AC_MSG_CHECKING(for sockaddr_in6.sin6_len)
+ AC_TRY_COMPILE([
+ #include <netinet/in.h>
+ ], [
+ struct sockaddr_in6 saddr6;
+ saddr6.sin6_len = sizeof (saddr6);
+ ],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_SOCKADDR_IN6_SIN_LEN, 1, [sockaddr_in6 has sin6_len])
+ ], [
+ AC_MSG_RESULT(no)
+ ])
+ dnl **********************************
dnl *** Checks for MonoPosixHelper ***
dnl **********************************
AC_CHECK_HEADERS(checklist.h)
AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",)
)
AC_SUBST(XATTR_LIB)
-
+
dnl *********************************
dnl *** Checks for Windows compilation ***
dnl *********************************
AC_CHECK_LIB(ole32, main, LIBS="$LIBS -lole32", AC_ERROR(bad mingw install?))
AC_CHECK_LIB(winmm, main, LIBS="$LIBS -lwinmm", AC_ERROR(bad mingw install?))
AC_CHECK_LIB(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?))
+ AC_CHECK_LIB(advapi32, main, LIBS="$LIBS -ladvapi32", AC_ERROR(bad mingw install?))
+ AC_CHECK_LIB(version, main, LIBS="$LIBS -lversion", AC_ERROR(bad mingw install?))
dnl *********************************
dnl *** Check for struct ip_mreqn ***
AC_SUBST(DISABLE_SHARED_HANDLES)
fi
+
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])
JIT_SUPPORTED=yes
jit_wanted=true
;;
- macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
- powerpc-*-sysv* | powerpc-*-darwin*)
+ macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
+ powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* )
TARGET=POWERPC;
AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
arch_target=ppc;
AC_TRY_COMPILE([], [
__asm__ ("ldfd f0, [r0]");
- ], fpu=FPA, [
- AC_TRY_COMPILE([], [
- __asm__ ("fldd d0, [r0]");
- ], fpu=VFP, fpu=NONE)
- ])
+ ], fpu=FPA, fpu=NONE)
AC_MSG_RESULT($fpu)
CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
fi
])
-MOONLIGHT=no
+MOONLIGHT=yes
AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies],[
- if test x$with_moonlight = xyes; then
- MOONLIGHT=yes
+ if test x$with_moonlight = xno; then
+ MOONLIGHT=no
+ fi
+])
+
+OPROFILE=no
+AC_ARG_WITH(oprofile,[ --with-oprofile=no,<path> Enable oprofile support (defaults to NO)],[
+ if test x$with_oprofile != xno; then
+ OPROFILE=yes
+ OPROFILE_CFLAGS="-I$with_oprofile/include"
+ OPROFILE_LIBS=
+ AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
fi
])
+AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
+AC_SUBST(OPROFILE_CFLAGS)
+AC_SUBST(OPROFILE_LIBS)
+
libmono_ldflags="$libmono_ldflags $LIBS"
AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
mono/interpreter/Makefile
mono/tests/Makefile
mono/tests/tests-config
+mono/tests/assemblyresolve/Makefile
mono/tests/cas/Makefile
mono/tests/cas/assembly/Makefile
mono/tests/cas/demand/Makefile
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 "sysconfdir=$sysconfdir" >> $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
export VERSION
[myver=$($AWK 'BEGIN {
split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
+ if(length(vsplit [1]) > 4) {
+ split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".")
+ }
print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
}')]
echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
fi
+
+ # if we have an olive folder, override the default settings
+ if test -d $olivedir; then
+
+ test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build
+
+ if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
+ echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
+ echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
+ echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+ echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
+ echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
+ echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
+ if test x$with_moonlight = xyes; then
+ echo "WITH_MOONLIGHT = yes" >> $srcdir/$olivedir/build/config.make
+ fi
+ fi
+ fi
)
libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
echo "
- mcs source: $mcs_topdir
+ mcs source: $mcs_topdir
+ olive source: $olive_topdir
+
GC: $gc
TLS: $with_tls
SIGALTSTACK: $with_sigaltstack
JNI support: $jdk_headers_found
libgdiplus: $libgdiplus_msg
zlib: $zlib_msg
+ oprofile: $OPROFILE
$disabled
"
projects / mono.git / blobdiff