X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=1de3538ada7e41a3606d46dbc406fa6379c70a74;hb=d423e8c656e915d14048445cda48fb2be9b40fcd;hp=b20f3f60b16a9746e816113b1d3e5d1c51242093;hpb=84ba05db100f63cbec3666ee9edc96252351482a;p=mono.git

diff --git a/configure.in b/configure.in
index b20f3f60b16..1de3538ada7 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,2.5)
+AM_INIT_AUTOMAKE(mono,2.7)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -2389,19 +2389,19 @@ AC_CONFIG_FILES([po/mcs/Makefile.in])
 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 $srcdir in
-#    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-#    .) reldir=$depth ;;
-#    *) reldir=$depth/$srcdir ;;
-#    esac
-#    $ac_aux_dir/install-sh -d runtime/etc/mono/1.0
-#    cd runtime/etc/mono/1.0
-#    rm -f machine.config
-#    $LN_S $reldir/data/net_1_1/machine.config machine.config
-#    cd $depth
-#],[LN_S='$LN_S'])
+AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/1.0
+    cd runtime/etc/mono/1.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_1_1/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
 
 AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config],
 [   depth=../../../..
@@ -2536,7 +2536,6 @@ man/Makefile
 web/Makefile
 docs/Makefile
 data/Makefile
-data/net_1_1/Makefile
 data/net_2_0/Makefile
 data/net_4_0/Makefile
 data/net_2_0/Browsers/Makefile