diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-10-22 20:59:17 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-22 20:59:17 +0800 |
| commit | 3b5d0b114c5c36753dc0497f8a027cf1b84a92af (patch) | |
| tree | bd5d5106d654246aada1f557f343f59fa1bc0f3a | |
| parent | e3230aaa65efb5c08c743eea2b12f759103b2559 (diff) | |
| download | gsoc2013-evolution-3b5d0b114c5c36753dc0497f8a027cf1b84a92af.tar.gz gsoc2013-evolution-3b5d0b114c5c36753dc0497f8a027cf1b84a92af.tar.zst gsoc2013-evolution-3b5d0b114c5c36753dc0497f8a027cf1b84a92af.zip | |
** Fixes bug #549025
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.
svn path=/trunk/; revision=36675
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | plugins/mono/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/mono/Makefile.am | 6 |
4 files changed, 30 insertions, 5 deletions
@@ -1,3 +1,13 @@ +2008-10-22 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of 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. + 2008-10-17 Matthew Barnes <mbarnes@redhat.com> ** Fix for bug #548469 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 " diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog index a78216273d..ff07e79a0b 100644 --- a/plugins/mono/ChangeLog +++ b/plugins/mono/ChangeLog @@ -1,3 +1,11 @@ +2008-10-22 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #549025 + + * Makefile.am: + Add $(MONO_CFLAGS) and $(MONO_LIBS) explicitly. The mono plugin + is the only module that should be linking against libmono. + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am index 680fd7a096..aa20b100e3 100644 --- a/plugins/mono/Makefile.am +++ b/plugins/mono/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) + $(E_UTIL_CFLAGS) \ + $(MONO_CFLAGS) @EVO_PLUGIN_RULE@ @@ -10,7 +11,8 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la 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 |