Change default paths for mcs to ../mono/mcs, now that mcs is inside

mono on the git repo. The mcs path option is now --with-mcs-path

* autogen.sh: fix default paths for mcs, and accept a with_mono_path
  flag to optionally specify an alternate mono path
* configure.ac: fix the MOONLIGHT_MONO var to use the correct mono path
* m4/mono.m4: fix default mcs path, rename it to --with-mcs-path and
  add a new --with-mono-path option
* runtime/Makefile.am: fix the mono build paths

ChangeLog

@@ -1,3 +1,9 @@
+2010-07-23  Andreia Gaita  <avidigal@novell.com>
+
+	* autogen.sh: fix default paths for mcs, and accept a with_mono_path
+	  flag to optionally specify an alternate mono path
+	* configure.ac: fix the MOONLIGHT_MONO var to use the correct mono path
+
 2010-07-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>
 
 	* README: Update manual mono build instructions since we disable sgen now.

autogen.sh

@@ -159,7 +159,8 @@ fi
 
 configure_mono=1
 build_mono=1
-mcs_path=../mcs
+mono_path=../mono
+mcs_path=../mono/mcs
 for arg; do
   case "$arg" in
     --with-manual-mono=yes | --with-manual-mono )
@@ -170,15 +171,21 @@ for arg; do
       configure_mono=0 ;;
     --with-mcs-path* )
       mcs_path=$(echo $arg|sed -e 's,.*=,,') ;;
+    --with-mono-path* )
+      mono_path=$(echo $arg|sed -e 's,.*=,,') ;;
   esac
 done
 
+if test ! -d $mono_path; then
+	mono_path=$mcs_path/..
+fi
+
 if [ $configure_mono -eq 1 ] ; then
-  if test -d $mcs_path/../mono; then
-    echo Running $mcs_path/../mono/autogen.sh ...
+  if test -d $mono_path; then
+    echo Running $mono_path/autogen.sh ...
     # we build --with-sgen=no to not build both boehm and sgen (and we build with boehm instead of sgen because sgen has a problem nobody has investigated much into yet)
-    (cd $mcs_path/../mono ; ./autogen.sh "$@" --with-moonlight=only --with-profile4=no --enable-minimal=aot,interpreter --with-ikvm-native=no --with-mcs-docs=no --disable-nls --disable-mono-debugger --with-sgen=no)
-    echo Done running $mcs_path/../mono/autogen.sh ...
+    (cd $mono_path/ ; ./autogen.sh "$@" --with-moonlight=only --with-profile4=no --enable-minimal=aot,interpreter --with-ikvm-native=no --with-mcs-docs=no --disable-nls --disable-mono-debugger --with-sgen=no)
+    echo Done running $mono_path/autogen.sh ...
   fi
 fi
 

configure.ac

@@ -94,7 +94,7 @@ dnl Export Variables
 dnl
 
 AC_PATH_PROG(GACUTIL, gacutil)
-AC_SUBST([MOONLIGHT_MONO], [$MCS_PATH/../mono/mono/mini/mono])
+AC_SUBST([MOONLIGHT_MONO], [$MONO_PATH/mono/mini/mono])
 AC_SUBST([SYSTEM_MONO], mono)
 AC_PATH_PROG(ZIP, zip, no)
 if test "x$ZIP" = "xno" ; then
@@ -106,8 +106,8 @@ PERF_TOOL_LIBS="$MONO_LIBS $GTK_LIBS $XULRUNNER_LIBS"
 AC_SUBST(PERF_TOOL_CFLAGS)
 AC_SUBST(PERF_TOOL_LIBS)
 
-MONO_LIBS="-lmono-2.0 -L$MCS_PATH/../mono/mono/mini -L$MCS_PATH/../mono/mono/mini/.libs"
-MONO_STATIC_LIBS="-lmono-moon -L$MCS_PATH/../mono/mono/mini"
+MONO_LIBS="-lmono-2.0 -L$MONO_PATH/mono/mini -L$MONO_PATH/mono/mini/.libs"
+MONO_STATIC_LIBS="-lmono-moon -L$MONO_PATH/mono/mini"
 MOON_CFLAGS="$CAIRO_CFLAGS $FREETYPE2_CFLAGS $FONTCONFIG_CFLAGS $GTK_CFLAGS $ALSA_CFLAGS $PULSEAUDIO_CFLAGS $FFMPEG_CFLAGS $MONO_CFLAGS $DBUS_CFLAGS $CURL_CFLAGS"
 dnl MOON_LIBS is partially defined above for the user-plugin build
 MOON_LIBS="$MOON_LIBS $FFMPEG_LIBS $CAIRO_LIBS $FREETYPE2_LIBS $FONTCONFIG_LIBS $GTK_LIBS $ZLIB $PTHREAD_LIBS $EXPAT_LIBS $UNWIND_LIBS $DBUS_LIBS $CURL_LIBS"
