* Fixes NB#70692 with tinymail commit 2956. The device won't try to connect if it...

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index 754b578..be98d12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ if test "x$with_platform" == "xgnome"; then
     AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
 else
     have_easysetup=true
-    PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 libebook-1.2  microb-engine-nss)
+    PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 libebook-1.2 microb-engine-nss)
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the MAEMO platform."])
     AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether we have the easysetup feature"])
 fi                 
@@ -143,30 +143,6 @@ fi
 
 
 #
-# check the providers-data (on maemo)
-#
-if test "x$with_platform" == "xmaemo"; then  
-PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,modest-providers-data,have_modest_providers_data=true,have_modest_providers_data=false)
-if test "x$have_modest_providers_data" == "xfalse"; then
-   PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,maemo-providers-data,have_maemo_providers_data=true,have_maemo_providers_data=false)
-   if test "x$have_maemo_providers_data" == "xfalse"; then
-       echo "x$have_maemo_providers_data"   
-               AC_MSG_ERROR([you need to have either modest-providers-data or maemo-providers-data installed])
-   else
-       AC_DEFINE_UNQUOTED(MODEST_HAVE_MAEMO_PROVIDERS_DATA, 1, ["Whether maemo-providers-data is used."])
-       AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path maemo-providers-data`"],[maemo-providers-data file path])
-       providers_data="maemo-providers-data"           
-   fi
-else
-  AC_DEFINE_UNQUOTED(MODEST_HAVE_MODEST_PROVIDERS_DATA, 1, ["Whether modest-providers-data is used."])
-  AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path modest-providers-data`"],[modest-providers-data file path])
-  providers_data="modest-providers-data"                                                               
-fi
-fi      
-   
-
-
-#
 # check hildon-help (only for maemo)
 #
 if test "x$with_platform" == "xmaemo"; then  
@@ -306,17 +282,11 @@ fi
 #
 # if we don't have an addressbook, use the dummy one
 #
-AM_CONDITIONAL(MODEST_USE_DUMMY_ADDRESS_BOOK,test "x$have_abook"="xtrue")
-
+AM_CONDITIONAL(MODEST_USE_DUMMY_ADDRESS_BOOK,test "x$have_abook" != "xtrue")
 
 
-#FIXME: hack to set the right gettext package..
-if test "x$have_hildon1" == "xtrue"; then
-     GETTEXT_PACKAGE=osso-email
-else
-     GETTEXT_PACKAGE=modest    
-fi
-# Check for gettext support
+# gettext support
+GETTEXT_PACKAGE=modest 
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["gettext package"])
 
@@ -442,7 +412,6 @@ echo "Prefix           : ${prefix}"
 echo "Build tests      : $build_tests"
 echo "Build docs       : $build_docs"
 echo "Gettext Packages : $GETTEXT_PACKAGE"
-echo "Easysetup data   : $providers_data"
 echo "Editor lib       : $wpeditor"
 echo "Addressbook      : $addressbook"
 echo "Help lib         : $helplib"
@@ -451,7 +420,6 @@ echo "Hildon-Notify    : $have_hildon_notify"
 echo "LibOGS support   : $have_ogs_support"
 echo "MozEmbed support : $use_mozembed"
 echo "CFLAGS           : $CFLAGS"
-echo "Gettext Packages : $GETTEXT_PACKAGE"
 echo "Debug version    : $with_debug"
 echo ""
 echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)"