From 19d37f096c8a856e4b1d8ae8062075ca47312b89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= Date: Wed, 18 Nov 2009 10:56:26 +0100 Subject: [PATCH 1/1] Add calendar widgets support for Maemo builds --- configure.ac | 9 +++++++++ debian/control.maemo-fremantle | 2 +- src/hildon2/Makefile.am | 8 +++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5fb619a..408bd46 100644 --- a/configure.ac +++ b/configure.ac @@ -388,6 +388,14 @@ if test "x$with_platform" == "xmaemo"; then AC_DEFINE_UNQUOTED(MODEST_ABOOK_API, $abook_api, ["the API version of osso-addressbook"]) AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK, 1, ["whether we have osso-addressbook"]) fi + + # Check the presence of the calendar widgets + PKG_CHECK_MODULES(MODEST_CALENDAR_WIDGETS,calendar-ui-widgets,have_calendar_widgets=true,have_calendar_widgets=false) + AC_SUBST(MODEST_CALENDAR_WIDGETS_CFLAGS) + AC_SUBST(MODEST_CALENDAR_WIDGETS_LIBS) + if test "x$have_calendar_widgets" == "xtrue"; then + AC_DEFINE_UNQUOTED(MODEST_USE_CALENDAR_WIDGETS, 1, ["Use the Calendar color widgets"]) + fi fi AM_CONDITIONAL(MODEST_USE_DUMMY_ADDRESS_BOOK,test "x$have_abook" != "xtrue") @@ -537,6 +545,7 @@ if test "x$with_platform" == "xmaemo"; then echo "Alarm : $have_libalarm" echo "MCE : $have_mce" echo "Hildon-Notify : $have_hildon_notify" + echo "Calendar widgets : $have_calendar_widgets" fi if [ $gtk_html_found = "true" ]; then diff --git a/debian/control.maemo-fremantle b/debian/control.maemo-fremantle index bf4a126..836f8a4 100644 --- a/debian/control.maemo-fremantle +++ b/debian/control.maemo-fremantle @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4.0.0), cdbs, libmodest-dbus-client-dev, gnome-comm libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev, libprofile-dev, libtime-dev, libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev, libtinymailui-1.0-0-dev, libtinymail-gnomevfs-1.0-0-dev, libtinymailui-gtk-1.0-0-dev, wpeditor0, wpeditor-dev, modest-providers-data, libalarm-dev, gtk-doc-tools, libnotify-dev, libhildonfm2-dev, - microb-engine-dev, mce-dev, maemo-launcher-dev, profile-data-dev, libiphb-dev + microb-engine-dev, mce-dev, maemo-launcher-dev, profile-data-dev, libiphb-dev, calendar-ui-widgets-0-dev Standards-Version: 3.8.0 Package: modest diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am index add13d4..2cff352 100644 --- a/src/hildon2/Makefile.am +++ b/src/hildon2/Makefile.am @@ -27,11 +27,11 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. INCLUDES=\ - $(LIBMODEST_DBUS_CLIENT_CFLAGS) \ + $(LIBMODEST_DBUS_CLIENT_CFLAGS) \ $(MODEST_GSTUFF_CFLAGS) \ $(MODEST_WPEDITOR_CFLAGS) \ $(MODEST_PLATFORM_CFLAGS) \ - $(MODEST_TOOLKIT_CFLAGS) \ + $(MODEST_TOOLKIT_CFLAGS) \ $(MODEST_PLUGIN_DEFINES) \ $(MODEST_ABOOK_CFLAGS) \ $(MODEST_HILDON_HELP_CFLAGS) \ @@ -39,6 +39,7 @@ INCLUDES=\ $(MODEST_HILDON_MIME_CFLAGS) \ $(MODEST_HILDON_NOTIFY_CFLAGS) \ $(MODEST_LIBALARM_CFLAGS) \ + $(MODEST_CALENDAR_WIDGETS_CFLAGS) \ -I ${top_srcdir}/src/widgets \ -I ${top_srcdir}/src \ -DPREFIX=\"@prefix@\" \ @@ -117,7 +118,8 @@ libmodest_ui_la_LIBADD = \ $(MODEST_HILDON_HELP_LIBS) \ $(MODEST_LIBALARM_LIBS) \ $(MODEST_LIBIPHB_LIBS) \ - $(MODEST_HILDON_NOTIFY_LIBS) + $(MODEST_HILDON_NOTIFY_LIBS) \ + $(MODEST_CALENDAR_WIDGETS_LIBS) UI_FILES=\ ui/modest-main-window-ui.xml \ -- 1.7.9.5