@@ -312,7 +312,8 @@ cat <<EOF
 EOF
 if test x$browser_support = xyes; then
 cat <<EOF
-            Path to mcs tree: $with_mcspath
+            Path to mcs tree: $with_mcs_path
+            Path to mono tree: $with_mono_path
             Path to mono-basic tree: $with_mono_basic_path
 EOF
 fi

m4/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-23  Andreia Gaita  <avidigal@novell.com>
+
+	* mono.m4: fix default mcs path, rename it to --with-mcs-path and
+	  add a new --with-mono-path option
+
 2010-07-09  Alan McGovern  <amcgovern@novell.com>
 
 	* chrome.m4: Fix some autofoo, courtesy of Mr. D. Hex.

m4/mono.m4

@@ -3,29 +3,37 @@ AC_DEFUN([MOONLIGHT_CHECK_MONO],
 	MONO_REQUIRED_VERSION=2.0
 	MONO_REQUIRED_BROWSER_VERSION=2.5
 
+	AC_ARG_WITH([mcs-path],
+		    [  --with-mcs-path=/path/to/mcs      Specify an alternate mcs source tree],
+		[],
+		[with_mcs_path=$srcdir/../mono/mcs]
+	)
+
+	AC_ARG_WITH([mono-path],
+		    [  --with-mono-path=/path/to/mono      Specify an alternate mono source tree],
+		[],
+		[with_mono_path=$srcdir/../mono]
+	)
+
 	MOON_ARG_ENABLED_BY_DEFAULT([browser-support], [Disable the browser plugin])
 	browser_support=$enableval
 	if test "x$browser_support" = xyes; then
 		MONO_REQUIRED_VERSION=$MONO_REQUIRED_BROWSER_VERSION
 
-		dnl 
-		dnl path to mcs checkout
-		dnl mcs/moon needs to live next to moon for autogen.sh to work
-		dnl 
-
-		with_mcspath=$srcdir/../mcs
-			
-		if test ! -d "$with_mcspath"; then
-			AC_ERROR($with_mcspath doesn't exist)
+		if test ! -d "$with_mcs_path"; then
+			AC_ERROR($with_mcs_path doesn't exist)
 		fi
 
-		if test ! -d $with_mcspath/../mono; then
-			AC_ERROR($with_mcspath/../mono doesn't exist)
+		if test ! -d $with_mono_path; then
+			with_mono_path=$with_mcs_path/..
 		fi
 
-		MCS_PATH=$(cd "$with_mcspath" && pwd)
+		MCS_PATH=$(cd "$with_mcs_path" && pwd)
 		AC_SUBST(MCS_PATH)
 	
+		MONO_PATH=$(cd "$with_mono_path" && pwd)
+		AC_SUBST(MONO_PATH)
+
 		dnl
 		dnl path to mono-basic checkout
 		dnl
@@ -70,7 +78,7 @@ AC_DEFUN([MOONLIGHT_CHECK_MONO],
 		AC_ERROR(You cannot disable both Browser and Desktop support)
 	fi
 
-	MONO_CFLAGS=-I$MCS_PATH/../mono
+	MONO_CFLAGS=-I$MONO_PATH
 
 	AC_DEFINE([MONO_ENABLE_APP_DOMAIN_CONTROL], [1], [Whether Mono 2.5 is available and Deployment should create/destroy App Domains])
 	AC_DEFINE([MONO_ENABLE_CORECLR_SECURITY], [1], [Whether Mono 2.5 is available and CoreCLR security should be enabled])

runtime/ChangeLog

@@ -1,3 +1,7 @@
+2010-07-23  Andreia Gaita  <avidigal@novell.com>
+
+	* Makefile.am: fix the mono build paths
+
 2010-04-08  Andreia Gaita  <avidigal@novell.com>
 
 	* Makefile.am: call moon-specific mono make rules to do fast mono

runtime/Makefile.am

@@ -1,13 +1,13 @@
 if ONLY_BUILD_MONO
 all all-local:
-	$(MAKE) -C $(MCS_PATH)/../mono moon-do-build
+	$(MAKE) -C $(MONO_PATH) moon-do-build
 
 clean clean-local:
-	$(MAKE) -C $(MCS_PATH)/../mono moon-do-clean
+	$(MAKE) -C $(MONO_PATH) moon-do-clean
 
 else
 all all-local clean clean-local:
-	$(MAKE) -C $(MCS_PATH)/../mono $@
+	$(MAKE) -C $(MONO_PATH) $@
 
 endif