diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-09 20:33:05 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-09 20:33:05 +0000 |
| commit | e92461aa232bbcbb14b23614b00fd58f9be279e6 (patch) | |
| tree | 2c686fa3b2427f23fe2c595bc502d3e48286f52c /configure.ac | |
| parent | 89fdc4f316990d60c22d21f8fd5885a49d710c57 (diff) | |
Merged revisions 294429 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r294429 | tilghman | 2010-11-09 14:27:23 -0600 (Tue, 09 Nov 2010) | 8 lines
Detect GMime properly on systems where gmime flags and libs are configured with pkg-config.
(closes issue #16155)
Reported by: jcollie
Patches:
20100917__issue16155.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@294430 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bacef335b..f59198587 100644 --- a/configure.ac +++ b/configure.ac @@ -1004,6 +1004,9 @@ else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long long], [Define to a type of the same size as fd_set.fds_bits[[0]]]) fi ; fi ; fi +# PKGCONFIG is used in later tests +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) + # do the package library checks now @@ -1968,6 +1971,21 @@ then 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) + 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 +fi AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], []) @@ -2108,7 +2126,6 @@ fi AC_SUBST(PBX_LAUNCHD) PBX_GTK2=0 -AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) if test ! "x${PKGCONFIG}" = xNo; then GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) |