Proper icon for attached messages in message view of gtk

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index 408bd46..3fb0354 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,6 @@ 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) 
@@ -176,7 +175,7 @@ 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
@@ -212,7 +211,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 +288,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 +343,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)