X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=822c38f5d37f5eeb2fab101518272a903a5c0473;hb=17d6b27f78a4188ec093ee70b5438808be0ae685;hp=93d462eec1d48bd455d7a17b1fa89c57479f7b5c;hpb=0553c6bb55e67bd3451b3baeaa1c5d5334f859c5;p=modest

diff --git a/configure.ac b/configure.ac
index 93d462e..822c38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,10 +32,6 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR(src/modest-main.c)
 AM_INIT_AUTOMAKE([dist-bzip2])
 
-# Check for gettext support
-GETTEXT_PACKAGE=modest
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
 
 ALL_LINGUAS="en_GB"
 
@@ -94,9 +90,13 @@ if test "x$with_platform" = "xmaemo"; then
    if test "$hildon1" == "yes"; then   # the 'new' hildon      			
       PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2 libalarm hildon-notify libnotify)     	
    
+      GETTEXT_PACKAGE=osso-email
+
     else     # the old hildon
-     PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0 hildon-notify libnotify)     	 
-        AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
+      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0)
+      AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
+
+      GETTEXT_PACKAGE=modest
     fi 	
    
    AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
@@ -117,6 +117,10 @@ if test "x$with_platform" = "xmaemo"; then
   pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir`
   plugindesktopentrydir=`$PKG_CONFIG hildon-control-panel --variable=plugindesktopentrydir`
 
+  # Check for gettext support
+  AC_SUBST(GETTEXT_PACKAGE)
+  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
+
   dbus_api="dbus_api"
   AC_SUBST(dbus_api)
 
@@ -139,7 +143,7 @@ if test "x$with_platform" = "xmaemo"; then
   CFLAGS="$CFLAGS -Wno-format-extra-args -Werror"
 else
    # gnome frontend 
-   AC_MSG_ERROR([Sorry, the GNOME Frontend is currently not working])
+   #AC_MSG_ERROR([Sorry, the GNOME Frontend is currently not working])
 
    PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify)
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)