diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-06-30 16:53:25 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-06-30 16:53:25 +0000 |
| commit | 8a4447c45ad844105290ca22a7ad261903180e47 (patch) | |
| tree | ec47dde77ccaf91ec21003c8f6fb6fde58f3514e | |
| parent | 8a9bc541eecf1d959f71317c1e0d3c2f4eff2b2c (diff) | |
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/configure.ac b/configure.ac index 4c4a48c7a..4000f022d 100644 --- a/configure.ac +++ b/configure.ac @@ -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.]) |