From a3ee9a11427c361ac23c0e7b14f1cb72eab34003 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 10 Oct 2013 01:18:48 +0300 Subject: subsurface-configure.pri: pkg-config detection change This is a small change, but it seems to work as expected on both Linux and Win32. What happens if 2> NUL > NUL is used on Win32 for cmd.exe is that the output of both stdout and stderr seems to pipe into NUL and pkg-config is always reported as missing. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- subsurface-configure.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'subsurface-configure.pri') diff --git a/subsurface-configure.pri b/subsurface-configure.pri index c06d1c14d..903d6a84d 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -28,7 +28,8 @@ CONFIG += exceptions_off # Check if we have pkg-config equals($$QMAKE_HOST.os, "Windows"):NUL=NUL else:NUL=/dev/null -system(pkg-config --version 2>$$NUL >$$NUL) { +PKG_CONFIG_OUT = $$system(pkg-config --version 2> $$NUL) +!isEmpty(PKG_CONFIG_OUT) { CONFIG += link_pkgconfig } else { message("pkg-config not found, no detection performed. See README for details") -- cgit v1.2.3-70-g09d2