* GETTEXT_PACKAGE: osso-email=>modest

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index 673f895..e5ab322 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ if test "x$with_platform" == "xgnome"; then
     AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
 else
     have_easysetup=true
-    PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 libebook-1.2 libalarm microb-engine-nss)
+    PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 libebook-1.2 microb-engine-nss)
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the MAEMO platform."])
     AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether we have the easysetup feature"])
 fi                 
@@ -127,6 +127,22 @@ fi
 
 
 #
+# check libalarm
+#
+if test "x$with_platform" == "xmaemo"; then  
+PKG_CHECK_MODULES(MODEST_LIBALARM,libalarm,have_libalarm=true,have_libalarm=false)
+if test "x$have_libalarm" == "xtrue"; then
+   libalarm="libalarm" 
+   AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBALARM, 1, ["Whether libalarm is used."])          
+   AC_SUBST(MODEST_LIBALARM_CFLAGS)
+   AC_SUBST(MODEST_LIBALARM_LIBS)
+else
+   libalarm=""
+fi
+fi
+
+
+#
 # check the providers-data (on maemo)
 #
 if test "x$with_platform" == "xmaemo"; then  
@@ -293,14 +309,8 @@ fi
 AM_CONDITIONAL(MODEST_USE_DUMMY_ADDRESS_BOOK,test "x$have_abook"="xtrue")
 
 
-
-#FIXME: hack to set the right gettext package..
-if test "x$have_hildon1" == "xtrue"; then
-     GETTEXT_PACKAGE=osso-email
-else
-     GETTEXT_PACKAGE=modest    
-fi
-# Check for gettext support
+# gettext support
+GETTEXT_PACKAGE=modest 
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["gettext package"])
 
@@ -430,6 +440,7 @@ echo "Easysetup data   : $providers_data"
 echo "Editor lib       : $wpeditor"
 echo "Addressbook      : $addressbook"
 echo "Help lib         : $helplib"
+echo "Alarm            : $libalarm"
 echo "Hildon-Notify    : $have_hildon_notify"    
 echo "LibOGS support   : $have_ogs_support"
 echo "MozEmbed support : $use_mozembed"