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_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)
-
dnl ## setup the testing framework (ie., make check)
build_tests=false
AC_ARG_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)
])
-
echo
echo "modest configure results"
echo "-----------------------------------"