diff --git a/SConstruct b/SConstruct
index 582bc51183..d3ff632ae3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -102,6 +102,7 @@ vars.AddVariables(
                  allowed_values = ('release', 'devel', 'debug'),
                  ignorecase = 2
                  ),
+    PathVariable('wxconfig', 'Path to the wxconfig', None),
     ('CC', 'The c compiler', 'gcc'),
     ('CXX', 'The c++ compiler', 'g++'),
     )
diff --git a/SconsTests/utils.py b/SconsTests/utils.py
index 1671237da3..d507aca3ab 100644
--- a/SconsTests/utils.py
+++ b/SconsTests/utils.py
@@ -18,7 +18,7 @@ def CheckPKGConfig(context, version):
 
 def CheckFramework(context, name):
     ret = 0
-    if (platform.system() == 'darwin'):
+    if (platform.system().lower() == 'darwin'):
         context.Message( '\nLooking for framework %s... ' % name )
         lastLINKFLAGS = context.env['LINKFLAGS']
         context.env.Append(LINKFLAGS = [ '-framework', name ])
@@ -32,18 +32,19 @@ def CheckFramework(context, name):
 
     return ret
 
+# TODO: We should use the scons one instead
 def CheckLib(context, name):
     context.Message( 'Looking for lib %s... ' % name )
     lastLIBS = context.env['LIBS']
-    context.env.Append(LIBS = name)
+    context.env.Append(LIBS = [name])
     ret = context.TryLink("""
               int main(int argc, char **argv) {
-                return 1;
+                return 0;
               }
               """,'.c')
     if not ret:
         context.env.Replace(LIBS = lastLIBS)
-            
+
     return ret
 
 def ConfigPKG(context, name):
diff --git a/SconsTests/wxconfig.py b/SconsTests/wxconfig.py
index 148425d4f8..287eb65ea9 100644
--- a/SconsTests/wxconfig.py
+++ b/SconsTests/wxconfig.py
@@ -104,6 +104,9 @@ def CheckWXConfigPosixFind(context, debug):
     # Find a wx-config compatible pathname
     # wx*-config --> wx*-[0-9]+\.[0-9]+-config / wx<platform>-<version>-config
 
+    if (context.env['wxconfig']):
+        return context.env['wxconfig']
+
     dbglist = []
     rellist = []
     cfgre = re.compile('.*?\/wx(\w+?)(d?)-(\d+\.\d+)-config')
@@ -167,14 +170,17 @@ def CheckWXConfig(context, version, components, debug = False):
     context.env['wxconfig_postargs']= ''
 
     # Try to find it in path
-    wx_prog = context.env.WhereIs('wx-config')
-    if wx_prog == None:
-        # You could supply wx-config.exe as a fallback option.
-        #wx_prog = os.path.join('scons','wx-config')
-        context.Message('wx-config not found...')
-        return False
-    context.env['wxconfig'] = wx_prog
-
+    try:
+        context.env['wxconfig']
+    except KeyError:
+        wx_prog = context.env.WhereIs('wx-config')
+        if wx_prog == None:
+            # You could supply wx-config.exe as a fallback option.
+            #wx_prog = os.path.join('scons','wx-config')
+            context.Message('wx-config not found...')
+            return False
+        context.env['wxconfig'] = wx_prog
+    
     # Get wx-config invocation and check version
     if context.env['PLATFORM'] == 'win32':
         res = CheckWXConfigWin(context, version, debug)