dbus ChangeLog, 1.485, 1.486 Makefile.am, 1.19, 1.20 configure.in, 1.83, 1.84 dbus-sharp.pc.in, 1.3, 1.4

[Owen Fraser-Green]

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

Modified Files:
	ChangeLog Makefile.am configure.in dbus-sharp.pc.in 
Log Message:
Various mono related changes to facilitate GAC support.


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -d -r1.485 -r1.486
--- a/ChangeLog	15 May 2004 11:44:44 -0000	1.485
+++ b/ChangeLog	15 May 2004 19:31:12 -0000	1.486
@@ -1,6 +1,17 @@
 2004-05-15  Owen Fraser-Green  <owen at discobabe.net>
 
-	* mono/Makefile.am: Added SUBDIR for docs
+	* mono/dbus-sharp.dll.config.in: Added for GAC
+	* mono/dbus-sharp.snk: Added for GAC
+	* mono/Assembly.cs.in: Added for GAC
+	* mono/Makefile.am: Changes for GAC installation	
+	* configure.in: Added refs for dbus-sharp.dll.config.in and
+	Assembly.cs.in. More fixes for mono testing
+	* mono/example/Makefile.am: Changed var to CSC
+	* Makefile.am: Changed flag name to DBUS_USE_CSC
+
+2004-05-15  Owen Fraser-Green  <owen at discobabe.net>
+
+	* mono/Makefile.am: Added SUBDIRS for docs. Changed SUBDIRS order
 	* mono/doc/*: Added documentation framework
 	* configure.in: Added monodoc check
 	* README: Added description of mono configure flags

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/Makefile.am	23 Mar 2004 12:10:32 -0000	1.19
+++ b/Makefile.am	15 May 2004 19:31:12 -0000	1.20
@@ -12,7 +12,7 @@
    GCJ_SUBDIR=gcj
 endif
 
-if DBUS_USE_MCS
+if DBUS_USE_CSC
    MONO_SUBDIR=mono
    MONO_PC=dbus-sharp.pc
 endif

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- a/configure.in	15 May 2004 11:44:44 -0000	1.83
+++ b/configure.in	15 May 2004 19:31:12 -0000	1.84
@@ -185,32 +185,64 @@
 AM_PROG_LIBTOOL
 
 #### Look for mono
-AC_CHECK_TOOL(MCS, mcs)
-if test -z "$MCS" ; then
-     have_mcs=no
+MONO_REQUIRED_VERSION=0.91
+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
-     have_mcs=yes
-     if test "x${MCSFLAGS-unset}" = xunset; then
-        MCSFLAGS="" ### put default MCSFLAGS here
-     fi
-     AC_SUBST(MCSFLAGS)
+	AC_PATH_PROG(RUNTIME, mono, no)
+	AC_PATH_PROG(CSC, mcs, no)
+	LIB_PREFIX=.so
+    LIB_SUFFIX=
 fi
-
-if test x$enable_mono = xauto ; then
-    if test x$have_mcs = xno ; then
-        enable_mono=no
-    else
-        enable_mono=yes
-    fi
+else
+AC_PATH_PROG(CSC, csc.exe, no)
+RUNTIME=
+LIB_PREFIX=
+LIB_SUFFIX=.dylib
 fi
 
 if test x$enable_mono = xyes; then
     if test x$have_mcs = xno ; then
 	AC_MSG_ERROR([Building Mono bindings explicitly required, but mcs compiler not found])
     fi
+
+    ### Test for GACUTIL
+    AC_PATH_PROG(GACUTIL, gacutil, no)
+    if test "x$GACUTIL" = "xno" ; then
+        AC_MSG_ERROR([No gacutil tool found])
+    fi
+
+    AC_SUBST(GACUTIL)
 fi
 
-AM_CONDITIONAL(DBUS_USE_MCS, test x$enable_mono = xyes)
+if test x$enable_mono = xauto ; then
+    if test x$CSC = xno ; then
+        enable_mono=no
+    else
+    	### Test for GACUTIL
+    	AC_PATH_PROG(GACUTIL, gacutil, no)
+    	if test "x$GACUTIL" = "xno" ; then
+	   enable_mono=no
+  	else
+	   enable_mono=yes
+    	fi
+    fi
+fi
+
+AC_SUBST(RUNTIME)
+AC_SUBST(CSC)
+AC_SUBST(GACUTIL)
+AC_SUBST(LIB_PREFIX)
+AC_SUBST(LIB_SUFFIX)
+
+AM_CONDITIONAL(DBUS_USE_CSC, test x$enable_mono = xyes)
 
 #### Look for monodoc
 MONODOC_REQUIRED_VERSION=0.15
@@ -1059,6 +1091,8 @@
 gcj/org/freedesktop/Makefile
 gcj/org/freedesktop/dbus/Makefile
 mono/Makefile
+mono/AssemblyInfo.cs
+mono/dbus-sharp.dll.config
 mono/example/Makefile
 mono/doc/Makefile
 bus/Makefile
@@ -1111,12 +1145,11 @@
 
 if test x$enable_mono = xyes ; then
 echo \
-"        mcs:            	  ${MCS}
-	mcsflags:	          ${MCSFLAGS}
+"        csc:            	  ${CSC}
 "
 else
 echo \
-"        mcs:                      (not enabled)
+"        csc:                      (not enabled)
 "
 fi
 

Index: dbus-sharp.pc.in
===================================================================
RCS file: /cvs/dbus/dbus/dbus-sharp.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/dbus-sharp.pc.in	30 Apr 2004 16:02:53 -0000	1.3
+++ b/dbus-sharp.pc.in	15 May 2004 19:31:12 -0000	1.4
@@ -5,4 +5,4 @@
 Name: DBus#
 Description: DBus# - D-BUS .NET Bindings
 Version: @VERSION@
-Libs: -lib:${libdir} -r:dbus-sharp -r:glib-sharp
+Libs: -lib:${libdir}/mono/dbus-sharp -r:dbus-sharp -r:glib-sharp