Branch: master

e3a99f67 2014-09-23 18:06:28 Timothy Pearson
Set python library for all modules
This relates to Bug 1995
M configure.py
diff --git a/configure.py b/configure.py
index 7ffc143..aa29ae6 100644
--- a/configure.py
+++ b/configure.py
@@ -266,24 +266,24 @@
         generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
 
         if "qtext" in pyqt_modules:
-            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags)
+            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"]+extra_libs, sip_flags=qtext_sip_flags)
 
         if "qtgl" in pyqt_modules:
-            generate_code("qtgl", opengl=1)
+            generate_code("qtgl", opengl=1, extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
 
         if "qtpe" in pyqt_modules:
-            generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags)
+            generate_code("qtpe", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=["qpe"]+extra_libs, sip_flags=qtpe_sip_flags)
 
         if "qtui" in pyqt_modules:
-            generate_code("qtui", extra_libs=["tqui"])
+            generate_code("qtui", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=["tqui"]+extra_libs)
 
         if "qtaxcontainer" in pyqt_modules:
-            generate_code("qtaxcontainer", extra_libs=["qaxcontainer"])
+            generate_code("qtaxcontainer", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=["qaxcontainer"]+extra_libs)
 
         # The rest don't need special handling.
         for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"):
             if m in pyqt_modules:
-                generate_code(m)
+                generate_code(m, extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
 
     def tools(self):
         tool_dirs = []