kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 72766 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2007-06-30 16:53:25 +00:00
parent 8a9bc541ee
commit 8a4447c45a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 72701 . # From configure.ac Revision: 72738 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61. # Generated by GNU Autoconf 2.61.
# #
@@ -35644,7 +35644,7 @@ else
fi fi
if test ! "x${PKGCONFIG}" = xNo; then 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) GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
PBX_GTK2=1 PBX_GTK2=1

2
configure.ac
View File

@@ -1033,7 +1033,7 @@ AC_SUBST(GTK_LIB)
PBX_GTK2=0 PBX_GTK2=0
AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
if test ! "x${PKGCONFIG}" = xNo; then 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) GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
PBX_GTK2=1 PBX_GTK2=1
AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.]) AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.])