[asterisk-commits] tzafrir: trunk r360137 - in /trunk: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Wed Mar 21 09:47:56 2012
New Revision: 360137

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=360137
Log:
Also detect gmime 2.6

Also detect gmime version 2.6 (Michael Biebl)

Signed-off-by: Tzafrir Cohen (License #5035) <tzafrir.cohen at 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

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=360137&r1=360136&r2=360137
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Mar 21 09:47:56 2012
@@ -2070,7 +2070,7 @@
 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