Fixes some dependency problems with modest-plugin-dev. It does not need libcamberra...

pmo-trunk-r7134

diff --git a/configure.ac b/configure.ac
index 933fdf6..335b527 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,7 @@ if test "$with_platform" = "maemo"; then
 elif test "$with_platform" = "gnome"; then
        MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME"
 fi
+AC_SUBST(MODEST_PLUGIN_DEFINES)
 
 #
 # check the widgets library
@@ -159,12 +160,6 @@ if test "$have_hildon1" = "true"; then
    hildonpkgs="hildon-1 hildon-fm-2"
    detected_toolkit=hildon1
    echo "DETECTED HILDON 1 $have_hildon2."
-   if test "$have_hildon2" = "true"; then
-      echo "DETECTED HILDON 2 $have_hildon2."
-      detected_toolkit=hildon2
-      hildonpkgs="$hildonpkgs libcanberra profile"
-      echo "HILDON 2 PACKAGES $hildonpkgs"
-   fi
 else
    hildonpkgs="hildon-libs hildon-fm"
    detected_toolkit=hildon1
@@ -182,6 +177,21 @@ else
    fi
 fi
 
+dnl --------------- HILDON & PLUGIN PKGS -----------
+pluginpkgs=$hildonpkgs
+echo "Plugin Packages $pluginpkgs"
+AC_SUBST(pluginpkgs)
+
+# Plugin packages must not include libcanberra and libprofile
+if test "$have_hildon2" = "true"; then
+   echo "DETECTED HILDON 2 $have_hildon2."
+   detected_toolkit=hildon2
+   hildonpkgs="$hildonpkgs libcanberra profile"
+   echo "HILDON 2 PACKAGES $hildonpkgs"
+fi
+AC_SUBST(hildonpkgs)
+
+dnl --------------- HILDON API ------------
 hildon_api=
 if test "$have_hildon0" = "true"; then
    hildon_api=0
@@ -219,10 +229,6 @@ elif test "$with_toolkit" = "gtk"; then
        MODEST_PLUGIN_DEFINES="$MODEST_PLUGIN_DEFINES -DMODEST_TOOLKIT_GNOME"
 fi
 
-AC_SUBST(hildonpkgs)
-AC_SUBST(MODEST_PLUGIN_DEFINES)
-
-
 dnl Whether to use maemo-launcher or not
 AC_ARG_ENABLE([maemo-launcher],
              [AS_HELP_STRING([--enable-maemo-launcher],

diff --git a/src/modest-plugin-1.0.pc.in b/src/modest-plugin-1.0.pc.in
index ca07b08..160e16f 100644 (file)
--- a/src/modest-plugin-1.0.pc.in
+++ b/src/modest-plugin-1.0.pc.in
@@ -6,7 +6,7 @@ plugindir=@libdir@/modest/mail-plugins
 
 Name: modest-plugin-1.0
 Description: Library for developing plugins for modest.
-Requires: glib-2.0 gobject-2.0 gtk+-2.0 gconf-2.0 gnome-vfs-2.0 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0 libosso dbus-1 libtinymail-maemo-1.0 libebook-1.2 hildon-1 hildon-fm-2 hildon-help hildon-notify libnotify @hildonpkgs@
+Requires: glib-2.0 gobject-2.0 gtk+-2.0 gconf-2.0 gnome-vfs-2.0 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0 libosso dbus-1 libtinymail-maemo-1.0 libebook-1.2 hildon-1 hildon-fm-2 hildon-help hildon-notify libnotify @pluginpkgs@
 Version: @VERSION@
 Cflags: -I${includedir}/modest-plugin-1.0 @MODEST_PLUGIN_DEFINES@