31 lines
1.0 KiB
Plaintext
31 lines
1.0 KiB
Plaintext
$OpenBSD: patch-configure_py,v 1.2 2009/06/03 18:21:34 jasper Exp $
|
|
--- configure.py.orig Mon Nov 17 07:02:06 2008
|
|
+++ configure.py Mon Jun 1 23:33:51 2009
|
|
@@ -1011,7 +1011,7 @@ def check_license():
|
|
|
|
while 1:
|
|
try:
|
|
- resp = raw_input("Do you accept the terms of the license? ")
|
|
+ resp = "yes"
|
|
except:
|
|
resp = ""
|
|
|
|
@@ -1091,15 +1091,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
|