dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 320560 via svnmerge from 

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

........
  r320560 | kpfleming | 2011-05-23 10:47:14 -0500 (Mon, 23 May 2011) | 4 lines
  
  Don't generate spurious "No: command not found" messages when running the
  configure script on a system that has neither gmime-config nor pkg-config.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@320561 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2011-05-23 15:48:37 +00:00
parent 90da28ff05
commit d8c33b60bf
3 changed files with 5035 additions and 31710 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36730
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
configure.ac
View File

@ -2018,7 +2018,7 @@ 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
if test "x${PBX_GMIME}" = "x0" -a "${PKGCONFIG}" != "No"; then
# Later versions of GMime use pkg-config
for ver in 2.0 2.2 2.4; do
if ! ${PKGCONFIG} --exists gmime-$ver; then
@ -2172,7 +2172,7 @@ fi
AC_SUBST(PBX_LAUNCHD)
PBX_GTK2=0
if test ! "x${PKGCONFIG}" = xNo; then
if test "${PKGCONFIG}" != "No"; then
GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
PBX_GTK2=1

11
include/asterisk/autoconfig.h.in
View File

@ -830,16 +830,16 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
/* 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 `cr_uid' is member of `struct ucred'. */
/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_CR_UID
/* Define to 1 if `uid' is member of `struct ucred'. */
/* Define to 1 if `uid' is a member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_UID
/* Define to 1 if you have the mISDN Supplemental Services library. */
@ -1117,6 +1117,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