tomboy r2001 - in trunk: . Tomboy

[sharm svn gnome org]

Author: sharm
Date: Mon May 12 14:12:29 2008
New Revision: 2001
URL: http://svn.gnome.org/viewvc/tomboy?rev=2001&view=rev

Log:
* configure.in: Hard requirement for Mono.Cairo.  Copied some Banshee
  build macro code to check because pkg-config was only bringing up
  the 1.0 assemblies.  Stop defining GTK_2_10.
* Tomboy/PreferencesDialog.cs: No longer supporting gtk-sharp < 2.10.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/PreferencesDialog.cs
   trunk/configure.in

Modified: trunk/Tomboy/PreferencesDialog.cs
==============================================================================
--- trunk/Tomboy/PreferencesDialog.cs	(original)
+++ trunk/Tomboy/PreferencesDialog.cs	Mon May 12 14:12:29 2008
@@ -219,14 +219,9 @@
 			align.Show ();
 			options_list.PackStart (align, false, false, 0);
 			
-			#if GTK_2_10
 			Gtk.LinkButton open_template_button = new Gtk.LinkButton (
 				String.Empty,
 				Catalog.GetString ("Open New Note Template"));
-			#else
-			Gtk.Button open_template_button = new Gtk.Button (
-				Catalog.GetString ("_Open New Note Template..."));
-			#endif
 
 			open_template_button.Clicked += OpenTemplateButtonClicked;
 			open_template_button.Show ();

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon May 12 14:12:29 2008
@@ -137,13 +137,44 @@
 #
 GTKSHARP2_MINIMUM_VERSION=$GTK20_MINIMUM_VERSION
 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 gconf-sharp-2.0 gconf-sharp-peditors-2.0)
+	PKG_CHECK_MODULES(TOMBOY,
+	                  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
+	                  gnome-sharp-2.0
+	                  gconf-sharp-2.0
+	                  gconf-sharp-peditors-2.0)
 else
-	PKG_CHECK_MODULES(TOMBOY, gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION gnome-sharp-2.0 gconf-sharp-2.0)
+	PKG_CHECK_MODULES(TOMBOY,
+	                  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
+	                  gnome-sharp-2.0
+	                  gconf-sharp-2.0)
 fi
 AC_SUBST(TOMBOY_LIBS)
 
 #
+# Printing at least needs Mono.Cairo
+#
+required_assemblies="Mono.Cairo"
+
+#
+# This check stolen from banshee/build/m4/shamrock/mono.m4, because pkg-config
+# seems to find the wrong Mono.Cairo (1.0).
+#
+for asm in $required_assemblies
+do
+	AC_MSG_CHECKING([for Mono 2.0 GAC for $asm.dll])
+	if test \
+		-e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/$asm.dll" -o \
+		-e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/$asm.dll"; \
+		then \
+		AC_MSG_RESULT([found])
+	else
+		AC_MSG_RESULT([not found])
+		AC_MSG_ERROR([missing reqired Mono 2.0 assembly: $asm.dll])
+	fi
+done
+
+
+#
 # Evolution.dll needs Gmime#
 #
 PKG_CHECK_MODULES(EVOLUTION, gmime-sharp, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
@@ -156,13 +187,10 @@
 #
 # Sketching.dll is very sketchy; for now disable by default
 #
-PKG_CHECK_MODULES(CAIRO, mono-cairo, [
-          AC_ARG_ENABLE(sketching,
+AC_ARG_ENABLE(sketching,
               [  --enable-sketching[[=no/yes]]  compile sketching addin [[default: disabled]]],
-              ENABLE_SKETCHING="$enableval") ],
-          ENABLE_SKETCHING="no")
+              ENABLE_SKETCHING="$enableval")
 AM_CONDITIONAL(ENABLE_SKETCHING, test "$ENABLE_SKETCHING" = "yes")
-AC_SUBST(SKETCHING_LIBS)
 
 #
 # GalagoPresence.dll needs Galago#
@@ -183,15 +211,6 @@
 AC_PATH_PROG(NUNIT, nunit-console)
 
 #
-# DEFINES uses for #if statements
-#
-CSC_DEFINES=""
-if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
-	CSC_DEFINES="-d:GTK_2_10"
-fi
-AC_SUBST(CSC_DEFINES)
-
-#
 # Check for X11 libraries
 #