X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=f2a44ee61fa7a55e03d447a4ed4c8f4485cf4c84;hb=294dbea024b6bcd8066f9e3047d71ff345db05d6;hp=acb9bb10beb0e066d130bbb7efd79e2e9ff22bef;hpb=7da2d16aea44195428ebbe117401cec2c71a4aec;p=mono.git

diff --git a/configure.in b/configure.in
index acb9bb10beb..f2a44ee61fa 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.2.5.99)
+AM_INIT_AUTOMAKE(mono,1.9)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -212,7 +212,7 @@ case "$host" in
 		;;
 	*-*-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
@@ -300,7 +300,7 @@ fi
 
 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
@@ -451,12 +451,17 @@ AC_ARG_WITH([glib],
 	[  --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)
@@ -484,6 +489,7 @@ AC_SUBST(GMODULE_CFLAGS)
 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)
@@ -723,6 +729,9 @@ dnl
 
 if test x$platform_win32 = xno; then
 
+	dnl hires monotonic clock support
+	AC_SEARCH_LIBS(clock_gettime, rt)
+
 	dnl dynamic loader support
 	AC_CHECK_FUNC(dlopen, DL_LIB="",
 		AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", dl_support=no)
@@ -1354,6 +1363,36 @@ if test x$platform_win32 = xno; then
 			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)
@@ -1423,7 +1462,7 @@ if test x$platform_win32 = xno; then
 		AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",)
 	)
 	AC_SUBST(XATTR_LIB)
-	
+
 	dnl *********************************
 	dnl *** Checks for Windows compilation ***
 	dnl *********************************
@@ -1452,6 +1491,7 @@ else
 	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 ***
@@ -1599,6 +1639,7 @@ if test "x$try_shared_handles" != "xyes"; then
 	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])
 
@@ -1939,13 +1980,27 @@ AC_ARG_WITH(preview,  [ --with-preview=yes,no     If you want to install the 2.0
 	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)
@@ -2002,7 +2057,6 @@ 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=../../../..
@@ -2149,12 +2203,12 @@ fi
   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
     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
-
     case $INSTALL in
     [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
     *) mcs_INSTALL=$mono_build_root/$INSTALL ;;
@@ -2208,6 +2262,7 @@ echo "
 	JNI support: $jdk_headers_found
 	libgdiplus:  $libgdiplus_msg
 	zlib:        $zlib_msg
+	oprofile:    $OPROFILE
 	$disabled
 
 "