[Asterisk-code-review] menuselect: invalid test for GTK2 (asterisk[11])

Tzafrir Cohen asteriskteam at digium.com
Sun Oct 16 22:30:48 CDT 2016


Tzafrir Cohen has uploaded a new change for review.

  https://gerrit.asterisk.org/4123

Change subject: menuselect: invalid test for GTK2
......................................................................

menuselect: invalid test for GTK2

ASTERISK-26356 #close

Change-Id: I8079d515d6ea99f9ab320a7eaa71c2aaa101ccd5
---
M menuselect/configure
M menuselect/configure.ac
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/23/4123/1

diff --git a/menuselect/configure b/menuselect/configure
index 4424594..787173f 100755
--- a/menuselect/configure
+++ b/menuselect/configure
@@ -4847,7 +4847,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK2 support" >&5
 $as_echo_n "checking GTK2 support... " >&6; }
-if test ! "x${PKGCONFIG}" = xNo; then
+if test ! "x${PKGCONFIG}" = xNo && pkg-config gtk+-2.0; then
    GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
    GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
    PBX_GTK2=1
diff --git a/menuselect/configure.ac b/menuselect/configure.ac
index a2d6f18..6705f67 100644
--- a/menuselect/configure.ac
+++ b/menuselect/configure.ac
@@ -137,7 +137,7 @@
 PBX_GTK2=0
 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
 AC_MSG_CHECKING([GTK2 support])
-if test ! "x${PKGCONFIG}" = xNo; then
+if test ! "x${PKGCONFIG}" = xNo && pkg-config gtk+-2.0; then
    GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
    GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)   
    PBX_GTK2=1

-- 
To view, visit https://gerrit.asterisk.org/4123
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8079d515d6ea99f9ab320a7eaa71c2aaa101ccd5
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Tzafrir Cohen <tzafrir.cohen at xorcom.com>



More information about the asterisk-code-review mailing list