X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=fb8b657bc32a871297cb2f504b706547d6cc0bd6;hp=a6ede9b5381db8bcc7e322f86208366c7da9498a;hb=388f660c0d02eddbfcb192662239e2410cb97724;hpb=4b1fbefc097f20ba16d95f179d37aee7cadc481f

diff --git a/configure.ac b/configure.ac
index a6ede9b..fb8b657 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl configure.ac for modest 
-dnl Time-stamp: <2006-07-17 13:28:07 (djcb)>
+dnl Time-stamp: <2006-08-08 12:21:25 (djcb)>
 dnl written by Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
 
 AC_INIT([modest],[0.0.1],[http://maemo.org])
@@ -8,6 +8,18 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR(src/modest-main.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
+# Check for gettext support
+GETTEXT_PACKAGE=modest
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
+
+ALL_LINGUAS="en_GB gl nl"
+#AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR])
+AM_GLIB_GNU_GETTEXT
+
+modestlocaledir='$prefix/${DATADIRNAME}/locale'
+AC_SUBST(modestlocaledir)
+
 if test x$prefix = xNONE; then
    prefix=/usr/local
 fi
@@ -24,23 +36,30 @@ AC_CHECK_PROG([perl])
 GTK_DOC_CHECK([1.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) 
+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) 
 AC_SUBST(MODEST_GSTUFF_CFLAGS)
 AC_SUBST(MODEST_GSTUFF_LIBS)
 
-dnl now, determine what to build
+dnl dnl now, determine what to build
 AC_MSG_NOTICE([Determining what platform to build])
+dnl 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}
+       gtk)    MODEST_PLATFORM_DIR=gtk;;
+       hildon) MODEST_PLATFORM_DIR=hildon;;
+       *)      MODEST_PLATFORM_DIR=${with_platform}
 esac], [MODEST_PLATFORM_DIR=gtk
-       with_platform=gtk])
+               with_platform=gtk])
 AC_SUBST(MODEST_PLATFORM_DIR)
 	
+dnl tempororily change hildon into gtk...
+if test "x$with_platform" = "xhildon"; then
+   AC_MSG_WARN([Hildon frontend is currently disabled])
+   with_platform="gtk"
+fi
+
 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)
@@ -51,16 +70,12 @@ else
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
 fi
 
-AM_CONDITIONAL(OLD_UI_STUFF, test x$with_platform != xgtk2)
-
 AC_OUTPUT([
+po/Makefile.in
 Makefile
 src/Makefile
 src/gtk/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
 ])
@@ -70,3 +85,5 @@ echo "modest configure results"
 echo "-----------------------------------"
 echo "Platform       : $with_platform"
 echo ""
+echo "NOTE: you should do a 'make clean' after changing platform (--with-platform=)"
+echo ""