pmo-trunk-r497

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index 839115a..dfef1a0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl configure.ac for modest 
-dnl Time-stamp: <2006-07-20 17:01:42 (djcb)>
+dnl Time-stamp: <2006-11-28 17:26:13 (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,47 +36,51 @@ 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])
-PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libosso,[with_platform=hildon],true)
+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_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)
+       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
 fi
 
-AM_CONDITIONAL(OLD_UI_STUFF, test x$with_platform != xgtk2)
+dnl 1==>gtk, 2==>maemo
+AC_SUBST(MODEST_PLATFORM_ID)
 
 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/maemo/Makefile
+src/widgets/Makefile
 docs/Makefile
 docs/reference/Makefile
+tests/Makefile
 ])
 
 echo