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)
AC_SUBST(HAVE_GTK_HTML_SET_ALLOW_DND)
AC_CHECK_FUNCS(gtk_html_set_default_engine)
AC_SUBST(HAVE_GTK_HTML_SET_DEFAULT_ENGINE)
+AC_CHECK_FUNCS(gtk_html_set_word_char_wrapping)
+AC_SUBST(HAVE_GTK_HTML_SET_WORD_CHAR_WRAPPING)
AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
CFLAGS="$modest_save_cflags"
have_easysetup=false
if test "x$with_toolkit" == "xgtk"; then
- PKG_CHECK_MODULES(MODEST_TOOLKIT,glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify)
+ PKG_CHECK_MODULES(MODEST_TOOLKIT,glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify gtksourceview-2.0)
AC_DEFINE_UNQUOTED(MODEST_TOOLKIT_GTK, 1, ["Whether modest is being build for the gtk toolkit."])
MODEST_TOOLKIT_DIR=gnome
else
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
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
AC_SUBST(desktopentrydir)
AC_SUBST(serviceentrydir)
AC_SUBST(backupsettingsdir)
+ AC_SUBST(prebackupdir)
+ AC_SUBST(restoredir)
AC_SUBST(ossocudscriptsdir)
AC_SUBST(localedir)
AC_SUBST(pixmapdir)
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
])