X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=9f032d2af99e5a37af426e68ff7e025955523c02;hp=49662235d897d683bccb2ef509f713e8f71e558c;hb=7477373e6c399ba5ffaaeb84d4ecd687420d1549;hpb=ec86c81f4440ef1ccfe473cd9465f569e7271e15 diff --git a/configure.ac b/configure.ac index 4966223..9f032d2 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,9 +121,12 @@ else fi +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) @@ -138,6 +142,12 @@ AC_CHECK_FUNCS(gtk_html_set_max_image_size) AC_SUBST(HAVE_GTK_HTML_SET_MAX_IMAGE_SIZE) AC_CHECK_FUNCS(gtk_html_get_selection_area) AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA) +AC_CHECK_FUNCS(gtk_html_set_allow_dnd) +AC_SUBST(HAVE_GTK_HTML_SET_ALLOW_DND) +AC_CHECK_FUNCS(gtk_html_set_default_engine) +AC_SUBST(HAVE_GTK_HTML_SET_DEFAULT_ENGINE) +AC_CHECK_FUNCS(gtk_html_set_word_char_wrapping) +AC_SUBST(HAVE_GTK_HTML_SET_WORD_CHAR_WRAPPING) AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint) AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT) CFLAGS="$modest_save_cflags" @@ -180,7 +190,7 @@ have_hildon0=false have_gtk=false PKG_CHECK_EXISTS(hildon-1, have_hildon1=true,have_hildon1=false) if test "$have_hildon1" = "true"; then - PKG_CHECK_EXISTS(hildon-1 >= 2.1.0, have_hildon2=true, have_hildon2=false) + PKG_CHECK_EXISTS(hildon-1 >= 2.1.0 hildon-fm-2, have_hildon2=true, have_hildon2=false) PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS,hildon-1 hildon-fm-2) hildonpkgs="hildon-1 hildon-fm-2" detected_toolkit=hildon1 @@ -274,11 +284,15 @@ then PKG_CHECK_MODULES(MAEMO_LAUNCHER, [maemo-launcher-app]) AC_SUBST(MAEMO_LAUNCHER_CFLAGS) AC_SUBST(MAEMO_LAUNCHER_LIBS) + MAEMO_LAUNCHER_MODEST_LDFLAGS="-shared " +else + MAEMO_LAUNCHER_MODEST_LDFLAGS="-export-dynamic " fi +AC_SUBST(MAEMO_LAUNCHER_MODEST_LDFLAGS) have_easysetup=false if test "x$with_toolkit" == "xgtk"; then - PKG_CHECK_MODULES(MODEST_TOOLKIT,glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify) + PKG_CHECK_MODULES(MODEST_TOOLKIT,glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify gtksourceview-2.0) AC_DEFINE_UNQUOTED(MODEST_TOOLKIT_GTK, 1, ["Whether modest is being build for the gtk toolkit."]) MODEST_TOOLKIT_DIR=gnome else @@ -298,12 +312,12 @@ AC_SUBST(MODEST_TOOLKIT) 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") @@ -430,7 +444,7 @@ if test "x$with_toolkit" != "xgtk"; then 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)]), @@ -482,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) @@ -492,7 +506,16 @@ 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" + CFLAGS="$MODEST_ABOOK_CFLAGS" + LIBS="$MODEST_ABOOK_LIBS" + AC_CHECK_FUNCS(osso_abook_contact_chooser_set_visible_func) + AC_SUBST(HAVE_OSSO_ABOOK_CONTACT_CHOOSER_SET_VISIBLE_FUNC) + CFLAGS="$modest_save_cflags" + LIBS="$modest_save_libs" fi if test "x$have_abook" == "xtrue"; then @@ -501,8 +524,35 @@ 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) + +if test "x$have_libtime" == "xtrue"; then + AC_DEFINE_UNQUOTED(MODEST_USE_LIBTIME, 1, ["use libtime API"]) + MODEST_LIBTIME_LIBS=-ltime +else + MODEST_LIBTIME_LIBS= +fi +AC_SUBST(MODEST_LIBTIME_LIBS) + +AC_CHECK_HEADERS([iphbd/libiphb.h], have_libiphb=true, have_libiphb=false) + +if test "x$have_libiphb" == "xtrue"; then + AC_DEFINE_UNQUOTED(MODEST_USE_IPHB, 1, ["use IP Heartbeat API"]) + MODEST_LIBIPHB_LIBS=-liphb +else + MODEST_LIBIPHB_LIBS= +fi +AC_SUBST(MODEST_LIBIPHB_LIBS) # # if we don't have an addressbook, use the dummy one @@ -532,6 +582,8 @@ if test "x$with_platform" == "xmaemo"; then serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services localedir=`$PKG_CONFIG osso-af-settings --variable=localedir` backupsettingsdir=/etc/osso-backup/applications + prebackupdir=/etc/osso-backup/pre-backup.d/ + restoredir=/etc/osso-backup/restore.d/always/ ossocudscriptsdir=/etc/osso-cud-scripts pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir` icon_26x26dir=$datadir/icons/hicolor/26x26/hildon @@ -549,6 +601,8 @@ if test "x$with_platform" == "xmaemo"; then AC_SUBST(desktopentrydir) AC_SUBST(serviceentrydir) AC_SUBST(backupsettingsdir) + AC_SUBST(prebackupdir) + AC_SUBST(restoredir) AC_SUBST(ossocudscriptsdir) AC_SUBST(localedir) AC_SUBST(pixmapdir) @@ -618,8 +672,6 @@ src/maemo/modest.desktop src/maemo/com.nokia.modest.service src/hildon2/modest.desktop src/hildon2/com.nokia.modest.service -libmodest-dbus-client/Makefile -libmodest-dbus-client/libmodest-dbus-client-1.0.pc ]) @@ -645,12 +697,14 @@ 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" if [ $gtk_html_found = "true" ]; then echo "GtkHTML version : $gtk_html_version" fi +echo "Libtime : $have_libtime" echo "CFLAGS : $CFLAGS" echo "Debug version : $with_debug"