Author: alp
Date: 2007-03-14 14:01:54 -0500 (Wed, 14 Mar 2007)
New Revision: 74292
Modified:
trunk/gnome-keyring-sharp/ChangeLog
trunk/gnome-keyring-sharp/configure.ac
trunk/gnome-keyring-sharp/src/Makefile.am
Log:
2007-03-14 Alp Toker <[EMAIL PROTECTED]>
* configure.ac:
* src/Makefile.am: Reference NDesk D-Bus when both it and gmcs are
available. If only mcs is around or D-Bus isn't available, things will
still build.
Modified: trunk/gnome-keyring-sharp/ChangeLog
===================================================================
--- trunk/gnome-keyring-sharp/ChangeLog 2007-03-14 18:25:08 UTC (rev 74291)
+++ trunk/gnome-keyring-sharp/ChangeLog 2007-03-14 19:01:54 UTC (rev 74292)
@@ -1,6 +1,13 @@
2007-03-14 Alp Toker <[EMAIL PROTECTED]>
* configure.ac:
+ * src/Makefile.am: Reference NDesk D-Bus when both it and gmcs are
+ available. If only mcs is around or D-Bus isn't available, things will
+ still build.
+
+2007-03-14 Alp Toker <[EMAIL PROTECTED]>
+
+ * configure.ac:
* src/Makefile.am: Rename MCSFLAGS to CSFLAGS, MCS to CSC.
2007-03-13 Alp Toker <[EMAIL PROTECTED]>
Modified: trunk/gnome-keyring-sharp/configure.ac
===================================================================
--- trunk/gnome-keyring-sharp/configure.ac 2007-03-14 18:25:08 UTC (rev
74291)
+++ trunk/gnome-keyring-sharp/configure.ac 2007-03-14 19:01:54 UTC (rev
74292)
@@ -8,19 +8,47 @@
AC_PROG_INSTALL
AC_PATH_PROG(CSC, csc, no)
+AC_PATH_PROG(GMCS, gmcs, no)
AC_PATH_PROG(MCS, mcs, no)
AC_PATH_PROG(RUNTIME, mono, no)
CS="C#"
-if test "x$MCS" = "xno" -a "x$CSC" = "xno" ; then
- dnl AC_MSG_ERROR([You need to install a C# compiler])
- AC_MSG_ERROR([No $CS compiler found])
-fi
if test "x$CSC" = "xno" ; then
- CSC=$MCS
+ if test "x$GMCS" = "xno" ; then
+ if test "x$MCS" = "xno" ; then
+ AC_MSG_ERROR([No $CS compiler found])
+ else
+ CSC=$MCS
+ ENABLE_DBUS="no"
+ fi
+ else
+ CSC=$GMCS
+ fi
fi
+#
+# Use D-Bus as a fallback to get the keyring socket address
+#
+AC_ARG_ENABLE(dbus,
+ [ --enable-dbus[[=no/yes]] compile with D-Bus support
[[default: yes]]],
+ ENABLE_DBUS="$enableval")
+AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno")
+CSFLAGS=
+DBUS_LIBS=
+if test "x$ENABLE_DBUS" != "xno" ; then
+ PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4, HAVE_DBUS="yes",
HAVE_DBUS="no")
+
+ if test "x$HAVE_DBUS" = "xno"; then
+ AC_MSG_ERROR($DBUS_PKG_ERRORS: consider passing --enable-dbus=no to
configure)
+ fi
+
+ CSFLAGS=" -d:ENABLE_DBUS "
+fi
+AC_SUBST(CSFLAGS)
+AC_SUBST(DBUS_LIBS)
+
+
AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
AC_PATH_PROG(MONODOCER, monodocer, no)
if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
Modified: trunk/gnome-keyring-sharp/src/Makefile.am
===================================================================
--- trunk/gnome-keyring-sharp/src/Makefile.am 2007-03-14 18:25:08 UTC (rev
74291)
+++ trunk/gnome-keyring-sharp/src/Makefile.am 2007-03-14 19:01:54 UTC (rev
74292)
@@ -1,7 +1,7 @@
SUBDIRS=Gnome.Keyring
pkgconfigdir=$(libdir)/pkgconfig
-CSFLAGS= -debug+ -debug:full -nologo -r:Mono.Posix.dll
+CSFLAGS+= -debug+ -debug:full -nologo -r:Mono.Posix.dll
gnomekeyringdir = $(prefix)/lib/Gnome.Keyring
pkgconfig_DATA = gnome-keyring-sharp.pc
@@ -10,7 +10,7 @@
CLEANFILES = Gnome.Keyring.dll*
#
-gnomekeyring_references=
+gnomekeyring_references = $(DBUS_LIBS)
gnomekeyring_sources = \
Gnome.Keyring/AccessRights.cs \
@@ -32,5 +32,5 @@
gnomekeyring_build_sources = $(addprefix $(srcdir)/, $(gnomekeyring_sources))
$(addprefix $(top_builddir)/src/Gnome.Keyring/, AssemblyInfo.cs)
Gnome.Keyring.dll: $(gnomekeyring_build_sources)
- $(CSC) $(CSFLAGS) $(gnomekeyring_references) /target:library /out:$@
$(gnomekeyring_build_sources)
+ $(CSC) $(CSFLAGS) $(gnomekeyring_references) -target:library -out:$@
$(gnomekeyring_build_sources)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
