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: https://origsvn.digium.com/svn/asterisk/branches/1.8@320560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2011-05-23 15:47:14 +00:00
parent e93e73c302
commit 8c5bfd1eee
2 changed files with 414 additions and 494 deletions

904
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -1993,7 +1993,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
@@ -2147,7 +2147,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