X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=c6687df0ceb3f185565738ad42969433f84f7b0b;hp=4fa64d1a3c6b203426cc9f1db5949cc0e3bfc177;hb=67ce358d84560f33210e608f236f258c38cb701c;hpb=10ad280d346ab341a0ab4437d1f3f81d48a5a0f0

diff --git a/configure.ac b/configure.ac
index 4fa64d1..c6687df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-AC_INIT([modest],[3.0],[http://maemo.org])
+AC_INIT([modest],[3.2],[http://maemo.org])
 AC_CONFIG_HEADERS([config.h])
 
 m4_define([modest_api_major_version], [1])
@@ -61,6 +61,7 @@ AC_SUBST(prefix)
 AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_STDC
+AM_PROG_CC_C_O
 AC_HEADER_STDC
 AC_PROG_LIBTOOL
 
@@ -120,7 +121,7 @@ else
 fi
 
 
-PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0) 
+PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0 >= 3.2.0)
 
 
 dnl # GLib/Gobject/Gtk/Gconf => mandatory
@@ -495,7 +496,7 @@ fi
 #
 # 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)
@@ -505,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)
-     AC_SUBST(MODEST_ABOOK_LIBE)
+     AC_SUBST(MODEST_ABOOK_LIBS)
 
      modest_save_cflags="$CFLAGS"
      modest_save_libs="$LIBS"
@@ -523,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
+
+   # 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)
@@ -688,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 "Calendar widgets : $have_calendar_widgets"
 fi
 
 echo "MozEmbed support : $use_mozembed"