[PyQt] [PyQt-4.4.3] Qt Designer plugin build failure (patch)

[Jason Kankiewicz]

To Whom it May Concern,
  The PyQt-4.4.3 configuration script fails to include the Qt Designer 
plugin in the build and to produce a working make file for it in an 
environment containing multiple platform-specific builds of Python 
because it is written to assume only one.

  The attached patch should fix this problem.

  In addition, it would be nice if the configuration script provided a 
command line option to explicitly disable building the Qt Designer 
plugin for the situation where multiple platform-specific Python builds 
link to the same installation of Qt; "--plugin-destdir=/dev/null" (*nix) 
or "--plugin-destdir=NUL" (windows) is wasteful.

Regards,
Jason
-------------- next part --------------
diff -Naur PyQt-x11-commercial-4.4.3/configure.py PyQt-x11-commercial-4.4.3_patched/configure.py
--- PyQt-x11-commercial-4.4.3/configure.py	2008-08-08 07:08:33.000000000 -0700
+++ PyQt-x11-commercial-4.4.3_patched/configure.py	2008-10-21 16:16:10.909344000 -0700
@@ -741,8 +741,8 @@
                     # version.
                     link = "-framework Python"
                 elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
-                      glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))):
-                    lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"])
+                      glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
+                    lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
                     link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
                 else:
                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
@@ -763,7 +763,7 @@
                 prj = fin.read()
                 fin.close()
 
-                prj = prj.replace("@PYINCDIR@", quote(sipcfg.py_inc_dir))
+                prj = prj.replace("@PYINCDIR@", " ".join((quote(sipcfg.py_conf_inc_dir), quote(sipcfg.py_inc_dir))))
                 prj = prj.replace("@PYLINK@", link)
                 prj = prj.replace("@PYSHLIB@", pysh_lib)
                 prj = prj.replace("@QTPLUGINDIR@", quote(opts.plugindir + "/designer"))