diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-09 20:27:23 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-09 20:27:23 +0000 |
| commit | 6c40c45239be5556b9114cc6366c445eafe2127e (patch) | |
| tree | fc33b3b0985f8d0958847f12c3d54bd35fe79f04 /configure.ac | |
| parent | 4d11483fd21fda9f6c57f43a03dab74208b0dd0a (diff) | |
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.6.2@294429 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c2a913337..2d07c8c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -818,6 +818,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 @@ -1708,7 +1711,22 @@ then AST_CHECK_OSPTK([3], [5], [0]) fi -AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);]) +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], []) @@ -1845,7 +1863,6 @@ PBX_GTK=0 AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread]) 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) |