X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=538904f6e41f75a9b9e960cdcc1da2233474c4e8;hp=7bb4713df3c4efd93feb136c54a0af637f68f81f;hb=53f032ecf7057a797fbbb4ab5175891655a92997;hpb=7009355b93052950c743db9f150b0141a3b8292b diff --git a/configure.ac b/configure.ac index 7bb4713..538904f 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_INIT([modest],[3.0],[http://maemo.org]) AC_CONFIG_HEADERS([config.h]) m4_define([modest_api_major_version], [1]) -m4_define([modest_api_minor_version], [0]) +m4_define([modest_api_minor_version], [99]) m4_define([modest_api_micro_version], [0]) m4_define([modest_api_version], [modest_api_major_version.modest_api_minor_version.modest_api_micro_version]) @@ -120,6 +120,9 @@ else fi +PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.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) @@ -134,8 +137,16 @@ AC_SUBST(MODEST_GTKHTML_LIBS) CFLAGS="$MODEST_GTKHTML_CFLAGS" LIBS="$MODEST_GTKHTML_LIBS" AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[], [#include ]) +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" @@ -178,7 +189,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 @@ -205,13 +216,18 @@ pluginpkgs=$hildonpkgs echo "Plugin Packages $pluginpkgs" AC_SUBST(pluginpkgs) +use_profile_data=false # Plugin packages must not include libcanberra and libprofile if test "$have_hildon2" = "true"; then echo "DETECTED HILDON 2 $have_hildon2." detected_toolkit=hildon2 - hildonpkgs="$hildonpkgs libcanberra profile" + hildonpkgs="$hildonpkgs libcanberra" + AC_CHECK_HEADER([profiled/keys_nokia.h], use_profile_data=true, use_profile_data=false) + if test "$use_profile_data" = "true"; then + hildonpkgs="$hildonpkgs profile" + AC_DEFINE_UNQUOTED(MODEST_USE_PROFILE, 1, ["Use the Profile data include"]) + fi echo "HILDON 2 PACKAGES $hildonpkgs" - AC_CHECK_HEADER([profiled/keys_nokia.h], [], AC_MSG_ERROR([You have to install package profile-data-dev])) fi AC_SUBST(hildonpkgs) @@ -267,11 +283,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 @@ -486,6 +506,15 @@ if test "x$with_platform" == "xmaemo"; then abook_api=`$PKG_CONFIG --modversion libosso-abook-1.0 | cut -d. -f1` AC_SUBST(MODEST_ABOOK_CFLAGS) AC_SUBST(MODEST_ABOOK_LIBE) + + 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 @@ -496,6 +525,15 @@ if test "x$with_platform" == "xmaemo"; then 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) # # if we don't have an addressbook, use the dummy one @@ -525,6 +563,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 @@ -542,6 +582,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) @@ -611,8 +653,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 ]) @@ -644,6 +684,7 @@ 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"