Merged revisions 72766 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Sat, 30 Jun 2007 16:53:25 +0000 (16:53 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 30 Jun 2007 16:53:25 +0000 (16:53 +0000)
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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72767 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure
configure.ac

index 6fe46d8..6afbbb1 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 @@ else
 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
 
index 4c4a48c..4000f02 100644 (file)
@@ -1033,7 +1033,7 @@ AC_SUBST(GTK_LIB)
 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.])