X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=2514b8d8f1a0d01befeba4153c1b9d3c8ba22b58;hp=67b5b6210b546849cee855b74ef95827820d6236;hb=a7468cf0ef84415bfe7c2d0cfcd1eaa00e266a7a;hpb=8093b0dfb2fe91adb8cde88d08dec35f6a02de06

diff --git a/configure.ac b/configure.ac
index 67b5b62..2514b8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,14 @@
 dnl configure.ac for modest 
-dnl Time-stamp: <2006-05-17 10:44:04 (djcb)>
+dnl Time-stamp: <2006-07-21 09:30:11 (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)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
+AC_INIT([modest],[0.0.1],[http://maemo.org])
 AC_CONFIG_HEADERS([config.h])
 
-if test x$prefix=xNONE; then
+AC_CONFIG_SRCDIR(src/modest-main.c)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
+
+if test x$prefix = xNONE; then
    prefix=/usr/local
 fi
 AC_SUBST(prefix)
@@ -22,69 +23,47 @@ 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 # Gtk+ => mandatory
-PKG_CHECK_MODULES(MODEST_GTK,gtk+-2.0 >= 2.6)
-AC_SUBST(MODEST_GTK_CFLAGS)
-AC_SUBST(MODEST_GTK_LIBS)
-
-dnl # GtkHTML => mandatory (for now)
-PKG_CHECK_MODULES(MODEST_GTKHTML,libgtkhtml-3.8)
-AC_SUBST(MODEST_GTKHTML_CFLAGS)
-AC_SUBST(MODEST_GTKHTML_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"						
+AC_MSG_NOTICE([Determining what platform to build])
+PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libosso,[with_platform=hildon],true)
+
+AC_ARG_WITH(platform,
+[--with-platform=gtk		platform to build for [gtk]],
+[case "${with_platform}" in
+      gtk)    MODEST_PLATFORM_DIR=gtk;;
+      gtk2)   MODEST_PLATFORM_DIR=gtk2;;
+      hildon) MODEST_PLATFORM_DIR=hildon;;
+      *)      MODEST_PLATFORM_DIR=${with_platform}
+esac], [MODEST_PLATFORM_DIR=gtk
+       with_platform=gtk])
+AC_SUBST(MODEST_PLATFORM_DIR)
+	
+if test "x$with_platform" = "xhildon"; then
+   PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs hildon-lgpl libosso)
+   AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
+   AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS) 
+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)
 fi
 
+AM_CONDITIONAL(OLD_UI_STUFF, test x$with_platform != xgtk2)
+
 AC_OUTPUT([
 Makefile
 src/Makefile
 src/gtk/Makefile
-src/gtk-glade/Makefile
+src/gtk2/Makefile
 src/hildon/Makefile
+src/hildon/com.nokia.modest.service
+src/hildon/modest.desktop.in
+src/widgets/Makefile
 docs/Makefile
 docs/reference/Makefile
 ])
@@ -92,5 +71,7 @@ docs/reference/Makefile
 echo
 echo "modest configure results"
 echo "-----------------------------------"
-echo "User-interface       : $modest_ui"
+echo "Platform       : $with_platform"
+echo ""
+echo "NOTE: you should do a 'make clean' after changing platform (--with-platform=)"
 echo ""