-dnl # tinymail => mandatory
-PKG_CHECK_MODULES(MODEST_TINYMAIL, libtinymail-1.0 libtinymail-camel-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0)
-AC_SUBST(MODEST_TINYMAIL_CFLAGS)
-AC_SUBST(MODEST_TINYMAIL_LIBS)
-
-dnl # firefox-gtkmozembed => dependency from tinymail
-PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP, firefox-nss firefox-xpcom firefox-gtkmozembed libnm_glib glib-2.0 >= 2.8 gobject-2.0 libgnomeui-2.0 gtk+-2.0)
-AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
-AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
-
-dnl # GConf => mandatory
-PKG_CHECK_MODULES(MODEST_GCONF,gconf-2.0)
-AC_SUBST(MODEST_GCONF_CFLAGS)
-AC_SUBST(MODEST_GCONF_LIBS)
-
-dnl # Gtk+ => mandatory
-PKG_CHECK_MODULES(MODEST_GTK,gtk+-2.0 >= 2.6)
-AC_SUBST(MODEST_GTK_CFLAGS)
-AC_SUBST(MODEST_GTK_LIBS)
-
-dnl # Glade
-PKG_CHECK_MODULES(MODEST_GLADE,libglade-2.0,glade_support=yes,echo "no";glade_support=no)
-AC_SUBST(MODEST_GLADE_CFLAGS)
-AC_SUBST(MODEST_GLADE_LIBS)
-
-dnl dnl build the Hildon UI?
-PKG_CHECK_MODULES(MODEST_HILDON,hildon libglade-2.0 libtinymailui-gtk-1.0,hildon_support=yes,echo "no";hildon_support=no)
-AC_SUBST(MODEST_HILDON_CFLAGS)
-AC_SUBST(MODEST_HILDON_LIBS)
-
-dnl now, determine what to build
-AC_MSG_NOTICE([Determining what UI to build])
-modest_ui="none"
-if test "x$hildon_support" = "xyes"; then
- AC_SUBST(MODEST_UI_DIR,"hildon")
- AC_DEFINE([MODEST_ENABLE_HILDON_UI],1,[Enable Hildon UI])
- modest_ui="hildon"
-elif test "x$glade_support" = "xyes"; then
- AC_SUBST(MODEST_UI_DIR,"gtk-glade")
- AC_DEFINE([MODEST_ENABLE_GTK_GLADE_UI],1,[Enable Gtk-Glade UI])
- modest_ui="gtk-glade"
-else
- AC_SUBST(MODEST_UI_DIR,"gtk")
- AC_DEFINE([MODEST_ENABLE_GTK_UI],1,[Enable Plain Gtk+ UI])
- modest_ui="gtk"
+
+
+
+
+dnl dnl now, determine what to build
+AC_MSG_NOTICE([Determining what platform to build])
+PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libosso,[with_platform=maemo],true)
+
+
+AC_ARG_WITH(platform,
+[--with-platform=gtk platform to build for [gtk]],
+[case "${with_platform}" in
+ gtk) MODEST_PLATFORM=gtk;;
+ maemo) MODEST_PLATFORM=maemo;;
+ *) MODEST_PLATFORM=${with_platform}
+esac], [MODEST_PLATFORM=gtk
+ with_platform=gtk])
+AC_SUBST(MODEST_PLATFORM)
+
+
+if test "x$with_platform" = "xmaemo"; then
+ PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs libosso)
+ AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
+ AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS)
+ MODEST_PLATFORM_ID=2
+else
+ PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8)
+ AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
+ AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
+ MODEST_PLATFORM_ID=1