From 0a7a11111f3d8c19a21fb124dba4a821876d973c Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 1 Apr 2007 18:00:19 +0000 Subject: [PATCH] detect wx-config before trying to run it (part of bug #1672315) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5028 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSIS Menu/SConscript | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Contrib/NSIS Menu/SConscript b/Contrib/NSIS Menu/SConscript index b89ee339..bf8cfcc5 100644 --- a/Contrib/NSIS Menu/SConscript +++ b/Contrib/NSIS Menu/SConscript @@ -46,10 +46,11 @@ Import('BuildUtil env') import os from os.path import join -if env['PLATFORM'] != 'win32' or os.environ.has_key('WXWIN'): +if env['PLATFORM'] != 'win32' and WhereIs('wx-config') or \ + env['PLATFORM'] == 'win32' and os.environ.has_key('WXWIN'): # build - + if env['PLATFORM'] != 'win32': rc = libs = [] @@ -93,7 +94,10 @@ else: # no wxWidgets def err(target, source, env): - print '*** error: WXWIN must be set to build NSIS Menu!' + if env['PLATFORM'] == 'win32': + print '*** error: WXWIN must be set to build NSIS Menu!' + else: + print '*** error: wx-config must be in the PATH to build NSIS Menu!' return 1 cmd = env.Command(target, files, Action(err, ''))