X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=58f519a8655a7419c18a2ee42bd8801ecbcfd37f;hp=a0662b0be91c8f73c8838015fec2b4f277225405;hb=4a8de13d63fefd3935633c4b46bc07caf46d7ca5;hpb=f64c740f4ee8ab71d5842f369beaced86ab521d5;ds=sidebyside

diff --git a/configure.ac b/configure.ac
index a0662b0..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
@@ -549,6 +561,8 @@ if test "x$with_platform" == "xmaemo"; then
    serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services
    localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
    backupsettingsdir=/etc/osso-backup/applications
+   prebackupdir=/etc/osso-backup/pre-backup.d/
+   restoredir=/etc/osso-backup/restore.d/always/
    ossocudscriptsdir=/etc/osso-cud-scripts
    pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir`
    icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
@@ -566,6 +580,8 @@ if test "x$with_platform" == "xmaemo"; then
    AC_SUBST(desktopentrydir)
    AC_SUBST(serviceentrydir)
    AC_SUBST(backupsettingsdir)
+   AC_SUBST(prebackupdir)
+   AC_SUBST(restoredir)
    AC_SUBST(ossocudscriptsdir)
    AC_SUBST(localedir)
    AC_SUBST(pixmapdir)
@@ -635,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
 ])