dect/asterisk
Archived
14
0
Fork 0
Code Releases Activity

Merged revisions 294430 via svnmerge from

Browse source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r294430 | tilghman | 2010-11-09 14:33:05 -0600 (Tue, 09 Nov 2010) | 15 lines
  
  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/trunk@294431 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2010-11-09 20:35:05 +00:00
parent 89f74fccfe
commit d69f49a48b
3 changed files with 5241 additions and 30831 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36048
configure vendored
View file

File diff suppressed because it is too large Load diff

19
configure.ac
View file

@ -1007,6 +1007,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
@ -1971,6 +1974,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], [])
@ -2111,7 +2129,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)

5
include/asterisk/autoconfig.h.in
View file

@ -813,7 +813,7 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
/* Define to 1 if `st_blksize' is member of `struct stat'. */
/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */
@ -1088,6 +1088,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION