[PATCH 1/5] subsurface-configure.pri: pkg-config detection change

[Thiago Macieira]

On quarta-feira, 9 de outubro de 2013 21:35:48, Lubomir I. Ivanov wrote:
> From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
> 
> 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 <neolit123 at gmail.com>
> ---
>  subsurface-configure.pri | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/subsurface-configure.pri b/subsurface-configure.pri
> index 484092b..88907c1 100644
> --- a/subsurface-configure.pri
> +++ b/subsurface-configure.pri
> @@ -27,7 +27,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")

+1
-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
   Software Architect - Intel Open Source Technology Center
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20131009/a08181a9/attachment.sig>