mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-04 01:48:54 +00:00
170652dafd
for those that have both installed. Submitted by: maintainer Approved by: portmgr (linimon)
22 lines
823 B
Python
22 lines
823 B
Python
--- configure.py.orig Sun May 13 20:08:01 2007
|
|
+++ configure.py Sun May 13 20:14:01 2007
|
|
@@ -1081,15 +1081,12 @@
|
|
macros["LIBDIR_QT"] = qt_libdir
|
|
|
|
# Check the Qt header files have been installed. Quietly check for Qt v4.
|
|
- qt4_d = os.path.join(qt_incdir, "QtCore")
|
|
+ # NO. This won't allow having both PyQt3 and PyQt4. Check for Qt3 only.
|
|
|
|
- qglobal = os.path.join(qt4_d, "qglobal.h")
|
|
+ qglobal = os.path.join(qt_incdir, "qglobal.h")
|
|
|
|
if not os.access(qglobal, os.F_OK):
|
|
- qglobal = os.path.join(qt_incdir, "qglobal.h")
|
|
-
|
|
- if not os.access(qglobal, os.F_OK):
|
|
- sipconfig.error("qglobal.h could not be found in %s." % qt_incdir)
|
|
+ sipconfig.error("qglobal.h could not be found in %s." % qt_incdir)
|
|
|
|
# Get the Qt version number.
|
|
global qt_version
|