# 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.1],[http://maemo.org])
+AC_INIT([modest],[3.2],[http://maemo.org])
AC_CONFIG_HEADERS([config.h])
m4_define([modest_api_major_version], [1])
AC_PROG_CC
AC_PROG_CXX
AM_PROG_CC_STDC
+AM_PROG_CC_C_O
AC_HEADER_STDC
AC_PROG_LIBTOOL
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
-PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-${gtk_html_version} libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0)
+PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-${gtk_html_version} libtinymail-1.0 >= 1.1.90 libtinymail-camel-1.0 >= 1.1.90 libtinymail-gnomevfs-1.0 >= 1.1.90 libtinymailui-1.0 >= 1.1.90 libtinymailui-gtk-1.0 >= 1.1.90)
AC_SUBST(MODEST_GSTUFF_CFLAGS)
AC_SUBST(MODEST_GSTUFF_LIBS)
AC_SUBST(MODEST_TOOLKIT_DIR)
if test "x$with_platform" == "xgnome"; then
- PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 glib-2.0 >= 2.8 libnotify)
+ PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 >= 1.1.90 glib-2.0 >= 2.8 libnotify)
AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
dnl AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
else
have_dbusapi=true
- PKG_CHECK_MODULES(MODEST_PLATFORM,libosso dbus-1 libtinymail-maemo-1.0 libebook-1.2 )
+ PKG_CHECK_MODULES(MODEST_PLATFORM,libosso dbus-1 libtinymail-maemo-1.0 >= 1.1.90 libebook-1.2 )
AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the MAEMO platform."])
fi
AM_CONDITIONAL(MODEST_HAVE_DBUS_API,test "x$have_dbusapi" == "xtrue")
fi
fi
-PKG_CHECK_MODULES(MODEST_MOZEMBED, libtinymailui-mozembed-1.0, have_mozembed=true, have_mozembed=false)
+PKG_CHECK_MODULES(MODEST_MOZEMBED, libtinymailui-mozembed-1.0 >= 1.1.90, have_mozembed=true, have_mozembed=false)
AC_ARG_ENABLE(mozembed,
AC_HELP_STRING([--enable-mozembed],
[Build with GtkMozEmbed (yes, no)]),
#
# 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, 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"
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)
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"