merge -r 61113:61114

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 6127ea314832dfc95a02f8a92e40ce2bb2602906..e42dfd7426f7be9b284ee04f3a2283fd6eb5caea 100644 (file)
--- 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.14)
+AM_INIT_AUTOMAKE(mono,1.1.15)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -562,9 +562,10 @@ AC_TRY_COMPILE([], [
    void __attribute__ ((visibility ("hidden"))) doit (void) {}
    void main () { doit (); }
 ], [
-   AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute])
+   have_visibility_hidden=yes
    AC_MSG_RESULT(yes)
 ], [
+   have_visibility_hidden=no
    AC_MSG_RESULT(no)
 ])
 
@@ -1334,6 +1335,7 @@ else
        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?))
        AC_CHECK_LIB(ole32, main, LIBS="$LIBS -lole32", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?))
 
        dnl *********************************
        dnl *** Check for struct ip_mreqn ***
@@ -1511,6 +1513,18 @@ case "$host" in
                  solaris*)
                        LIBC="libc.so"
                        INTL="libintl.so"
+
+                       # On solaris 10 x86, gcc prints a warning saying 'visibility attribute not supported on this configuration; ignored', but linking fails. A test case:
+                       # int astruct __attribute__ ((visibility ("hidden")));
+                       # void foo ()
+                       # {
+                       #       void *p = &astruct;
+                       # }
+                       # gcc -fPIC --shared -o libfoo.so foo.c
+                       # yields:
+                       # foo.c:6: warning: visibility attribute not supported in this configuration; ignored
+                       # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally
+                       have_visibility_hidden=no
                esac
                ;;
        x86_64-*-* | amd64-*-*)
@@ -1618,6 +1632,10 @@ case "$host" in
                ;;
 esac
 
+if test "x$have_visibility_hidden" = "xyes"; then
+   AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute])
+fi
+
 AC_ARG_WITH(jit, [  --with-jit=yes,no       If you want to build scripts that default to the JIT],[
        if test x$withval = xyes; then
           jit_wanted=true
@@ -1726,11 +1744,13 @@ fi
 
 mono_debugger_supported=no
 if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
-       case "$host" in
-       *-*-*linux*)
-               mono_debugger_supported=yes
-               ;;
-       esac
+       if test x$use_included_gc = xyes; then
+               case "$host" in
+               *-*-*linux*)
+                       mono_debugger_supported=yes
+                       ;;
+               esac
+       fi
 fi
 
 AC_MSG_CHECKING(if the Mono Debugger is supported on this platform)
@@ -1872,6 +1892,20 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config],
     cd $depth
 ],[LN_S='$LN_S'])
 
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
+    cd runtime/etc/mono/2.0
+    rm -f web.config
+    $LN_S $reldir/data/net_2_0/web.config web.config
+    cd $depth
+],[LN_S='$LN_S'])
+
 AC_OUTPUT([
 Makefile
 mint.pc