Again, we forward message as attachment if it's an html message (fixes NB#110254)

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index c8a0e12..a0662b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_INIT([modest],[3.0],[http://maemo.org])
 AC_CONFIG_HEADERS([config.h])
 
 m4_define([modest_api_major_version], [1])
-m4_define([modest_api_minor_version], [0])
+m4_define([modest_api_minor_version], [99])
 m4_define([modest_api_micro_version], [0])
 m4_define([modest_api_version], [modest_api_major_version.modest_api_minor_version.modest_api_micro_version])
 
@@ -134,8 +134,14 @@ 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>])
+AC_CHECK_FUNCS(gtk_html_set_max_image_size)
+AC_SUBST(HAVE_GTK_HTML_SET_MAX_IMAGE_SIZE)
 AC_CHECK_FUNCS(gtk_html_get_selection_area)
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
+AC_CHECK_FUNCS(gtk_html_set_allow_dnd)
+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_tree_view_column_get_cell_data_hint)
 AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
 CFLAGS="$modest_save_cflags"
@@ -178,7 +184,7 @@ have_hildon0=false
 have_gtk=false
 PKG_CHECK_EXISTS(hildon-1, have_hildon1=true,have_hildon1=false)
 if test "$have_hildon1" = "true"; then
-   PKG_CHECK_EXISTS(hildon-1 >= 2.1.0, have_hildon2=true, have_hildon2=false)
+   PKG_CHECK_EXISTS(hildon-1 >= 2.1.0 hildon-fm-2, have_hildon2=true, have_hildon2=false)
    PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS,hildon-1 hildon-fm-2)
    hildonpkgs="hildon-1 hildon-fm-2"
    detected_toolkit=hildon1
@@ -272,11 +278,15 @@ then
        PKG_CHECK_MODULES(MAEMO_LAUNCHER, [maemo-launcher-app])
        AC_SUBST(MAEMO_LAUNCHER_CFLAGS)
        AC_SUBST(MAEMO_LAUNCHER_LIBS)
+       MAEMO_LAUNCHER_MODEST_LDFLAGS="-shared "
+else
+       MAEMO_LAUNCHER_MODEST_LDFLAGS="-export-dynamic "
 fi
+AC_SUBST(MAEMO_LAUNCHER_MODEST_LDFLAGS)
 
 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
@@ -501,6 +511,15 @@ if test "x$with_platform" == "xmaemo"; then
    fi
 fi
 
+AC_CHECK_HEADERS([clockd/libtime.h], have_libtime=true, have_libtime=false)
+
+if test "x$have_libtime" == "xtrue"; then
+   AC_DEFINE_UNQUOTED(MODEST_USE_LIBTIME, 1, ["use libtime API"])
+   MODEST_LIBTIME_LIBS=-ltime
+else
+   MODEST_LIBTIME_LIBS=
+fi
+AC_SUBST(MODEST_LIBTIME_LIBS)
 
 #
 # if we don't have an addressbook, use the dummy one
@@ -649,6 +668,7 @@ echo "MozEmbed support : $use_mozembed"
 if [ $gtk_html_found = "true" ]; then
    echo "GtkHTML version  : $gtk_html_version"
 fi
+echo "Libtime          : $have_libtime"
 
 echo "CFLAGS           : $CFLAGS"
 echo "Debug version    : $with_debug"