Actually commit changes to configure.in. Sorry, they got left out, somehow, last...

svn path=/trunk/mono/; revision=36451

diff --git a/Makefile.am b/Makefile.am
index e71ff01df568627b29d9301c586a1551614a3a9c..7cbe5e331916d99daddd6490b28cdb34f722a2d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data scripts man samples support web 
+SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web 
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono ikvm-jni docs data scripts man samples support web tools
+DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support web tools
 
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 

diff --git a/configure.in b/configure.in
index 1fa7baf9573988260c49dc9b63ee540f85508631..4f8723ee3de73a3cfe44aeeea5ee824fc618d506 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1463,6 +1463,28 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
+mono_build_root=`pwd`
+AC_SUBST(mono_build_root)
+
+if test x$USEJIT = xtrue; then
+  mono_runtime=mono/mini/mono
+else
+  mono_runtime=mono/interpreter/mint
+fi
+AC_SUBST(mono_runtime)
+
+mono_cfg_root=$mono_build_root/runtime
+if test x$platform_win32 = xyes; then
+  mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
+else
+  mono_cfg_dir=$mono_cfg_root/etc
+fi
+AC_SUBST(mono_cfg_dir)
+
+AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
+AC_CONFIG_LINKS([runtime/etc/mono/1.0/machine.config:data/net_1_1/machine.config 
+                 runtime/etc/mono/2.0/machine.config:data/net_2_0/machine.config])
+
 AC_OUTPUT([
 Makefile
 mint.pc