Also fetch asyncrhonously embedded images in webkit.

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index b7333bd..d3bb200 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,8 @@ AM_PROG_CC_C_O
 AC_HEADER_STDC
 AC_PROG_LIBTOOL
 
+# Initialize pkg-config stuff
+PKG_PROG_PKG_CONFIG()
 
 # Option to enable debugging
 AC_ARG_ENABLE(debug,
@@ -103,14 +105,15 @@ AC_ARG_ENABLE(webkit,
               [with_webkit=yes], [with_webkit=no])
 
 if test "x$with_webkit" == "xyes" ; then
-PKG_CHECK_MODULES(MODEST_WEBKIT,webkit-1.0,have_webkit=true,have_webkit=false)
-MODEST_USE_WEBKIT=1
-AC_SUBST(MODEST_WEBKIT_CFLAGS)
-AC_SUBST(MODEST_WEBKIT_LIBS)
-AC_DEFINE_UNQUOTED(MODEST_USE_WEBKIT, 1, ["Whether modest is being build with webkit support."])
-AC_SUBST(MODEST_USE_WEBKIT)
+   PKG_CHECK_EXISTS(MODEST_WEBKIT,webkit-1.0,have_webkit=true,have_webkit=false)
+   AC_SUBST(MODEST_WEBKIT_CFLAGS)
+   AC_SUBST(MODEST_WEBKIT_LIBS)
+   AC_DEFINE_UNQUOTED(MODEST_USE_WEBKIT, 1, ["Whether modest is being build with webkit support."])
 fi
 
+AM_CONDITIONAL(MODEST_USE_WEBKIT,test "x$with_webkit" == "xyes")
+
+
 dnl -------
 dnl GtkHTML
 dnl -------
@@ -144,7 +147,7 @@ fi
 
 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 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0)
 AC_SUBST(MODEST_GSTUFF_CFLAGS)
 AC_SUBST(MODEST_GSTUFF_LIBS)
 
@@ -490,7 +493,9 @@ if test "x$with_platform" == "xmaemo"; then
    AC_SUBST(icon_scalabledir)
    AC_SUBST(pluginlibdir)
    AC_SUBST(plugindesktopentrydir)
-
+else
+   desktopentrydir=$datadir/applications   
+   AC_SUBST(desktopentrydir)
 fi
 
 dnl --------------- TESTING -------------------