[asterisk-commits] kpfleming: branch 1.8 r320560 - in /branches/1.8: configure configure.ac

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon May 23 10:47:14 2011
New Revision: 320560

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320560
Log:
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.


Modified:
    branches/1.8/configure
    branches/1.8/configure.ac

Modified: branches/1.8/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configure.ac?view=diff&rev=320560&r1=320559&r2=320560
==============================================================================
--- branches/1.8/configure.ac (original)
+++ branches/1.8/configure.ac Mon May 23 10:47:14 2011
@@ -1993,7 +1993,7 @@
 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 @@
 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