tomboy r1923 - trunk

[sharm svn gnome org]

Author: sharm
Date: Mon Mar  3 04:55:42 2008
New Revision: 1923
URL: http://svn.gnome.org/viewvc/tomboy?rev=1923&view=rev

Log:
* configure.in: Bump Mono.Addins requirement to 0.3.  Only use bundled
  version of Mono.Addins if the requirement is not already met in the
  system.  Patch courtesy of Sebastian DrÃge.  Last fix for bug
  #519170.

Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar  3 04:55:42 2008
@@ -126,18 +126,16 @@
 #
 # Check for external Mono.Addins
 #
-AC_ARG_WITH(mono-addins, [  --with-mono-addins[[=internal/system]]],[mono_addins_v="$withval"],[mono_addins_v=internal])
-if test "x$mono_addins_v" = "xsystem"; then
-	PKG_CHECK_MODULES(MONO_ADDINS, mono-addins > 0.2 \
-		mono-addins-gui > 0.2 \
-		mono-addins-setup > 0.2)
-	AM_CONDITIONAL(EXTERNAL_MONO_ADDINS, true)
-	AC_SUBST(MONO_ADDINS_LIBS)
-else
-	MONO_ADDINS_LIBS=
-	AM_CONDITIONAL(EXTERNAL_MONO_ADDINS, false)
-	AC_SUBST(MONO_ADDINS_LIBS)
+PKG_CHECK_MODULES(MONO_ADDINS, mono-addins > 0.3 \
+	mono-addins-gui > 0.3 \
+	mono-addins-setup > 0.3,
+	have_external_mono_addins="yes", have_external_mono_addins="no")
+
+if test "x$have_external_mono_addins" != "xyes"; then
+	AC_MSG_RESULT([using internal copy])
 fi
+AM_CONDITIONAL(EXTERNAL_MONO_ADDINS, test "x$have_external_mono_addins" = "xyes")
+AC_SUBST(MONO_ADDINS_LIBS)
 
 #
 # Tomboy.exe needs Gtk# Gnome# GConf#