From 00f0e76788c706cefe407dd7d43d08abb0d00ab6 Mon Sep 17 00:00:00 2001
From: Joe Shaw <joeshaw@novell.com>
Date: Tue, 17 Aug 2004 17:08:32 +0000
Subject: 2004-08-17  Joe Shaw  <joeshaw@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.
---
 ChangeLog        |  8 ++++++++
 configure.in     | 36 +++++++++++++++++++++---------------
 mono/Makefile.am |  8 ++++----
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 513b1df7..7b0279c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-17  Joe Shaw  <joeshaw@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@redhat.com>
 
 	* NEWS: update for 0.22
diff --git a/configure.in b/configure.in
index 36494e41..34d69e87 100644
--- a/configure.in
+++ b/configure.in
@@ -189,23 +189,29 @@ MONO_REQUIRED_VERSION=0.95
 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
diff --git a/mono/Makefile.am b/mono/Makefile.am
index 2c62368e..8bb25f59 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -61,14 +61,14 @@ clean:
 
 install-data-local:
 	@if test -n '$(TARGET)'; then                       \
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /root $(DESTDIR)$(libdir)";    \
-	  $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /root $(DESTDIR)$(libdir) || exit 1; \
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";    \
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir) || exit 1; \
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then                       \
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /root $(DESTDIR)$(libdir)";  \
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /root $(DESTDIR)$(libdir) || exit 1;   \
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";  \
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir) || exit 1;   \
 	fi
 
 EXTRA_DIST=			\
-- 
cgit