tomboy r2242 - in trunk: . Tomboy Tomboy/Addins/Backlinks Tomboy/Addins/Bugzilla Tomboy/Addins/Evolution Tomboy/Addins/ExportToHtml Tomboy/Addins/FileSystemSyncService Tomboy/Addins/FixedWidth Tomboy/Addins/GalagoPresence Tomboy/Addins/InsertTimestamp Tomboy/Addins/NoteOfTheDay Tomboy/Addins/PrintNotes Tomboy/Addins/Sketching Tomboy/Addins/SshSyncService Tomboy/Addins/StickyNoteImport Tomboy/Addins/Tasks Tomboy/Addins/Tasque Tomboy/Addins/VoiceNotes Tomboy/Addins/WebDavSyncService

From: sharm svn gnome org
To: svn-commits-list gnome org
Subject: tomboy r2242 - in trunk: . Tomboy Tomboy/Addins/Backlinks Tomboy/Addins/Bugzilla Tomboy/Addins/Evolution Tomboy/Addins/ExportToHtml Tomboy/Addins/FileSystemSyncService Tomboy/Addins/FixedWidth Tomboy/Addins/GalagoPresence Tomboy/Addins/InsertTimestamp Tomboy/Addins/NoteOfTheDay Tomboy/Addins/PrintNotes Tomboy/Addins/Sketching Tomboy/Addins/SshSyncService Tomboy/Addins/StickyNoteImport Tomboy/Addins/Tasks Tomboy/Addins/Tasque Tomboy/Addins/VoiceNotes Tomboy/Addins/WebDavSyncService
Date: Sat, 15 Nov 2008 15:07:12 +0000 (UTC)
Author: sharm
Date: Sat Nov 15 15:07:12 2008
New Revision: 2242
URL: http://svn.gnome.org/viewvc/tomboy?rev=2242&view=rev

Log:
* tomboy/configure.in: Add --enable-gnome (default), --enable-windows,
  and --enable-osx (mutually exclusive).  Rename some variables to
  clearly be GNOME-specific. Print info about configuration at the end
  (like Banshee).

* tomboy/Tomboy/Addins/Tasks/Makefile.am:
* tomboy/Tomboy/Addins/Tasque/Makefile.am:
* tomboy/Tomboy/Addins/Bugzilla/Makefile.am:
* tomboy/Tomboy/Addins/Sketching/Makefile.am:
* tomboy/Tomboy/Addins/Evolution/Makefile.am:
* tomboy/Tomboy/Addins/Backlinks/Makefile.am:
* tomboy/Tomboy/Addins/VoiceNotes/Makefile.am:
* tomboy/Tomboy/Addins/PrintNotes/Makefile.am:
* tomboy/Tomboy/Addins/FixedWidth/Makefile.am:
* tomboy/Tomboy/Addins/ExportToHtml/Makefile.am:
* tomboy/Tomboy/Addins/NoteOfTheDay/Makefile.am:
* tomboy/Tomboy/Addins/SshSyncService/Makefile.am:
* tomboy/Tomboy/Addins/GalagoPresence/Makefile.am:
* tomboy/Tomboy/Addins/InsertTimestamp/Makefile.am:
* tomboy/Tomboy/Addins/StickyNoteImport/Makefile.am:
* tomboy/Tomboy/Addins/WebDavSyncService/Makefile.am:
* tomboy/Tomboy/Addins/FileSystemSyncService/Makefile.am: Split
  TOMBOY_LIBS into GTKSHARP_LIBS and GNOME_LIBS.

* tomboy/Tomboy/Makefile.am: Define GNOME/Windows/Mac-specific
  *_CSFILES, *_CSFLAGS, and *_LIBS.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Addins/Backlinks/Makefile.am
   trunk/Tomboy/Addins/Bugzilla/Makefile.am
   trunk/Tomboy/Addins/Evolution/Makefile.am
   trunk/Tomboy/Addins/ExportToHtml/Makefile.am
   trunk/Tomboy/Addins/FileSystemSyncService/Makefile.am
   trunk/Tomboy/Addins/FixedWidth/Makefile.am
   trunk/Tomboy/Addins/GalagoPresence/Makefile.am
   trunk/Tomboy/Addins/InsertTimestamp/Makefile.am
   trunk/Tomboy/Addins/NoteOfTheDay/Makefile.am
   trunk/Tomboy/Addins/PrintNotes/Makefile.am
   trunk/Tomboy/Addins/Sketching/Makefile.am
   trunk/Tomboy/Addins/SshSyncService/Makefile.am
   trunk/Tomboy/Addins/StickyNoteImport/Makefile.am
   trunk/Tomboy/Addins/Tasks/Makefile.am
   trunk/Tomboy/Addins/Tasque/Makefile.am
   trunk/Tomboy/Addins/VoiceNotes/Makefile.am
   trunk/Tomboy/Addins/WebDavSyncService/Makefile.am
   trunk/Tomboy/Makefile.am
   trunk/configure.in

