fi
+
+dnl -------
+dnl GtkHTML
+dnl -------
+
+AC_MSG_CHECKING(for installed version of libgtkhtml3)
+pkg-config --exists libgtkhtml-3.14
+retval=$?
+gtk_html_found=false
+if test $retval -eq 0 ; then
+ gtk_html_found=true
+ gtk_html_version=3.14
+else
+ pkg-config --exists libgtkhtml-3.8
+ retval=$?
+ if test $retval -eq 0 ; then
+ gtk_html_found=true
+ gtk_html_version=3.8
+ else
+ if [ $gui = "true" ]; then
+ AC_MSG_RESULT(libgtkhtml 3.4 or higher is not found!)
+ fi
+ fi
+fi
+
+if [ $gtk_html_found = "true" ]; then
+ version=`pkg-config --modversion libgtkhtml-${gtk_html_version}`
+ AC_MSG_RESULT(found version $version)
+else
+ AC_MSG_ERROR([install gtkhtml 3.8 or newer])
+fi
+
+
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-3.8 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0)
+
+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(MODEST_GSTUFF_CFLAGS)
AC_SUBST(MODEST_GSTUFF_LIBS)
__COPY_LIBS="$LIBS"
LIBS="$LIBS $MODEST_GSTUFF_LIBS"
AC_CHECK_FUNCS(gtk_html_get_selection_area)
-LIBS="$__COPY_LIBS"
AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
+AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
+AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
+LIBS="$__COPY_LIBS"
dnl dnl now, determine what to build
dnl AC_MSG_NOTICE([Determining what platform to build])
AC_SUBST(MODEST_ABOOK_CFLAGS)
AC_SUBST(MODEST_ABOOK_LIBS)
- if test "x$have_abook" == "xtrue"; then
- PKG_CHECK_MODULES(MODEST_ABOOK_OLD, osso-addressbook-1.0 < 2.0, have_old_abook=true,have_old_abook=false)
- if test "x$have_old_abook" == "xtrue"; then
- AC_DEFINE_UNQUOTED(MODEST_HAVE_OLD_ABOOK, 1, ["whether we have an old osso-addressbook"])
- fi
- AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK,1, ["whether we have osso-addressbook"])
+ if test "x$have_abook" == "xtrue"; then
+ abook_api=`$PKG_CONFIG --modversion osso-addressbook-1.0 | cut -d. -f1`
+ AC_DEFINE_UNQUOTED(OSSO_ABOOK_ENABLE_DEPRECATED, 1, ["use deprecated addressbook API"])
+ AC_DEFINE_UNQUOTED(MODEST_ABOOK_API, $abook_api, ["the API version of osso-addressbook"])
+ AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK, 1, ["whether we have osso-addressbook"])
addressbook="osso-addressbook"
fi
fi
echo "Build tests : $build_tests"
echo "Build docs : $build_docs"
echo "Gettext Package : $GETTEXT_PACKAGE"
-echo "libcurl : $have_libcurl"
if test "x$with_platform" == "xmaemo"; then
echo "Maemo Launcher : $maemo_launcher"