X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=53571f29d02fd79261699b2eb55b6da4a95fc008;hb=HEAD;hp=408bd4655845a65fe80f11282841ae1d999a3cce;hpb=19d37f096c8a856e4b1d8ae8062075ca47312b89;p=modest

diff --git a/configure.ac b/configure.ac
index 408bd46..53571f2 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.90],[http://maemo.org])
+AC_INIT([modest],[3.90.6],[http://maemo.org])
 AC_CONFIG_HEADERS([config.h])
 
 m4_define([modest_api_major_version], [1])
@@ -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,
@@ -92,6 +94,24 @@ if test "x$with_gcov" == "xyes" ; then
 	LDFLAGS="$LDFLAGS -lgcov"
 fi
 
+dnl ------
+dnl WebKit
+dnl ------
+
+# Option to enable debugging
+with_webkit=no
+AC_ARG_ENABLE(webkit,
+              [AC_HELP_STRING([--enable-webkit],[Enable webkit support (default=no)])],
+              [with_webkit=yes], [with_webkit=no])
+
+if test "x$with_webkit" == "xyes" ; then
+   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 -------
@@ -125,10 +145,9 @@ else
    AC_MSG_ERROR([install gtkhtml 3.8 or newer])
 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 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)
 
@@ -176,11 +195,13 @@ fi
 
 if test "$with_platform" = "maemo"; then
    	MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_MAEMO -DMODEST_API_VERSION=${MODEST_API_VERSION}"
-	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)
 elif test "$with_platform" = "gnome"; then
 	MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME -DMODEST_API_VERSION=${MODEST_API_VERSION}"
 fi
 AC_SUBST(MODEST_PLUGIN_DEFINES)
+AM_CONDITIONAL(MODEST_BUILD_ASDBUS,test "x$with_platform" == "xmaemo")
+
 
 dnl ---------- PLATFORM: *DBUS API* -----------
 if test "x$with_platform" == "xgnome"; then
@@ -212,7 +233,7 @@ have_gtk=false
 
 if test "$MODEST_TOOLKIT" = "detect"; then
    PKG_CHECK_EXISTS(hildon-1 >= 2.1.0 hildon-fm-2, have_hildon2=true, have_hildon2=false)
-   PKG_CHECK_EXISTS(glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify gtksourceview-2.0, have_gtk=true, have_gtk=false)
+   PKG_CHECK_EXISTS(glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify, have_gtk=true, have_gtk=false)
    if test "x$have_hildon2" = "xtrue"; then
       detected_toolkit=hildon2
       hildon_api=`$PKG_CONFIG --modversion hildon-1 | cut -d. -f1`
@@ -289,22 +310,18 @@ fi
 AC_SUBST(MAEMO_LAUNCHER_MODEST_LDFLAGS)
 
 dnl --------------- EDITOR -----------
-if test "x$with_toolkit" != "xgtk"; then
-   PKG_CHECK_MODULES(MODEST_WPEDITOR,wpeditor,have_wpeditor=true,have_wpeditor=false)
-   if test "x$have_wpeditor" == "xfalse"; then
-      PKG_CHECK_MODULES(MODEST_WPEDITOR,libwpeditor-plus,have_libwpeditorplus=true,have_libwpeditorplus=false)
-      if test "x$have_libwpeditorplus" == "xtrue"; then
-      	wpeditor="libwpeditor-plus"
-	AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBWPEDITOR_PLUS, 1, ["Whether libwpeditor-plus is used."])
-      else
-	AC_MSG_ERROR([you need to have either wpeditor or libwpeditor-plus installed])
-      fi
+PKG_CHECK_MODULES(MODEST_WPEDITOR,wpeditor,have_wpeditor=true,have_wpeditor=false)
+if test "x$have_wpeditor" == "xfalse"; then
+   PKG_CHECK_MODULES(MODEST_WPEDITOR,libwpeditor-plus,have_libwpeditorplus=true,have_libwpeditorplus=false)
+   if test "x$have_libwpeditorplus" == "xtrue"; then
+      wpeditor="libwpeditor-plus"
+      AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBWPEDITOR_PLUS, 1, ["Whether libwpeditor-plus is used."])
    else
-	wpeditor="wpeditor"
-	AC_DEFINE_UNQUOTED(MODEST_HAVE_WPEDITOR, 1, ["Whether wpeditor is used."])
+      AC_MSG_ERROR([you need to have either wpeditor or libwpeditor-plus installed])
    fi
 else
-   PKG_CHECK_EXISTS(gtksourceview-2.0, []. [])
+   wpeditor="wpeditor"
+   AC_DEFINE_UNQUOTED(MODEST_HAVE_WPEDITOR, 1, ["Whether wpeditor is used."])
 fi
 
 dnl --------------- LIBALARM -----------
@@ -348,6 +365,10 @@ else
 fi
 fi
 
+if test "x$with_toolkit" != "xgtk"; then
+MODEST_TOOLKIT_CFLAGS="$MODEST_TOOLKIT_CFLAGS -DMAEMO_CHANGES"
+fi
+
 dnl --------------- NOTIFICATION STUFF -----------
 if test "x$with_toolkit" != "xgtk"; then
    PKG_CHECK_MODULES(MODEST_HILDON_NOTIFY,hildon-notify libnotify,have_hildon_notify=true,have_hildon_notify=false)
@@ -474,7 +495,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 -------------------