From 3ccc0d4603a7ee7635d2b5de8fac4891aef79f58 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 27 Nov 2009 19:40:09 +0000 Subject: [PATCH] Fix issues with pkg-config result not being read out properly always, resulting in gtk-stats not being built --- makepanda/makepanda.py | 2 +- makepanda/makepandacore.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 01f8943ed7..3c4cb32fda 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4154,7 +4154,7 @@ if (PkgSkip("PANDATOOL")==0): # DIRECTORY: pandatool/src/gtk-stats/ # -if (PkgSkip("PANDATOOL")==0 and (sys.platform.startswith("win") or PkgConfigHavePkg("gtk+-2.0"))): +if (PkgSkip("PANDATOOL")==0 and (sys.platform.startswith("win") or PkgSkip("GTK2")==0)): if (sys.platform.startswith("win")): OPTS=['DIR:pandatool/src/win-stats'] TargetAdd('pstats_composite1.obj', opts=OPTS, input='winstats_composite1.cxx') diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 6b120081cd..a6cb19c78b 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -908,7 +908,8 @@ def PkgConfigHavePkg(pkgname, tool = "pkg-config"): else: return bool(LocateBinary(tool) != None) result = handle.read().strip() - if handle.close() != 0: + returnval = handle.close() + if returnval != None and returnval != 0: return False return bool(len(result) > 0)