allow configure to pick up PKG_CONFIG

This commit is contained in:
vanhauser-thc 2021-02-19 09:19:05 +01:00 committed by yvain douard
commit f0c1bae20e

6
configure vendored
View file

@ -17,10 +17,12 @@ if [ "$1" = "-h" -o "$1" = "--help" ]; then
echo " --help this here" echo " --help this here"
echo echo
echo If the CC environment variable is set, this is used as the compiler for the configure tests. The default is \"gcc\" otherwise. echo If the CC environment variable is set, this is used as the compiler for the configure tests. The default is \"gcc\" otherwise.
echo You can also set PKG_CONFIG if necessary.
exit 0 exit 0
fi fi
test -z "$CC" && CC=gcc test -z "$CC" && CC=gcc
test -z "$PKG_CONFIG" && PKG_CONFIG=pkg-config
FHS="" FHS=""
SIXFOUR="" SIXFOUR=""
@ -1305,9 +1307,9 @@ echo "Checking for smbclient (libsmbclient/libsmbclient.h) ..."
if [ "X" = "X$XHYDRA_SUPPORT" ]; then if [ "X" = "X$XHYDRA_SUPPORT" ]; then
echo "Checking for GUI req's (pkg-config/gtk+-2.0) ..." echo "Checking for GUI req's (pkg-config/gtk+-2.0) ..."
XHYDRA_SUPPORT=`pkg-config --help > /dev/null 2>&1 || echo disabled` XHYDRA_SUPPORT=`$PKG_CONFIG --help > /dev/null 2>&1 || echo disabled`
if [ "X" = "X$XHYDRA_SUPPORT" ]; then if [ "X" = "X$XHYDRA_SUPPORT" ]; then
XHYDRA_SUPPORT=`pkg-config --modversion gtk+-2.0 2> /dev/null` XHYDRA_SUPPORT=`$PKG_CONFIG --modversion gtk+-2.0 2> /dev/null`
else else
XHYDRA_SUPPORT="" XHYDRA_SUPPORT=""
fi fi