* support hildon

pmo-trunk-r136

diff --git a/configure.ac b/configure.ac
index 67b5b62..a919477 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl configure.ac for modest 
-dnl Time-stamp: <2006-05-17 10:44:04 (djcb)>
+dnl Time-stamp: <2006-06-02 16:29:39 (djcb)>
 dnl written by Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
 AC_INIT([modest],[0.0.9],[http://maemo.org])
 AC_CONFIG_SRCDIR(src/modest-main.c)
@@ -22,45 +22,37 @@ AC_PROG_LIBTOOL
 AC_CHECK_PROG([perl])
 GTK_DOC_CHECK([1.0])
 
-dnl # GLib/Gobject => mandatory
-PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0) 
+dnl # GLib/Gobject/Gtk/Gconf => mandatory
+PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 libgtkhtml-3.8 libglade-2.0 libtinymail-1.0 libtinymail-camel-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0 camel-1.2) 
 AC_SUBST(MODEST_GSTUFF_CFLAGS)
 AC_SUBST(MODEST_GSTUFF_LIBS)
 
-dnl # tinymail => mandatory
-PKG_CHECK_MODULES(MODEST_TINYMAIL, libtinymail-1.0 libtinymail-camel-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0 libtinymail-gnome-desktop-1.0 camel-1.2)
-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 dnl build the Hildon UI?
+PKG_CHECK_MODULES(MODEST_HILDON,hildon-libs,hildon_support=yes,echo "no";hildon_support=no)
 
-dnl # Gtk+ => mandatory
-PKG_CHECK_MODULES(MODEST_GTK,gtk+-2.0 >= 2.6)
-AC_SUBST(MODEST_GTK_CFLAGS)
-AC_SUBST(MODEST_GTK_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_MSG_NOTICE([Looks like Hildon])
 
-dnl # GtkHTML => mandatory (for now)
-PKG_CHECK_MODULES(MODEST_GTKHTML,libgtkhtml-3.8)
-AC_SUBST(MODEST_GTKHTML_CFLAGS)
-AC_SUBST(MODEST_GTKHTML_LIBS)
+      AC_SUBST(MODEST_UI_DIR,"hildon-libs")
+      AC_DEFINE([MODEST_ENABLE_HILDON_UI],1,[Enable Hildon UI])
+      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs hildon-lgpl)
+      AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
+      AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS) 
+      modest_ui="hildon"
+else
+      AC_MSG_NOTICE([Looks like Gnome/GTK+])
 
-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)
+      AC_SUBST(MODEST_UI_DIR,"gtk-glade")               
+      AC_DEFINE([MODEST_ENABLE_GTK_GLADE_UI],1,[Enable Gtk-Glade UI])
+      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_ui="gtk-glade"                                            
+fi
 
-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])
@@ -69,14 +61,10 @@ 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
+else 
       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"                                          
 fi
 
 AC_OUTPUT([