Add calendar widgets support for Maemo builds

diff --git a/configure.ac b/configure.ac
index fcc0e78..c6687df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -496,7 +496,7 @@ fi
 #
 # check the version of the addressbook on maemo
 #
 #
 # check the version of the addressbook on maemo
 #

-if test "x$with_platform" == "xmaemo"; then  
+if test "x$with_platform" == "xmaemo"; then

    PKG_CHECK_MODULES(MODEST_ABOOK,osso-addressbook-1.0,have_abook=true,have_abook=false)
    abook_api=`$PKG_CONFIG --modversion osso-addressbook-1.0 | cut -d. -f1`
    AC_SUBST(MODEST_ABOOK_CFLAGS)
    PKG_CHECK_MODULES(MODEST_ABOOK,osso-addressbook-1.0,have_abook=true,have_abook=false)
    abook_api=`$PKG_CONFIG --modversion osso-addressbook-1.0 | cut -d. -f1`
    AC_SUBST(MODEST_ABOOK_CFLAGS)

@@ -506,7 +506,7 @@ if test "x$with_platform" == "xmaemo"; then
      PKG_CHECK_MODULES(MODEST_ABOOK, libosso-abook-1.0,have_abook=true,have_abook=false)
      abook_api=`$PKG_CONFIG --modversion libosso-abook-1.0 | cut -d. -f1`
      AC_SUBST(MODEST_ABOOK_CFLAGS)
      PKG_CHECK_MODULES(MODEST_ABOOK, libosso-abook-1.0,have_abook=true,have_abook=false)
      abook_api=`$PKG_CONFIG --modversion libosso-abook-1.0 | cut -d. -f1`
      AC_SUBST(MODEST_ABOOK_CFLAGS)

-     AC_SUBST(MODEST_ABOOK_LIBE)
+     AC_SUBST(MODEST_ABOOK_LIBS)

 
      modest_save_cflags="$CFLAGS"
      modest_save_libs="$LIBS"
 
      modest_save_cflags="$CFLAGS"
      modest_save_libs="$LIBS"

@@ -524,6 +524,14 @@ if test "x$with_platform" == "xmaemo"; then
       AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK, 1, ["whether we have osso-addressbook"])
       addressbook="osso-addressbook"
    fi
       AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK, 1, ["whether we have osso-addressbook"])
       addressbook="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
 
 AC_CHECK_HEADERS([clockd/libtime.h], have_libtime=true, have_libtime=false)
 fi
 
 AC_CHECK_HEADERS([clockd/libtime.h], have_libtime=true, have_libtime=false)

@@ -689,6 +697,7 @@ if test "x$with_platform" == "xmaemo"; then
    echo "MCE              : $have_mce"
    echo "Hildon-Notify    : $have_hildon_notify"
    echo "LibOGS support   : $have_ogs_support"
    echo "MCE              : $have_mce"
    echo "Hildon-Notify    : $have_hildon_notify"
    echo "LibOGS support   : $have_ogs_support"

+   echo "Calendar widgets : $have_calendar_widgets"

 fi
 
 echo "MozEmbed support : $use_mozembed"
 fi
 
 echo "MozEmbed support : $use_mozembed"

diff --git a/debian/control.maemo-fremantle b/debian/control.maemo-fremantle
index bf4a126..836f8a4 100644 (file)
--- 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,
  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
 Standards-Version: 3.8.0
 
 Package: modest

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index 67fc237..9e3d487 100644 (file)
--- 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=\
 # 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_GSTUFF_CFLAGS)             \
        $(MODEST_WPEDITOR_CFLAGS)           \
        $(MODEST_PLATFORM_CFLAGS)           \

-       $(MODEST_TOOLKIT_CFLAGS)           \
+       $(MODEST_TOOLKIT_CFLAGS)            \

        $(MODEST_PLUGIN_DEFINES)            \
        $(MODEST_ABOOK_CFLAGS)              \
        $(MODEST_HILDON_HELP_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_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@\"               \
        -I ${top_srcdir}/src/widgets        \
        -I ${top_srcdir}/src                \
        -DPREFIX=\"@prefix@\"               \

@@ -115,7 +116,8 @@ libmodest_ui_la_LIBADD = \
        $(MODEST_HILDON_HELP_LIBS) \
        $(MODEST_LIBALARM_LIBS)   \
        $(MODEST_LIBIPHB_LIBS)   \
        $(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 \
 
 UI_FILES=\
        ui/modest-main-window-ui.xml \