From 3b5d0b114c5c36753dc0497f8a027cf1b84a92af Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 22 Oct 2008 12:59:17 +0000 Subject: ** Fixes bug #549025 2008-10-22 Matthew Barnes ** 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. svn path=/trunk/; revision=36675 --- configure.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 8a5794a0df..1c5f0d1f07 100644 --- a/configure.in +++ b/configure.in @@ -891,16 +891,19 @@ dnl Mono hooks 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 @@ else 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 @@ echo "\ Plugins: $msg_plugins DBus API version: $FOUND_DBUS_VERSION User documentation: $with_help + Mono bindings: $enable_mono + Python bindings: $enable_python " -- cgit v1.2.3