From d0932f4a14ef5fcc7286f6f3ec5f740a84ba11bb Mon Sep 17 00:00:00 2001
From: Philippe Groarke <philippe.groarke@savoirfairelinux.com>
Date: Wed, 8 Oct 2014 13:27:56 -0400
Subject: [PATCH] daemon: fix pkg-config check for mingw
Test if empty first, so we don't override mingw pkg-config directory.
Refs #56437
Change-Id: Ifb3c918a434aa697f81c92965cdb614b50728dc4
---
daemon/autogen.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/daemon/autogen.sh b/daemon/autogen.sh
index 5ff82d15c7..6980c6c34d 100755
--- a/daemon/autogen.sh
+++ b/daemon/autogen.sh
@@ -6,11 +6,10 @@ if test -z $AUTORECONF; then
exit 1
fi
-PKGCONFIG=`which pkg-config`
-if test -z $PKGCONFIG; then
- echo "*** No pkg-config found, please install it ***"
- # warn without exiting, since pkg-config is only needed
- # by configure, not autogen.sh
+if !"${PKG_CONFIG:-pkg-config}" --version >/dev/null 2>&1; then
+ echo "*** No pkg-config found, please install it ***"
+ # warn without exiting, since pkg-config is only needed
+ # by configure, not autogen.sh
fi
LIBTOOLIZE=`which libtoolize || which glibtoolize`
--
GitLab