[totem-pl-parser/gnome-2-28] Fix compilation with gmime-2.6
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem-pl-parser/gnome-2-28] Fix compilation with gmime-2.6
- Date: Mon, 12 Apr 2010 11:58:58 +0000 (UTC)
commit 6b6ec7f364d910d96f63190d762cffea710a5ab2
Author: Bastien Nocera <hadess hadess net>
Date: Mon Apr 12 12:55:53 2010 +0100
Fix compilation with gmime-2.6
configure.in | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index fbbb1e2..7c956fe 100644
--- a/configure.in
+++ b/configure.in
@@ -73,14 +73,20 @@ AC_ARG_ENABLE(gmime-i-know-what-im-doing,
if test "x$enable_gmime" = "xyes" ; then
PKG_CHECK_MODULES(GMIME,
gmime-2.4,
- [have_gmime=yes],
+ [have_gmime=yes GMIME=gmime-2.4],
[have_gmime=no])
+ if test "x$have_gmime" != "xyes" ; then
+ PKG_CHECK_MODULES(GMIME,
+ gmime-2.6,
+ [have_gmime=yes GMIME=gmime-2.6],
+ [have_gmime=no])
+ fi
if test "x$have_gmime" = "xyes" ; then
- AC_SUBST(GMIME, gmime-2.4)
+ AC_SUBST(GMIME, $GMIME)
AC_SUBST(USEGMIME, yes)
AC_DEFINE(HAVE_GMIME, 1, [GMime available in the system])
- pkg_modules="$pkg_modules gmime-2.4"
+ pkg_modules="$pkg_modules $GMIME"
else
AC_MSG_ERROR([libgmime is required to compile totem-pl-parser.])
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]