From: Tzafrir Cohen Date: Wed, 21 Mar 2012 14:21:14 +0000 (+0000) Subject: Also detect gmime 2.6 X-Git-Tag: 10.3.0~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ba59f01884ab0aaf5cce3bb95173c6631c2e257;p=thirdparty%2Fasterisk.git Also detect gmime 2.6 Also detect gmime version 2.6 (Michael Biebl) Signed-off-by: Tzafrir Cohen (License #5035) ........ Merged revisions 360087 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@360098 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configure b/configure index 96c3e3fa57..db9b0064bb 100755 --- a/configure +++ b/configure @@ -27175,7 +27175,7 @@ $as_echo "#define HAVE_GMIME 1" >>confdefs.h if test "x${PBX_GMIME}" = "x0" -a "${PKGCONFIG}" != "No"; then # Later versions of GMime use pkg-config - for ver in 2.0 2.2 2.4; do + for ver in 2.0 2.2 2.4 2.6; do if ! ${PKGCONFIG} --exists gmime-$ver; then continue fi diff --git a/configure.ac b/configure.ac index 40afdfa75e..2bb233fdc7 100644 --- a/configure.ac +++ b/configure.ac @@ -2078,7 +2078,7 @@ fi AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include ], [gboolean q = g_mime_check_version(0,0,0);]) if test "x${PBX_GMIME}" = "x0" -a "${PKGCONFIG}" != "No"; then # Later versions of GMime use pkg-config - for ver in 2.0 2.2 2.4; do + for ver in 2.0 2.2 2.4 2.6; do if ! ${PKGCONFIG} --exists gmime-$ver; then continue fi