From 8ff89e14b3dd13cbc791129122e5f2022dddd3ac Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <dirk-jan.binnema@nokia.com>
Date: Thu, 1 Nov 2007 16:52:16 +0000
Subject: [PATCH] * make libalarm an optional (no longer required) dependency
 for maemo

pmo-trunk-r3613
---
 configure.ac                |   19 ++++++++++++++++++-
 src/maemo/Makefile.am       |    2 ++
 src/maemo/modest-platform.c |   10 ++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 673f895..754b578 100644
--- 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  
@@ -430,6 +446,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"
diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 22ed80b..db0da49 100644
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -37,6 +37,7 @@ INCLUDES=\
 	$(MODEST_HILDON_HELP_CFLAGS)        \
 	$(MODEST_HILDON_MIME_CFLAGS)        \
 	$(MODEST_HILDON_NOTIFY_CFLAGS)      \
+	$(MODEST_LIBALARM_CFLAGS)           \
 	-I ${top_srcdir}/src/widgets        \
 	-I ${top_srcdir}/src                \
 	-DPREFIX=\"@prefix@\" 	            \
@@ -96,6 +97,7 @@ libmodest_ui_la_LIBADD = \
 	$(MODEST_HILDON_WIDGETS_LIBS) \
 	$(MODEST_HILDON_MIME_LIBS) \
 	$(MODEST_HILDON_HELP_LIBS) \
+	$(MODEST_LIBALARM_LIBS)           \
 	$(MODEST_HILDON_NOTIFY_LIBS)\
 	easysetup/libmodest-easysetup.la 
 
diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index cac2a48..611800e 100644
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -40,7 +40,6 @@
 #include <dbus_api/modest-dbus-callbacks.h>
 #include <maemo/modest-osso-autosave-callbacks.h>
 #include <libosso.h>
-#include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
 #include <tny-maemo-conic-device.h>
 #include <tny-simple-list.h>
 #include <tny-folder.h>
@@ -58,6 +57,11 @@
 #include <libosso-abook/osso-abook.h>
 #endif /*MODEST_HAVE_ABOOK*/
 
+#ifdef MODEST_HAVE_LIBALARM
+#include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
+#endif /*MODEST_HAVE_LIBALARM*/
+
+
 
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"
@@ -1159,6 +1163,8 @@ modest_platform_run_sort_dialog (GtkWindow *parent_window,
 gboolean 
 modest_platform_set_update_interval (guint minutes)
 {
+#ifdef MODEST_HAVE_LIBALARM
+	
 	ModestConf *conf = modest_runtime_get_conf ();
 	if (!conf)
 		return FALSE;
@@ -1237,7 +1243,7 @@ modest_platform_set_update_interval (guint minutes)
 	    
 	    return FALSE;
 	}
-	
+#endif /* MODEST_HAVE_LIBALARM */	
 	return TRUE;
 }
 
-- 
1.7.9.5