Lines 1-11
Link Here
|
1 |
--- configure.orig 2024-05-24 00:09:14 UTC |
1 |
--- configure.orig 2024-11-20 08:00:58 UTC |
2 |
+++ configure |
2 |
+++ configure |
3 |
@@ -470,7 +470,7 @@ QMAKE=""; fi |
3 |
@@ -474,7 +474,7 @@ else |
4 |
fi ; fi |
4 |
else |
5 |
if [ "$WANT_QMAKE6" = "1" ]; then |
5 |
case "$undefined_variable" in 0|"") echo ; echo "ERROR: Missing qmake6" >&2 ; echo ; exit 1 ;; esac; fi |
6 |
QMAKE=""; fi |
6 |
else |
7 |
-if [ "$HAVE_QMAKE" = "1" ]; then |
7 |
-if [ "$HAVE_QMAKE" = "1" ]; then |
8 |
+if [ "$HAVE_QMAKE" = "1" -a "$WANT_QMAKE6" != "1" ]; then |
8 |
+if [ "$HAVE_QMAKE" = "1" -a "$WANT_QMAKE6" != "1" ]; then |
9 |
QMAKE_BIN="${QMAKE}" |
9 |
QMAKE_BIN="${QMAKE}"; fi; fi |
10 |
else |
10 |
if [ "$QMAKE_BIN" = """" ]; then |
11 |
if [ "$HAVE_QMAKE6" = "1" ]; then |
11 |
case "$undefined_variable" in 0|"") echo ; echo "ERROR: Missing qmake" >&2 ; echo ; exit 1 ;; esac; fi |
12 |
- |
|
|