diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-16 14:38:16 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-16 14:38:16 +0000 |
| commit | ff7075434235df8d2f00fa2a95a5be827857d0d5 (patch) | |
| tree | 8452b61049b34cf8033c40a5a2482242e2e77514 /configure.ac | |
| parent | 72e2119502513f16586cc9390a6e4c3d907e0932 (diff) | |
Merged revisions 319085 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r319085 | pabelanger | 2011-05-16 10:35:21 -0400 (Mon, 16 May 2011) | 10 lines
Support gmime-2.4
(closes issue #18863)
Reported by: tzafrir
Patches:
gmime-2.4-18.diff uploaded by tzafrir (license 46)
Tested by: tzafrir
Review: https://reviewboard.asterisk.org/r/1213/
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@319086 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 4e19d4b83..e3950e81d 100644 --- a/configure.ac +++ b/configure.ac @@ -2018,18 +2018,17 @@ 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"; then # Later versions of GMime use pkg-config - if test "x${PKGCONFIG}" = xNo; then :; else - GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null) - GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs) - if test "x${GMIME_INCLUDE}${GMIME_LIB}" = "x"; then - GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.2 --cflags 2>/dev/null) - GMIME_LIB=$(${PKGCONFIG} gmime-2.2 --libs) + for ver in 2.0 2.2 2.4; do + if ! ${PKGCONFIG} --exists gmime-$ver; then + continue fi - if test "x${GMIME_INCLUDE}${GMIME_LIB}" != "x"; then - PBX_GMIME=1 - AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.]) - fi - fi + # If we got here, we have this version: + GMIME_INCLUDE=$(${PKGCONFIG} gmime-$ver --cflags 2>/dev/null) + GMIME_LIB=$(${PKGCONFIG} gmime-$ver --libs) + PBX_GMIME=1 + AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.]) + break; + done fi AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], []) |