Modified: trunk/Tomboy/Addins/Backlinks/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Backlinks/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Backlinks/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/Bugzilla/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Bugzilla/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Bugzilla/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/Evolution/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Evolution/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Evolution/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,8 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 			\
+	$(GNOME_LIBS) 				\
 	$(EVOLUTION_LIBS)			\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix

Modified: trunk/Tomboy/Addins/ExportToHtml/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/ExportToHtml/Makefile.am	(original)
+++ trunk/Tomboy/Addins/ExportToHtml/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/FileSystemSyncService/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/FileSystemSyncService/Makefile.am	(original)
+++ trunk/Tomboy/Addins/FileSystemSyncService/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/FixedWidth/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/FixedWidth/Makefile.am	(original)
+++ trunk/Tomboy/Addins/FixedWidth/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/GalagoPresence/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/GalagoPresence/Makefile.am	(original)
+++ trunk/Tomboy/Addins/GalagoPresence/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(GALAGO_LIBS)				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix

Modified: trunk/Tomboy/Addins/InsertTimestamp/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/InsertTimestamp/Makefile.am	(original)
+++ trunk/Tomboy/Addins/InsertTimestamp/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/NoteOfTheDay/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/NoteOfTheDay/Makefile.am	(original)
+++ trunk/Tomboy/Addins/NoteOfTheDay/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/PrintNotes/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/PrintNotes/Makefile.am	(original)
+++ trunk/Tomboy/Addins/PrintNotes/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/Sketching/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Sketching/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Sketching/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix               \
 	-r:Mono.Cairo

Modified: trunk/Tomboy/Addins/SshSyncService/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/SshSyncService/Makefile.am	(original)
+++ trunk/Tomboy/Addins/SshSyncService/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/StickyNoteImport/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/StickyNoteImport/Makefile.am	(original)
+++ trunk/Tomboy/Addins/StickyNoteImport/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 			\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/Tasks/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Tasks/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Tasks/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/Tasque/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Tasque/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Tasque/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 			\
 	$(LINK_MONO_ADDINS)			\
 	$(DBUS_LIBS)				\
 	-r:Mono.Posix

Modified: trunk/Tomboy/Addins/VoiceNotes/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/VoiceNotes/Makefile.am	(original)
+++ trunk/Tomboy/Addins/VoiceNotes/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Addins/WebDavSyncService/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/WebDavSyncService/Makefile.am	(original)
+++ trunk/Tomboy/Addins/WebDavSyncService/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -7,7 +7,7 @@
 
 ASSEMBLIES = 					\
 	$(LINK_TOMBOY_EXE)			\
-	$(TOMBOY_LIBS) 				\
+	$(GTKSHARP_LIBS) 				\
 	$(LINK_MONO_ADDINS)			\
 	-r:Mono.Posix
 

Modified: trunk/Tomboy/Makefile.am
==============================================================================
--- trunk/Tomboy/Makefile.am	(original)
+++ trunk/Tomboy/Makefile.am	Sat Nov 15 15:07:12 2008
@@ -14,16 +14,49 @@
 	$(srcdir)/RemoteControlProxy.cs
 endif
 
-if FIXED_GTKSPELL
-FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
+if ENABLE_OSX
+OSX_CSFLAGS = -define:MAC
+OSX_CSFILES =					\
+	$(srcdir)/MacApplication.cs		\
+	$(srcdir)/MacFactory.cs			\
+	$(srcdir)/WindowsApplication.cs		\
+	$(srcdir)/XmlPreferencesClient.cs
+OSX_LIBS =					\
+	-r:$(top_srcdir)/macbin/ige-mac-integration-sharp.dll
 endif
 
