kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 294429 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.8@294430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-11-09 20:33:05 +00:00
parent 3f9644b7db
commit 2d6a9d607f
3 changed files with 5241 additions and 30831 deletions
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

@@ -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]]]) 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 fi ; fi ; fi
# PKGCONFIG is used in later tests
AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
# do the package library checks now # do the package library checks now
@@ -1968,6 +1971,21 @@ then
fi fi
AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#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], []) AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
@@ -2108,7 +2126,6 @@ fi
AC_SUBST(PBX_LAUNCHD) AC_SUBST(PBX_LAUNCHD)
PBX_GTK2=0 PBX_GTK2=0
AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
if test ! "x${PKGCONFIG}" = xNo; then if test ! "x${PKGCONFIG}" = xNo; then
GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) 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. */ /* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ #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 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */ /* 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. */ /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION