X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=df900fee02cc24e7e1a285c5595b2d6de8d20b5d;hb=74cdbcf6294dbbd595f50a3d480defe720ee9591;hp=76b1980b991399d2f6f8277b7a9524b58460351a;hpb=248801f28f79742b6b9600dbb58644b9005ed208;p=modest

diff --git a/configure.ac b/configure.ac
index 76b1980..df900fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,10 +92,10 @@ if test "x$with_platform" = "xmaemo"; then
    
    PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, hildon1=yes, hildon1=no)	
    if test "$hildon1" == "yes"; then   # the 'new' hildon      			
-      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, libtinymail-maemo-1.0 hildon-libs libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2)     	
+      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2)     	
    
     else     # the old hildon
-     PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2)     	 
+     PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2)     	 
         AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
     fi 	
    
@@ -145,6 +145,12 @@ have_easysetup=false
 if test -d src/${with_platform}/easysetup; then	
       	have_easysetup=true
 	AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether the easysetup feature is available."])
+
+	# Just check that the dependency exists:
+    PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA, modest-providers-data)	
+    
+	# Get the location of the ISO-Codes (currencies, languages) files:
+	AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path modest-providers-data`"],[modest-providers-data file path])
 fi
 AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test x$have_easysetup = xtrue) 
 
@@ -189,6 +195,7 @@ dnl Intltool utility programs
 AC_PROG_INTLTOOL([0.33.0],[no-xml])
 
 
+
 AC_OUTPUT([
 po/Makefile.in
 Makefile