Also detect gmime 2.6
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>
Wed, 21 Mar 2012 14:47:56 +0000 (14:47 +0000)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Wed, 21 Mar 2012 14:47:56 +0000 (14:47 +0000)
Also detect gmime version 2.6 (Michael Biebl)

Signed-off-by: Tzafrir Cohen (License #5035) <tzafrir.cohen@xorcom.com>
........

Merged revisions 360087 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 360098 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360137 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure
configure.ac

index c109111..6d63be9 100755 (executable)
--- a/configure
+++ b/configure
@@ -27093,7 +27093,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
index d276a6f..92d58c6 100644 (file)
@@ -2070,7 +2070,7 @@ fi
 AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [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