31 lines
1.1 KiB
Plaintext
31 lines
1.1 KiB
Plaintext
$OpenBSD: patch-configure_py,v 1.3 2009/09/09 14:30:01 jasper Exp $
|
|
--- configure.py.orig Tue Jun 16 10:47:29 2009
|
|
+++ configure.py Wed Sep 9 15:54:17 2009
|
|
@@ -1012,7 +1012,7 @@ Type 'no' to decline the terms of the license.
|
|
|
|
while 1:
|
|
try:
|
|
- resp = raw_input("Do you accept the terms of the license? ")
|
|
+ resp = "yes"
|
|
except:
|
|
resp = ""
|
|
|
|
@@ -1092,15 +1092,11 @@ def check_qt_installation(macros):
|
|
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")
|
|
|
|
- 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
|