X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=d665ef11f36ce06fd98ccef8f8c054a3a838ebd5;hp=8ee55e2e5ff0024034059fa87c63a3d04dfe16ff;hb=7758fa49daf7bcdddd9199281099aef348d33a1e;hpb=6eb8b51e9fcd8b79eb0af5f0e673c945731e15b5

diff --git a/configure.ac b/configure.ac
index 8ee55e2..d665ef1 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.1],[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,6 +121,9 @@ 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) 
@@ -142,6 +146,8 @@ 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"
@@ -501,6 +507,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
@@ -521,6 +536,16 @@ else
 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
 #
@@ -639,8 +664,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
 ])