* small cleanups for debian build

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index cf87c59..6bc0e60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ GETTEXT_PACKAGE=modest
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
 
-ALL_LINGUAS="en_GB gl nl"
+ALL_LINGUAS="en_GB"
 
 MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale'
 AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR])
@@ -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 libedataserver-1.2 wpeditor hildon-help libebook-1.2 osso-addressbook-1.0)             
    
     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 libosso-abook)            
         AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
     fi         
    
@@ -141,10 +141,18 @@ else
 fi
 
 dnl do we have the easy setup stuff?
+have_easysetup=false
 if test -d src/${with_platform}/easysetup; then        
-      AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether the easysetup feature is available."])
+       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 -d src/${with_platform}/easysetup) 
+AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test x$have_easysetup = xtrue) 
 
 
 dnl ## setup the testing framework (ie., make check)
@@ -187,11 +195,13 @@ dnl Intltool utility programs
 #AC_PROG_INTLTOOL([0.33.0],[no-xml])
 
 
+
 AC_OUTPUT([
 po/Makefile.in
 Makefile
 man/Makefile
 src/Makefile
+src/dbus_api/Makefile
 src/gnome/Makefile
 src/maemo/Makefile
 src/maemo/easysetup/Makefile
@@ -199,18 +209,22 @@ src/widgets/Makefile
 docs/Makefile
 docs/reference/Makefile
 tests/Makefile
+tests/dbus_api/Makefile
 src/maemo/modest.desktop
 src/maemo/modest.service
+libmodest-dbus-client/Makefile
+libmodest-dbus-client/libmodest-dbus-client-1.0.pc
 ])
 
 
 echo
 echo "modest configure results"
 echo "-----------------------------------"
-echo "Platform       : $with_platform"
-echo "Build tests    : $build_tests"
-echo "Build docs     : $build_docs"
-echo "Debug version  : $with_debug"
+echo "Platform         : $with_platform"
+echo "Build easy setup : $have_easysetup"
+echo "Build tests      : $build_tests"
+echo "Build docs       : $build_docs"
+echo "Debug version    : $with_debug"
 echo ""
 echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)"
 echo ""