From fb3988eb0966ef3ea5bb02f079d7b5d7a168c0c1 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 21 Sep 2009 09:59:47 +0000 Subject: [PATCH] Also work without pkg-config, for example mac doesn't have it by default --- makepanda/makepandacore.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 22d375099e..8c870ebc78 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -922,8 +922,6 @@ def GetLdCache(): def PkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None, framework = None, tool = "pkg-config"): global PKG_LIST_ALL - if (LocateBinary("pkg-config")==None): - exit("Failed to locate pkg-config binary!") if (pkgconfig == ""): pkgconfig = None if (framework == ""): @@ -974,7 +972,7 @@ def PkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None, fram else: print "%ERROR:%s Could not locate framework %s, aborting build" % (GetColor("red"), GetColor(), framework) exit() - elif (pkgconfig != None): + elif (LocateBinary("pkg-config") != None and pkgconfig != None): if (isinstance(pkgconfig, str)): if (PkgConfigHavePkg(pkgconfig, tool)): return PkgConfigEnable(pkg, pkgconfig, tool)