30 lines
1.6 KiB
Diff
30 lines
1.6 KiB
Diff
|
diff -Nru PyQt-x11-gpl-4.9.4/configure.py PyQt-x11-gpl-4.9.4.buono/configure.py
|
||
|
|
--- PyQt-x11-gpl-4.9.4/configure.py 2012-09-26 10:57:20.302056510 +0000
|
||
|
|
+++ PyQt-x11-gpl-4.9.4.buono/configure.py 2012-09-26 10:56:12.418802710 +0000
|
||
|
|
@@ -966,6 +966,7 @@
|
||
|
|
else:
|
||
|
|
# Use distutils to get the additional configuration.
|
||
|
|
from distutils.sysconfig import get_config_vars
|
||
|
|
+ from distutils.sysconfig import get_python_lib
|
||
|
|
ducfg = get_config_vars()
|
||
|
|
|
||
|
|
config_args = ducfg.get("CONFIG_ARGS", "")
|
||
|
|
@@ -980,16 +981,7 @@
|
||
|
|
dynamic_pylib = "--enable-shared" in config_args
|
||
|
|
|
||
|
|
if dynamic_pylib:
|
||
|
|
- if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
|
||
|
|
- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
|
||
|
|
- elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
|
||
|
|
- lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
|
||
|
|
- else:
|
||
|
|
- sipconfig.inform("Qt Designer plugin disabled because Python library couldn't be found")
|
||
|
|
- lib_dir_flag = ''
|
||
|
|
- opts.designer_plugin = False
|
||
|
|
-
|
||
|
|
- link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
|
||
|
|
+ link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor)
|
||
|
|
else:
|
||
|
|
sipconfig.inform("Qt Designer plugin disabled because Python library is static")
|
||
|
|
opts.designer_plugin = False
|