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, ''))