2007-04-16 Murray Cumming <murrayc@murrayc.com>

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index dc335c4..e237648 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,6 @@ if test "x$with_platform" = "xmaemo"; then
   AC_SUBST(pluginlibdir)
   AC_SUBST(plugindesktopentrydir)
 
-  MODEST_PLATFORM_ID=2
   # warnings are errors, but don't check format errors, because
   # it breaks with logical id's
   CFLAGS="$CFLAGS -Wno-format-extra-args -Werror"
@@ -137,16 +136,23 @@ else
    # gnome frontend 
    PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10)
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
-   AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
-   MODEST_PLATFORM_ID=1
-   
+   AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)  
    AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
 fi
 
-dnl 1==>gnome, 2==>maemo
-AC_SUBST(MODEST_PLATFORM_ID)
-
-
+dnl do we have the easy setup stuff?
+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) 
 
 
 dnl ## setup the testing framework (ie., make check)
@@ -186,7 +192,7 @@ dnl ## gtk-doc
 GTK_DOC_CHECK([1.0])
 
 dnl Intltool utility programs
-#AC_PROG_INTLTOOL([0.33.0],[no-xml])
+AC_PROG_INTLTOOL([0.33.0],[no-xml])
 
 
 AC_OUTPUT([
@@ -209,10 +215,11 @@ src/maemo/modest.service
 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 ""