* restore gnome building (check for easysetup)

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4327723..cf87c59 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -87,10 +87,22 @@ esac], [MODEST_PLATFORM=gnome
                with_platform=gnome])
 AC_SUBST(MODEST_PLATFORM)
 
+
 if test "x$with_platform" = "xmaemo"; then
-   PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs libosso libossomime osso-addressbook-1.0 wpeditor)
+   
+   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)      
+   
+    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)         
+        AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
+    fi         
+   
    AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
    AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS) 
+   
+   AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the Maemo platform."])
  
   desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir`
   serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services
@@ -117,21 +129,22 @@ 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"
 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?
+if test -d src/${with_platform}/easysetup; then        
+      AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether the easysetup feature is available."])
+fi
+AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test -d src/${with_platform}/easysetup) 
 
 
 dnl ## setup the testing framework (ie., make check)
@@ -146,6 +159,8 @@ AC_HELP_STRING([--enable-tests],
 esac],[build_tests=false])
 AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xtrue)
 
+
+
 dnl ## is the check package installed?
 if test x$build_tests = xtrue; then
    PKG_CHECK_MODULES(CHECK, check >= 0.9.4 glib-2.0)
@@ -189,7 +204,6 @@ src/maemo/modest.service
 ])
 
 
-
 echo
 echo "modest configure results"
 echo "-----------------------------------"