X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=58f519a8655a7419c18a2ee42bd8801ecbcfd37f;hp=8ee55e2e5ff0024034059fa87c63a3d04dfe16ff;hb=6f6a7cd16826aad6e109c2a3455699cf3a25e5e6;hpb=6eb8b51e9fcd8b79eb0af5f0e673c945731e15b5 diff --git a/configure.ac b/configure.ac index 8ee55e2..58f519a 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,9 @@ else fi +PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0) + + dnl # GLib/Gobject/Gtk/Gconf => mandatory PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-${gtk_html_version} libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) @@ -501,6 +504,15 @@ if test "x$with_platform" == "xmaemo"; then abook_api=`$PKG_CONFIG --modversion libosso-abook-1.0 | cut -d. -f1` AC_SUBST(MODEST_ABOOK_CFLAGS) AC_SUBST(MODEST_ABOOK_LIBE) + + modest_save_cflags="$CFLAGS" + modest_save_libs="$LIBS" + CFLAGS="$MODEST_ABOOK_CFLAGS" + LIBS="$MODEST_ABOOK_LIBS" + AC_CHECK_FUNCS(osso_abook_contact_chooser_set_visible_func) + AC_SUBST(HAVE_OSSO_ABOOK_CONTACT_CHOOSER_SET_VISIBLE_FUNC) + CFLAGS="$modest_save_cflags" + LIBS="$modest_save_libs" fi if test "x$have_abook" == "xtrue"; then @@ -639,8 +651,6 @@ src/maemo/modest.desktop src/maemo/com.nokia.modest.service src/hildon2/modest.desktop src/hildon2/com.nokia.modest.service -libmodest-dbus-client/Makefile -libmodest-dbus-client/libmodest-dbus-client-1.0.pc ])