AC_INIT(README)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.15)
+AM_INIT_AUTOMAKE(mono, 0.16)
AM_MAINTAINER_MODE
-dnl ****************************************
-dnl *** Check if we're building on win32 ***
-dnl ****************************************
-AC_MSG_CHECKING([if building for some Win32 platform])
+# Thread configuration inspired by sleepycat's db
+AC_MSG_CHECKING([host platform characteristics])
case "$host" in
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
AC_DEFINE(PLATFORM_WIN32)
CC="gcc -mno-cygwin"
+ HOST_CC="gcc"
+ CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS"
libdl=
;;
+ *-*-*bsd*)
+ platform_win32=no
+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
+ LDFLAGS="$LDFLAGS -pthread"
+ AC_DEFINE(NEED_LINK_UNLINK)
+ AC_DEFINE(PTHREAD_POINTER_ID)
+ libdl=
+ ;;
+ *-*-linux*)
+ platform_win32=no
+ CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+ libdl="-ldl"
+ ;;
+ *-*-solaris*)
+ platform_win32=no
+ CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
+ AC_DEFINE(NEED_LINK_UNLINK)
+ ;;
*)
+ AC_MSG_WARN([*** Please add $host to configure.in checks!])
platform_win32=no
libdl="-ldl"
;;
esac
-AC_MSG_RESULT($platform_win32)
+AC_MSG_RESULT(ok)
AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
AC_CHECK_TOOL(CC, gcc, gcc)
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h)
-
-AC_CHECK_HEADERS(iconv.h)
-AC_CHECK_HEADERS(giconv.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h)
# for mono/metadata/debug-symfile.c
AC_CHECK_HEADERS(elf.h)
+# for mono/dis
+AC_CHECK_HEADERS(wchar.h)
+
# not 64 bit clean in cross-compile
AC_CHECK_SIZEOF(void *, 4)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
+AC_CHECK_HEADERS(gc.h gc/gc.h)
AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
gc=auto
AC_ARG_WITH(gc, [ --with-gc=boehm,none],[gc=$with_gc])
case "x$gc" in
- xboehm|xyes)
+ xboehm|xbohem|xyes)
if test "x$found_boehm" != "xyes"; then
AC_MSG_ERROR("GC requested but libgc not found!")
fi
AC_MSG_WARN("Compiling mono without GC.")
;;
*)
-dnl When the JIT works with libgc, use this chunk.
-dnl # If libgc was found, use it. Otherwise just warn.
+ # If libgc was found, use it. Otherwise just warn.
if test "x$found_boehm" != "xyes"; then
AC_MSG_WARN("Compiling mono without GC.")
else
LIBS="$LIBS -lgc $libdl"
gc="boehm"
fi
-dnl AC_MSG_WARN("Compiling mono without GC.")
;;
esac
AC_MSG_CHECKING(size of sockaddr_un.sun_path)
AC_CACHE_VAL(cv_mono_sizeof_sunpath,
[AC_TRY_RUN([
+ #include <sys/types.h>
#include <stdio.h>
#include <sys/un.h>
AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
dnl *****************************
- dnl *** Checks for libpthread ***
+ dnl *** Checks for libxnet ***
dnl *****************************
- AC_SEARCH_LIBS(pthread_create, pthread c_r, [
- AM_CONDITIONAL(THREADS_PTHREAD, true)
- AC_DEFINE(HAVE_PTHREAD)
-
- # Need pthread_mutex_timedlock
- pthread_CFLAGS=""
- orig_CPPFLAGS=$CPPFLAGS
- # This is a gcc-specific error, but we already set
- # gcc-specific options in CFLAGS
- CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
- AC_MSG_CHECKING(for pthread_mutex_timedlock)
- AC_TRY_COMPILE([ #include <pthread.h>], [
- pthread_mutex_t mut=PTHREAD_MUTEX_INITIALIZER;
- pthread_mutex_timedlock(&mut, NULL);
- ], [
- # Works!
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
- ], [
- AC_MSG_RESULT(no)
+ case "${host}" in
+ *solaris* )
+ AC_MSG_CHECKING(for Solaris XPG4 support)
+ if test -f /usr/lib/libxnet.so; then
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+ CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
+ LIBS="$LIBS -lxnet"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ if test "$GCC" = "yes"; then
+ CFLAGS="$CFLAGS -Wno-char-subscripts"
+ fi
+ ;;
+ esac
- # glibc requires -D_GNU_SOURCE before it will declare
- # this function
- AC_MSG_CHECKING(whether _GNU_SOURCE is needed for pthread_mutex_timedlock)
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- AC_TRY_COMPILE([ #include <pthread.h>], [
- pthread_mutex_t mut=PTHREAD_MUTEX_INITIALIZER;
- pthread_mutex_timedlock(&mut, NULL);
- ], [
- AC_MSG_RESULT(yes)
- pthread_CFLAGS="-D_GNU_SOURCE"
- AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
- ], [
- AC_MSG_RESULT(no)
- dnl Add other variants here
- AC_MSG_WARN(Working around pthread_mutex_timedlock)
- ])
- ])
- CPPFLAGS=$orig_CPPFLAGS
- CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
-
- # Need PTHREAD_MUTEX_RECURSIVE
- pthread_CFLAGS=""
- orig_CPPFLAGS=$CPPFLAGS
- # This is a gcc-specific error, but we already set
- # gcc-specific options in CFLAGS
- CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
- AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
- AC_TRY_COMPILE([ #include <pthread.h>], [
- pthread_mutexattr_t attr;
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- ], [
- # Works!
- AC_MSG_RESULT(ok)
- ], [
- AC_MSG_RESULT(no)
-
- # glibc requires -D_GNU_SOURCE before it will declare
- # this macro
- AC_MSG_CHECKING(whether _GNU_SOURCE is needed for PTHREAD_MUTEX_RECURSIVE)
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- AC_TRY_COMPILE([ #include <pthread.h>], [
- pthread_mutexattr_t attr;
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- ], [
- AC_MSG_RESULT(ok)
- pthread_CFLAGS="-D_GNU_SOURCE"
- ], [
- AC_MSG_RESULT(no)
- dnl Add other variants here
- AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
- AC_DEFINE(USE_MONO_MUTEX)
- ])
- ])
- CPPFLAGS=$orig_CPPFLAGS
- CPPFLAGS="$CPPFLAGS -D_REENTRANT $pthread_CFLAGS"
+ dnl *****************************
+ dnl *** Checks for libpthread ***
+ dnl *****************************
+ AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+ AC_CHECK_FUNCS(pthread_mutex_timedlock)
+ AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
+ AC_TRY_COMPILE([ #include <pthread.h>], [
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
], [
- AC_MSG_ERROR([libpthread is required on non-win32 hosts])
+ AC_MSG_RESULT(ok)
+ ], [
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
+ AC_DEFINE(USE_MONO_MUTEX)
])
dnl ********************************
fi
fi
else
- AM_CONDITIONAL(THREADS_PTHREAD, false)
- # This is a kludge, we really ought to test for libws2_32, but
- # I can't make AC_CHECK_LIB link (the symbols seem to be mangled
- # with @num suffixes)
- LIBS="$LIBS -lws2_32"
- CFLAGS="$CFLAGS -mno-cygwin"
+ AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
+ AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
fi
dnl ****************************
***]])
fi
-if test "x$cross_compiling" = "xno"; then
-# check for new iconv version
-AC_MSG_CHECKING(for new iconv)
-AC_CACHE_VAL(new_iconv,[
- AC_TRY_RUN([#include <stdio.h>
- #include <iconv.h>
-
- int main()
- {
- exit (iconv_open ("UTF-16le", "UTF-8") == (iconv_t)-1);
- }
- ],
- new_iconv=yes,new_iconv=)])
-if test -n "$new_iconv"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_NEW_ICONV)
-else
- AC_MSG_RESULT(no)
-fi
-fi
-
AC_MSG_CHECKING([if inter-process shared handles are requested])
AC_ARG_ENABLE(shared-handles, [ --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
AC_MSG_RESULT($try_shared_handles)
#m68k-*-linux*) TARGET=M68K;;
macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
+s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="no";;
esac
if test ${TARGET} = unknown; then
AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
AM_CONDITIONAL(ARM, test x$TARGET = xARM)
+AM_CONDITIONAL(S390, test x$TARGET = xS390)
LIBC="libc.so.6"
AC_SUBST(LIBC)
mono/arch/x86/Makefile
mono/arch/ppc/Makefile
mono/arch/sparc/Makefile
+mono/arch/s390/Makefile
mono/arch/arm/Makefile
mono/interpreter/Makefile
mono/tests/Makefile
projects / mono.git / blobdiff