modest_save_cflags="$CFLAGS"
modest_save_libs="$LIBS"
-CFLAGS="$MODEST_GSTUFF_CFLAGS"
-LIBS="$MODEST_GSTUFF_LIBS"
+PKG_CHECK_MODULES(MODEST_GTKHTML,libgtkhtml-${gtk_html_version})
+AC_SUBST(MODEST_GTKHTML_CFLAGS)
+AC_SUBST(MODEST_GTKHTML_LIBS)
+CFLAGS="$MODEST_GTKHTML_CFLAGS"
+LIBS="$MODEST_GTKHTML_LIBS"
AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[], [#include <gtk/gtk.h>])
-CFLAGS="$modest_save_cflags"
-LIBS="$modest_save_libs"
-
-__COPY_LIBS="$LIBS"
-LIBS="$LIBS $MODEST_GSTUFF_LIBS"
AC_CHECK_FUNCS(gtk_html_get_selection_area)
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"
+CFLAGS="$modest_save_cflags"
+LIBS="$modest_save_libs"
+
dnl dnl now, determine what to build
dnl AC_MSG_NOTICE([Determining what platform to build])
AC_SUBST(MODEST_TOOLKIT_DIR)
if test "x$with_platform" == "xgnome"; then
- PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 libnotify)
+ PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 glib-2.0 >= 2.8 libnotify)
AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
dnl AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
else
fi
#
-# check hildon-help (only for maemo)
+# check hildon-help (only for maemo AND NOT fremantle)
#
-if test "x$with_toolkit" != "xgtk"; then
+if test "x$with_toolkit" == "xhildon1"; then
PKG_CHECK_MODULES(MODEST_HILDON_HELP,hildon-help,have_hildon_help=true,have_hildon_help=false)
if test "x$have_hildon_help" == "xfalse"; then
PKG_CHECK_MODULES(MODEST_HILDON_HELP,libossohelp,have_osso_help=true,have_osso_help=false)
AC_MSG_ERROR([you need to have either osso-help or hildon-help installed])
fi
else
- helplib="hildon-help"
+ helplib="hildon-help"
AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_HELP, 1, ["Whether hildon-help is used."])
fi
fi
echo "Maemo Launcher : $maemo_launcher"
echo "Editor lib : $wpeditor"
echo "Addressbook : $have_abook"
- echo "Help lib : $helplib"
+ if test "x$with_toolkit" == "xhildon1"; then
+ echo "Help lib : $helplib"
+ fi
echo "libconic support : $have_libconic"
echo "Alarm : $have_libalarm"
echo "MCE : $have_mce"
- echo "Hildon-Notify : $have_hildon_notify"
+ echo "Hildon-Notify : $have_hildon_notify"
echo "LibOGS support : $have_ogs_support"
- echo "MozEmbed support : $use_mozembed"
-fi
+fi
+
+echo "MozEmbed support : $use_mozembed"
+if [ $gtk_html_found = "true" ]; then
+ echo "GtkHTML version : $gtk_html_version"
+fi
echo "CFLAGS : $CFLAGS"
echo "Debug version : $with_debug"