[pan2] compile fixes for glib (use 2.26.0 for dbus, 2.17.6 for versions without dbus)

[Heinrich MÃller <henmull src gnome org>]

commit fc21ab5b1db186647659d0938270556dbe2d894c
Author: Heinrich MÃlller <henmull src gnome org>
Date:   Thu May 3 17:48:13 2012 +0200

    compile fixes for glib (use 2.26.0 for dbus, 2.17.6 for versions without dbus)

 README       |    4 ++--
 configure.in |   22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/README b/README
index 18c6535..f18fa15 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@
 REQUIREMENTS
 
     Pan requires these libraries:
-    * GLib 2.26.0 or higher <http://developer.gnome.org/glib/>
+    * GLib 2.17.6 or higher <http://developer.gnome.org/glib/>
     * GTK+ 2.16.0 or higher (optionally GTK+ 3.0.0 or higher)
       <http://www.gtk.org/>
     * GMime 2.4.0 or higher <http://spruce.sourceforge.net/gmime/>
@@ -23,7 +23,7 @@ REQUIREMENTS
       <http://www.galago-project.org/news/index.php>
     * GNOME Keyring 3.2.0 or higher for password storage
       <https://live.gnome.org/GnomeKeyring>
-    * D-Bus for multiple Pan instances
+    * D-Bus for multiple Pan instances (Glib 2.26.0 or newer needed!)
       <http://www.freedesktop.org/wiki/Software/dbus>
     * GnuTLS 2.12.10 or higher for encrypted connections (TLS 1.0)
       <http://www.gnu.org/software/gnutls/>
diff --git a/configure.in b/configure.in
index a9e5dc6..827534e 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,8 @@ AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl glib, gmime, and gtk are mandatory prerequisites.
-GLIB_REQUIRED=2.26.0
+GLIB_REQUIRED=2.17.6
+GLIB_REQUIRED_FOR_DBUS=2.26.0
 GMIME24_REQUIRED=2.4.0
 GMIME26_REQUIRED=2.5.5
 GTK_REQUIRED=2.16.0
@@ -53,6 +54,7 @@ GNUTLS_REQUIRED=2.12.10
 LIBNOTIFY_REQUIRED=0.4.1
 LIBGKR_REQUIRED=3.2.0
 AC_SUBST(GLIB_REQUIRED)
+AC_SUBST(GLIB_REQUIRED_FOR_DBUS)
 AC_SUBST(GMIME_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
 AC_SUBST(GTKSPELL_REQUIRED)
@@ -85,7 +87,14 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext package name]
 AM_GLIB_GNU_GETTEXT
 panlocaledir='${prefix}/${DATADIRNAME}/locale'
 
-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,exit 1,gobject gmodule gthread)
+dnl D-Bus support
+AC_ARG_WITH(dbus, AS_HELP_STRING([--with-dbus],[enable D-Bus support (normally: no)]), [want_dbus=$withval], [want_dbus=no])
+if test "x$want_dbus" = "xyes" ; then
+  AM_PATH_GLIB_2_0($GLIB_REQUIRED_FOR_DBUS,AC_DEFINE(HAVE_DBUS,[1],[D-Bus support for multiple Pan instances],exit 1,gobject gmodule gthread))
+else
+  AM_PATH_GLIB_2_0($GLIB_REQUIRED,,exit 1,gobject gmodule gthread)	
+fi
+
 
 dnl Check for GMime
 PKG_CHECK_MODULES([GMIME], [gmime-2.6 >= $GMIME26_REQUIRED],[have_gmime26=yes],
@@ -104,11 +113,6 @@ if test "x$have_gmime26" = "xyes" ; then
   fi
 fi
 
-dnl D-Bus support
-AC_ARG_WITH(dbus, AS_HELP_STRING([--with-dbus],[enable D-Bus support (normally: yes)]), [want_dbus=$withval], [want_dbus=no])
-if test "x$want_dbus" = "xyes" ; then
-  PKG_CHECK_MODULES([LIBGIO],[gio-2.0 >= $GLIB_REQUIRED],AC_DEFINE(HAVE_DBUS,[1],[D-Bus support for multiple Pan instances]),[])
-fi
 
 dnl GtkSpell support
 gtkspell_msg=no
@@ -171,7 +175,7 @@ fi
 
 dnl Check for libnotify if user-enabled for popup notifications
 AC_ARG_ENABLE([libnotify],
-AS_HELP_STRING([--enable-libnotify],[enable libnotify support (normally: yes)]),[enable_libnotify=$enableval],[enable_libnotify=no])
+AS_HELP_STRING([--enable-libnotify],[enable libnotify support (normally: no)]),[enable_libnotify=$enableval],[enable_libnotify=no])
 if test "x$enable_libnotify" = "xyes" ; then
   PKG_CHECK_MODULES([LIBNOTIFY],[libnotify >= $LIBNOTIFY_REQUIRED],[HAVE_LIBNOTIFY="yes"],[HAVE_LIBNOTIFY="no"])
   AC_SUBST([LIBNOTIFY_CFLAGS])
@@ -183,7 +187,7 @@ fi
 
 dnl Check for gnome-keyring if user-enabled for password storage
 AC_ARG_ENABLE([gkr],
-AS_HELP_STRING([--enable-gkr],[enable gnome-keyring support (normally: yes)]),[enable_gkr=$enableval],[enable_gkr=no])
+AS_HELP_STRING([--enable-gkr],[enable gnome-keyring support (normally: no)]),[enable_gkr=$enableval],[enable_gkr=no])
 if test "x$enable_gkr" = "xyes" ; then
   PKG_CHECK_MODULES([LIBGNOME_KEYRING_1],[gnome-keyring-1 >= $LIBGKR_REQUIRED],[HAVE_GKR="yes"],[HAVE_GKR="no"])
   AC_SUBST([LIBGNOME_KEYRING_1_CFLAGS])