Author: jbevain
Date: 2007-09-19 11:34:33 -0400 (Wed, 19 Sep 2007)
New Revision: 86016
Modified:
trunk/olive/ChangeLog
trunk/olive/Makefile
trunk/olive/configure
Log:
2007-09-19 Jb Evain <[EMAIL PROTECTED]>
* Makefile, configure: build the net_2_1 (moonlight) profile
only if WITH_MOONLIGHT is defined in the config.make (it is
by default). mono will override the config file to build only
the moonlight profile if mono is built with moonlight as well.
Modified: trunk/olive/ChangeLog
===================================================================
--- trunk/olive/ChangeLog 2007-09-19 15:31:39 UTC (rev 86015)
+++ trunk/olive/ChangeLog 2007-09-19 15:34:33 UTC (rev 86016)
@@ -1,3 +1,10 @@
+2007-09-19 Jb Evain <[EMAIL PROTECTED]>
+
+ * Makefile, configure: build the net_2_1 (moonlight) profile
+ only if WITH_MOONLIGHT is defined in the config.make (it is
+ by default). mono will override the config file to build only
+ the moonlight profile if mono is built with moonlight as well.
+
2007-09-04 Jb Evain <[EMAIL PROTECTED]>
* Makefile: override all clean and install to work on all
Modified: trunk/olive/Makefile
===================================================================
--- trunk/olive/Makefile 2007-09-19 15:31:39 UTC (rev 86015)
+++ trunk/olive/Makefile 2007-09-19 15:34:33 UTC (rev 86016)
@@ -6,8 +6,13 @@
net_2_1_SUBDIRS := build class data
net_3_5_SUBDIRS := build class
-PROFILES = net_3_0 net_2_1 net_3_5
+include build/config.make
+PROFILES = net_3_0 net_3_5
+ifdef WITH_MOONLIGHT
+PROFILES += net_2_1
+endif
+
STD_TARGETS_OVERRIDE = all clean install uninstall
ifndef PROFILE
Modified: trunk/olive/configure
===================================================================
--- trunk/olive/configure 2007-09-19 15:31:39 UTC (rev 86015)
+++ trunk/olive/configure 2007-09-19 15:34:33 UTC (rev 86016)
@@ -5,6 +5,7 @@
VERSION=0.1
prefix=NONE
+with_moonlight=yes
test -e "$CONFIG_SITE" && . "$CONFIG_SITE"
test "$prefix" = NONE && prefix=/usr/local
@@ -16,6 +17,12 @@
--prefix)
echo --prefix needs an argument: --prefix=directory >&2
;;
+ --with-moonlight=*)
+ with_moonlight=`echo $1 | sed 's/--with-moonlight=//'`
+ ;;
+ --with-moonlight)
+ with_moonlight=yes
+ ;;
*)
echo Unknown argument $1 >&2
esac
@@ -32,8 +39,10 @@
echo "MCS_FLAGS=-debug+" >> build/config.make
echo "RUNTIME=mono" >> build/config.make
echo "MONO_VERSION=$VERSION" >> build/config.make
+test "$with_moonlight" = yes && echo "WITH_MOONLIGHT=$with_moonlight" >>
build/config.make
echo "Olive $VERSION"
echo
echo " Install Prefix: ${prefix}"
+echo " With Moonlight: ${with_moonlight}"
echo
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
