[svn-commits] kpfleming: trunk r320561 - in /trunk: ./ include/asterisk/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon May 23 10:48:37 2011
New Revision: 320561

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

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=320561&r1=320560&r2=320561
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon May 23 10:48:37 2011
@@ -2018,7 +2018,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
@@ -2172,7 +2172,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

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=320561&r1=320560&r2=320561
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Mon May 23 10:48:37 2011
@@ -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. */
@@ -1116,6 +1116,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