evolution r36675 - in trunk: . plugins/mono

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Oct 22 12:59:17 2008
New Revision: 36675
URL: http://svn.gnome.org/viewvc/evolution?rev=36675&view=rev

Log:
2008-10-22  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #549025

	* configure.in:
	Restrict libmono linkage to the mono plugin, so that downstream
	packagers can isolate the mono dependency to a subpackage.
	Add configuration summary lines indicating whether the Mono and
	Python bindings are enabled.

	* plugins/mono/Makefile.am:
	Add $(MONO_CFLAGS) and $(MONO_LIBS) explicitly.  The mono plugin
	is the only module that should be linking against libmono.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/mono/ChangeLog
   trunk/plugins/mono/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Oct 22 12:59:17 2008
@@ -891,16 +891,19 @@
 dnl This should just define mono CFLAGS etc here, it is used later to
 dnl turn on the mono plugin or not.
 
+MONO_CFLAGS=
+MONO_LIBS=
 AC_ARG_ENABLE([mono],
 	      AC_HELP_STRING([--enable-mono],
 			     [Add Mono embedded hooks.]),
 	      [enable_mono=$enableval],[enable_mono=no])
-
 if test "x${enable_mono}" = "xyes"; then
+	PKG_CHECK_MODULES(MONO, "mono")
 	AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
-	mono_package="mono"
 	MONO_PLUGIN="mono"
 fi
+AC_SUBST(MONO_CFLAGS)
+AC_SUBST(MONO_LIBS)
 
 dnl Python hooks
 dnl This should just define python CFLAGS etc here, it is used later to
@@ -1493,7 +1496,7 @@
 	E_UTIL_X11_CFLAGS=""
 	E_UTIL_X11_LIBS=""
 fi
-EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS)
+EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS)
 AC_SUBST(E_UTIL_CFLAGS)
 AC_SUBST(E_UTIL_LIBS)
 
@@ -2083,4 +2086,6 @@
 	Plugins:	     $msg_plugins
 	DBus API version:    $FOUND_DBUS_VERSION
 	User documentation:  $with_help
+	Mono bindings:       $enable_mono
+	Python bindings:     $enable_python
 "

Modified: trunk/plugins/mono/Makefile.am
==============================================================================
--- trunk/plugins/mono/Makefile.am	(original)
+++ trunk/plugins/mono/Makefile.am	Wed Oct 22 12:59:17 2008
@@ -1,6 +1,7 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
-	$(E_UTIL_CFLAGS)
+	$(E_UTIL_CFLAGS)				\
+	$(MONO_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 
@@ -10,7 +11,8 @@
 liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h
 liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version
 liborg_gnome_evolution_mono_la_LIBADD =	\
-	$(E_UTIL_LIBS)
+	$(E_UTIL_LIBS)			\
+	$(MONO_LIBS)
 
 EXTRA_DIST = org-gnome-evolution-mono.eplug.xml