[pan2] Adjust configure.in



commit 9d0155bccbe89a6e24f6f488f9755f70da845812
Author: Petr Kovar <pkovar redhat com>
Date:   Tue Jan 3 23:19:31 2012 +0100

    Adjust configure.in

 configure.in |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index 3b4721f..288280d 100644
--- a/configure.in
+++ b/configure.in
@@ -45,10 +45,10 @@ dnl
 dnl GtkSpell is optional: GTKSPELL_REQUIRED refers to the minimum version
 dnl needed if you want to build Pan with spellchecking in the Post window.
 
-GLIB_REQUIRED=2.14.0
+GLIB_REQUIRED=2.17.6
 GMIME_REQUIRED=2.6.0
 GTK_REQUIRED=2.16.0
-GTK3_REQUIRED=3.0.0
+GTK3_REQUIRED=3.0.0g
 GTKSPELL_REQUIRED=2.0.7
 GNUTLS_REQUIRED=3.0.9
 LIBNOTIFY_REQUIRED=0.4.1
@@ -85,12 +85,11 @@ AM_GLIB_GNU_GETTEXT
 panlocaledir='${prefix}/${DATADIRNAME}/locale'
 
 AM_PATH_GLIB_2_0($GLIB_REQUIRED,,exit 1,gobject gmodule gthread)
-PKG_CHECK_MODULES([GMIME], [ gmime-2.6    >= $GMIME_REQUIRED ], [],
-	[PKG_CHECK_MODULES( [GMIME], [gmime-2.4    >= $GMIME_REQUIRED] )] )
+PKG_CHECK_MODULES([GMIME], [gmime-2.6 >= $GMIME_REQUIRED],[],)
 
 AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Enable DBUS support]), [want_dbus=$withval], [want_dbus=yes])
 if test "x$want_dbus" = "xyes" ; then
-  AC_DEFINE(HAVE_DBUS,[1],[DBUS Support for multiple pan instances])],
+  AC_DEFINE(HAVE_DBUS,[1],[DBUS support for multiple Pan instances]),
 fi
 
 gtkspell_msg=no
@@ -104,7 +103,7 @@ if test "x$want_gtkspell" = "xyes" ; then
 fi
 
 gtk_msg=no
-AC_ARG_WITH(gtk3, AC_HELP_STRING([--with-gtk3], [Enable gtk3 support]), [want_gtk3=$withval], [want_gtk3=no])
+AC_ARG_WITH(gtk3, AC_HELP_STRING([--with-gtk3], [Enable GTK3 support]), [want_gtk3=$withval], [want_gtk3=no])
 if test "x$want_gtk3" = "xyes" ; then
 	PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK3_REQUIRED],
 	                  [gtk_msg="yes >= $GTK3_REQUIRED"
@@ -117,7 +116,7 @@ fi
 gnutls_msg=no
 AC_ARG_WITH(gnutls, AC_HELP_STRING([--with-gnutls], [Enable GnuTLS support]), [want_gnutls=$withval], [want_gnutls=no])
 if test "x$want_gnutls" = "xyes" ; then
-  PKG_CHECK_MODULES([GNUTLS], [gnutls >= $GNUTLS_REQUIRED],
+  PKG_CHECK_MODULES([GNUTLS],[gnutls >= $GNUTLS_REQUIRED],
   [gnutls_msg="yes >= $GNUTLS_REQUIRED"
   AC_DEFINE(HAVE_GNUTLS,[1],[GnuTLS])],
   [gnutls_msg=no



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]