[cig-commits] commit: Adding an extra search path for X11.

[Mercurial]

changeset:   73:5cbb967910a8
user:        LukeHodkinson
date:        Thu Apr 10 02:31:32 2008 +0000
files:       config/SConfig/Package.py config/SConfig/packages/X11.py
description:
Adding an extra search path for X11.


diff -r 7cc44e193c2a -r 5cbb967910a8 config/SConfig/Package.py
--- a/config/SConfig/Package.py	Thu Apr 10 02:24:11 2008 +0000
+++ b/config/SConfig/Package.py	Thu Apr 10 02:31:32 2008 +0000
@@ -13,7 +13,7 @@ class Package(SConfig.Node):
         self.base_dirs           = [] #['']
         self.base_patterns       = [] #['']
         self.sub_dirs            = [] #[[[''], ['']]]
-        self.header_sub_dir      = [] #['']
+        self.header_sub_dirs     = [] #['']
         self.system_header_dirs  = []
         self.system_library_dirs = []
 
@@ -324,7 +324,7 @@ int main(int argc, char* argv[]) {
                 if os.path.exists(dir) and os.path.isdir(dir):
                     for hdr, lib in self.combine_sub_dirs(dir):
                         yield [dir, list(hdr), list(lib), list(fw)]
-                        for sub in self.combine_header_sub_dir(dir, hdr):
+                        for sub in self.combine_header_sub_dirs(dir, hdr):
                             yield [dir, list(sub), list(lib), list(fw)]
 
     def combine_sub_dirs(self, base_dir):
@@ -357,10 +357,10 @@ int main(int argc, char* argv[]) {
 
             yield (hdr_dirs, lib_dirs)
 
-    def combine_header_sub_dir(self, base_dir, hdr_dirs):
-        if not self.header_sub_dir or not hdr_dirs:
+    def combine_header_sub_dirs(self, base_dir, hdr_dirs):
+        if not self.header_sub_dirs or not hdr_dirs:
             return
-        for sub_dir in self.header_sub_dir:
+        for sub_dir in self.header_sub_dirs:
             cand = [os.path.join(h, sub_dir) for h in hdr_dirs if h]
             for d in cand:
                 path = os.path.join(base_dir, d)
diff -r 7cc44e193c2a -r 5cbb967910a8 config/SConfig/packages/X11.py
--- a/config/SConfig/packages/X11.py	Thu Apr 10 02:24:11 2008 +0000
+++ b/config/SConfig/packages/X11.py	Thu Apr 10 02:31:32 2008 +0000
@@ -4,7 +4,8 @@ class X11(SConfig.Package):
 class X11(SConfig.Package):
     def __init__(self, scons_env, scons_opts, required=False, **kw):
         SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
-        self.header_sub_dir = ['X11', 'X11R6']
+        self.base_dirs += ['/usr/X11R6']
+        self.header_sub_dirs = ['X11']
         self.headers = [['Xlib.h']]
         self.libraries = [['X11', 'Xmu']]
         self.symbols = [(['XOpenDisplay'], '')]