X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=013331104f108b3ae96c24faf030be0a5f273199;hp=49662235d897d683bccb2ef509f713e8f71e558c;hb=fbe3368c6b62a1f5582f69576b77807d504e9612;hpb=ec86c81f4440ef1ccfe473cd9465f569e7271e15

diff --git a/configure.ac b/configure.ac
index 4966223..0133311 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,10 @@ 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"
@@ -180,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
@@ -274,7 +278,11 @@ 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
@@ -503,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
@@ -651,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"