+if ENABLE_WIN
+WIN_CSFLAGS = -define:WIN32
+WIN_CSFILES =					\
+	$(srcdir)/ManagedWinapi.EventDispatchingNativeWindow.cs	\
+	$(srcdir)/ManagedWinapi.Hotkey.cs	\
+	$(srcdir)/WindowsApplication.cs		\
+	$(srcdir)/WindowsFactory.cs		\
+	$(srcdir)/WindowsKeybinder.cs		\
+	$(srcdir)/XmlPreferencesClient.cs
+WIN_LIBS =					\
+	-r:System.Windows.Forms.dll
+endif
+
+if ENABLE_GNOME
+GNOME_CSFILES =					\
+	$(srcdir)/Applet.cs 			\
+	$(srcdir)/GConfPreferencesClient.cs	\
+	$(srcdir)/GnomeApplication.cs		\
+	$(srcdir)/GnomeFactory.cs		\
+	$(srcdir)/XKeybinder.cs
+
 if FIXED_PANELAPPLET
 FIXED_PANELAPPLET_CSFLAGS = -define:FIXED_PANELAPPLET
 else
 PANELAPPLET_CSFILES =			\
 	$(srcdir)/panelapplet/*.cs
 endif
+endif
+
+if FIXED_GTKSPELL
+FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
+endif
 
 CSFLAGS = 				\
 	-debug				\
@@ -31,6 +64,8 @@
 	-unsafe 			\
 	-target:exe 			\
 	$(DBUS_CSFLAGS) 		\
+	$(OSX_CSFLAGS) 		\
+	$(WIN_CSFLAGS) 		\
 	$(FIXED_PANELAPPLET_CSFLAGS)	\
 	$(FIXED_GTKSPELL_CSFLAGS) \
 	$(CSC_DEFINES)
@@ -42,12 +77,8 @@
 	$(srcdir)/ActionManager.cs		\
 	$(srcdir)/AddinManager.cs		\
 	$(srcdir)/AddinPreferenceFactory.cs	\
-	$(srcdir)/Applet.cs 			\
 	$(srcdir)/ApplicationAddin.cs		\
 	$(srcdir)/Contrast.cs		\
-	$(srcdir)/GConfPreferencesClient.cs	\
-	$(srcdir)/GnomeApplication.cs		\
-	$(srcdir)/GnomeFactory.cs		\
 	$(srcdir)/Keybinder.cs			\
 	$(srcdir)/Logger.cs			\
 	$(srcdir)/NativeApplication.cs		\
@@ -77,10 +108,13 @@
 	$(srcdir)/Utils.cs			\
 	$(srcdir)/Watchers.cs			\
 	$(srcdir)/WrapBox.cs			\
-	$(srcdir)/XKeybinder.cs			\
 	$(srcdir)/Notebooks/*.cs		\
 	$(srcdir)/Synchronization/*.cs		\
 	\
+	$(GNOME_CSFILES)			\
+	$(WIN_CSFILES)			\
+	$(OSX_CSFILES)			\
+	\
 	$(PANELAPPLET_CSFILES)			\
 	\
 	$(srcdir)/Gnome.Keyring/*.cs		\
@@ -89,10 +123,13 @@
 
 
 ASSEMBLIES = 		\
-	$(TOMBOY_LIBS) 	\
+	$(GTKSHARP_LIBS) 	\
+	$(GNOME_LIBS) 	\
 	-r:Mono.Posix	\
 	$(DBUS_LIBS)	\
-	$(LINK_MONO_ADDINS)
+	$(LINK_MONO_ADDINS)	\
+	$(WIN_LIBS)	\
+	$(OSX_LIBS)
 
 RESOURCES = 										\
 	-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml	\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Nov 15 15:07:12 2008
@@ -95,11 +95,41 @@
 AM_CONDITIONAL(FIXED_GTKSPELL, test "$FIXED_GTKSPELL" = "yes")
 
 #
+# Check for Mac/Windows/GNOME Support
+#
+AC_ARG_ENABLE(windows, 
+	      [  --enable-windows[[=no/yes]]    compile with Windows support [[default: no]]],
+	      ENABLE_WIN="$enableval", ENABLE_WIN="no")
+AM_CONDITIONAL(ENABLE_WIN, test "x$ENABLE_WIN" = "xyes")
+
+AC_ARG_ENABLE(osx, 
+	      [  --enable-osx[[=no/yes]]    compile with Mac OS X support [[default: no]]],
+	      ENABLE_OSX="$enableval", ENABLE_OSX="no")
+AM_CONDITIONAL(ENABLE_OSX, test "x$ENABLE_OSX" = "xyes")
+
+AC_ARG_ENABLE(gnome, 
+	      [  --enable-gnome[[=no/yes]]    compile with GNOME support [[default: yes]]],
+	      ENABLE_GNOME="$enableval")
+
+if ((test "x$ENABLE_GNOME" = "xyes") && (test "x$ENABLE_WIN" = "xyes")) || ((test "x$ENABLE_GNOME" = "xyes") && (test "x$ENABLE_OSX" = "xyes")) || ((test "x$ENABLE_OSX" = "xyes") && (test "x$ENABLE_WIN" = "xyes")) ; then
+	AC_MSG_ERROR([--enable-gnome, --enable-windows, and --enable-osx are mutually exclusive])
+fi
+
+if (test "x$ENABLE_WIN" = "xno") && (test "x$ENABLE_OSX" = "xno") ; then
+	ENABLE_GNOME="yes"
+else
+	ENABLE_GNOME="no"
+fi
+AM_CONDITIONAL(ENABLE_GNOME, test "x$ENABLE_GNOME" != "xno")
+	
+
+
+#
 # Use DBus to export our remote control if available.
 #
 AC_ARG_ENABLE(dbus, 
 	      [  --enable-dbus[[=no/yes]]    compile with dbus support [[default: yes]]],
-	      ENABLE_DBUS="$enableval")
+	      ENABLE_DBUS="$enableval", ENABLE_DBUS="yes")
 AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno")
 
 AC_ARG_WITH(dbus_service_dir, [  --with-dbus-service-dir=DIR            Where to install Tomboy's DBus service file.])
@@ -139,31 +169,34 @@
 #
 GTKSHARP2_MINIMUM_VERSION=$GTK20_MINIMUM_VERSION
 GNOMESHARP_MINIMUM_VERSION=2.15
-if pkg-config --atleast-version=2.23.90 gnome-sharp-2.0; then
-	PKG_CHECK_MODULES(TOMBOY,
-	                  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
-	                  gnome-sharp-2.0
-	                  gconf-sharp-2.0
-	                  gconf-sharp-peditors-2.0
-	                  gnome-panel-sharp-2.24)
-	has_fixed_panelapplet="yes"
-
-else
-	if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
-		PKG_CHECK_MODULES(TOMBOY,
-			          gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
-			          gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
+if test "x$ENABLE_GNOME" != "xno"; then
+	if pkg-config --atleast-version=2.23.90 gnome-sharp-2.0; then
+		PKG_CHECK_MODULES(GNOME,
+			          gnome-sharp-2.0
 			          gconf-sharp-2.0
-			          gconf-sharp-peditors-2.0)
+			          gconf-sharp-peditors-2.0
+			          gnome-panel-sharp-2.24)
+		has_fixed_panelapplet="yes"
+
 	else
-		PKG_CHECK_MODULES(TOMBOY,
-			          gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
-			          gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
-			          gconf-sharp-2.0)
+		if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
+			PKG_CHECK_MODULES(GNOME,
+					  gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
+					  gconf-sharp-2.0
+					  gconf-sharp-peditors-2.0)
+		else
+			PKG_CHECK_MODULES(GNOME,
+					  gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
+					  gconf-sharp-2.0)
+		fi
 	fi
 fi
 AM_CONDITIONAL(FIXED_PANELAPPLET, test "x$has_fixed_panelapplet" = "xyes")
-AC_SUBST(TOMBOY_LIBS)
+AC_SUBST(GNOME_LIBS)
+
+PKG_CHECK_MODULES(GTKSHARP,
+		  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
+AC_SUBST(GTKSHARP_LIBS)
 
 #
 # Printing at least needs Mono.Cairo
@@ -193,6 +226,9 @@
 # Evolution.dll needs Gmime#
 #
 PKG_CHECK_MODULES(EVOLUTION, gmime-sharp, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+if test "x$ENABLE_GNOME" = "xno" ; then
+	ENABLE_EVOLUTION=no
+fi
 AC_ARG_ENABLE(evolution, 
 	      [  --enable-evolution[[=no/yes]]  compile evolution addin [[default: yes]]],
 	      ENABLE_EVOLUTION="$enableval")
@@ -203,14 +239,17 @@
 # Sketching.dll is very sketchy; for now disable by default
 #
 AC_ARG_ENABLE(sketching,
-              [  --enable-sketching[[=no/yes]]  compile sketching addin [[default: disabled]]],
-              ENABLE_SKETCHING="$enableval")
+              [  --enable-sketching[[=no/yes]]  compile sketching addin [[default: no]]],
+              ENABLE_SKETCHING="$enableval", ENABLE_SKETCHING="no")
 AM_CONDITIONAL(ENABLE_SKETCHING, test "$ENABLE_SKETCHING" = "yes")
 
 #
 # GalagoPresence.dll needs Galago#
 #
 PKG_CHECK_MODULES(GALAGO, galago-sharp >= 0.5.0, ENABLE_GALAGO="yes", ENABLE_GALAGO="no")
+if test "x$ENABLE_GNOME" = "xno" ; then
+	ENABLE_GALAGO=no
+fi
 AC_ARG_ENABLE(galago, 
 	      [  --enable-galago[[=no/yes]]  compile galago addin [[default: yes]]],
 	      ENABLE_GALAGO="$enableval")
@@ -311,3 +350,20 @@
 po/Makefile.in
 ])
 
+echo "
+${PACKAGE}-${VERSION}
+
+    Install Prefix:    ${prefix}
+
+    GNOME Support:     ${ENABLE_GNOME}
+    Mac OS X Support:  ${ENABLE_OSX}
+    Windows Support:   ${ENABLE_WIN}
+
+    D-Bus Support:     ${ENABLE_DBUS}
+
+    Evolution Add-in:  ${ENABLE_EVOLUTION}
+    Galago Add-in:     ${ENABLE_GALAGO}
+    Sketching Add-in:  ${ENABLE_SKETCHING}
+"
+
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]