* Fixes NB#85060, show the password dialog whenever the password is not defined...

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index f7474d1..6083367 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,8 +80,10 @@ LIBS="$modest_save_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])
@@ -139,7 +141,6 @@ AC_SUBST(MODEST_PLATFORM)
 
 
 
-
 #
 # check for wpeditor or libwpeditor-plus (on maemo)
 #
@@ -175,7 +176,20 @@ else
 fi
 fi
 
-
+#
+# check for MCE
+#
+if test "x$with_platform" == "xmaemo"; then  
+PKG_CHECK_MODULES(MODEST_MCE,mce,have_mce=true,have_mce=false)
+if test "x$have_mce" == "xtrue"; then
+   mce="mce"   
+   AC_DEFINE_UNQUOTED(MODEST_HAVE_MCE, 1, ["Whether mce is used."])
+   AC_SUBST(MODEST_MCE_CFLAGS)
+   AC_SUBST(MODEST_MCE_LIBS)
+else
+   mce=""
+fi
+fi
 
 #
 # check for libconic; this is a trick to check whether we run
@@ -473,6 +487,7 @@ if test "x$with_platform" == "xmaemo"; then
    echo "Help lib         : $helplib"
    echo "libconic support : $have_libconic"
    echo "Alarm            : $have_libalarm"
+   echo "MCE              : $have_mce"
    echo "Hildon-Notify    : $have_hildon_notify"    
    echo "LibOGS support   : $have_ogs_support"
    echo "MozEmbed support : $use_mozembed"