dbus ChangeLog,1.551,1.552 configure.in,1.96,1.97

[Joe Shaw]

Update of /cvs/dbus/dbus
In directory pdx:/tmp/cvs-serv8326

Modified Files:
	ChangeLog configure.in 
Log Message:
2004-08-17  Joe Shaw  <joeshaw at novell.com>

	* configure.in: If --enable-mono is passed in, if we can't find
	mono error out.

	* mono/Makefile.am: Use /gacutil to install assemblies into the
	GAC and not /root.

Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -d -r1.551 -r1.552
--- ChangeLog	12 Aug 2004 23:02:40 -0000	1.551
+++ ChangeLog	17 Aug 2004 17:08:31 -0000	1.552
@@ -1,3 +1,11 @@
+2004-08-17  Joe Shaw  <joeshaw at novell.com>
+
+	* configure.in: If --enable-mono is passed in, if we can't find
+	mono error out.
+
+	* mono/Makefile.am: Use /gacutil to install assemblies into the
+	GAC and not /root.
+
 2004-08-12  Havoc Pennington  <hp at redhat.com>
 
 	* NEWS: update for 0.22

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- configure.in	12 Aug 2004 23:02:41 -0000	1.96
+++ configure.in	17 Aug 2004 17:08:31 -0000	1.97
@@ -189,23 +189,29 @@
 AC_SUBST(MONO_REQUIRED_VERSION)
 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, have_mono=true, have_mono=false)
 
-if test "x$have_mono" = "xtrue"; then
-if test `uname -s` = "Darwin"; then
-	AC_PATH_PROG(RUNTIME, mint, no)
-	AC_PATH_PROG(CSC, mcs, no)
-	LIB_PREFIX=
-    LIB_SUFFIX=.dylib
-else
-	AC_PATH_PROG(RUNTIME, mono, no)
-	AC_PATH_PROG(CSC, mcs, no)
-	LIB_PREFIX=.so
-    LIB_SUFFIX=
+if test "x$enable_mono" = "xyes"; then
+	if test "x$have_mono" = "xfalse"; then
+		AC_MSG_ERROR([Mono was not found])
+	fi
 fi
+
+if test "x$have_mono" = "xtrue"; then
+	if test `uname -s` = "Darwin"; then
+		AC_PATH_PROG(RUNTIME, mint, no)
+		AC_PATH_PROG(CSC, mcs, no)
+		LIB_PREFIX=
+		LIB_SUFFIX=.dylib
+	else
+		AC_PATH_PROG(RUNTIME, mono, no)
+		AC_PATH_PROG(CSC, mcs, no)
+		LIB_PREFIX=.so
+		LIB_SUFFIX=
+	fi
 else
-AC_PATH_PROG(CSC, csc.exe, no)
-RUNTIME=
-LIB_PREFIX=
-LIB_SUFFIX=.dylib
+	AC_PATH_PROG(CSC, csc.exe, no)
+	RUNTIME=
+	LIB_PREFIX=
+	LIB_SUFFIX=.dylib
 fi
 
 if test x$enable_mono = xyes; then