[asterisk-commits] russell: trunk r72767 - in /trunk: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jun 30 11:53:25 2007
New Revision: 72767

URL: http://svn.digium.com/view/asterisk?view=rev&rev=72767
Log:
Merged revisions 72766 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r72766 | russell | 2007-06-30 11:50:40 -0500 (Sat, 30 Jun 2007) | 3 lines

Tweak the configure script so that error output isn't spewed to the console
when searching for GTK2 libs, and they aren't found.

........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

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

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=72767&r1=72766&r2=72767
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sat Jun 30 11:53:25 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 72701 .
+# From configure.ac Revision: 72738 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -35644,7 +35644,7 @@
 fi
 
 if test ! "x${PKGCONFIG}" = xNo; then
-   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags)
+   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
    GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
    PBX_GTK2=1
 

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=72767&r1=72766&r2=72767
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Jun 30 11:53:25 2007
@@ -1033,7 +1033,7 @@
 PBX_GTK2=0
 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
 if test ! "x${PKGCONFIG}" = xNo; then
-   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags)
+   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
    GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
    PBX_GTK2=1
    AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.])