blob: cdfb5f7b93bc7f1e4ad35a794d5b573a141657ae (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
$NetBSD: patch-configure,v 1.2 2020/06/20 10:42:42 leot Exp $
- Avoid `${parameter/pattern/string}' bash-ism
- Only honor `--with-python' configure argument and completely ignore
possible PYTHON environment variable that could be passed via
CONFIGURE_ENV by pkgsrc
- Use standard `=' test(1) operator
--- configure.orig 2020-04-20 21:13:55.000000000 +0000
+++ configure
@@ -23896,6 +23896,7 @@ fi
+if false; then
if test -z "$PYTHON"; then :
if test "x$with_python" = "xauto"; then :
for ac_prog in python3 python2 python
@@ -24052,6 +24053,7 @@ else
with_python="auto"
fi
+fi
if test "x$with_python" != "xno"; then :
@@ -25064,7 +25066,7 @@ else
fi
-JAVAC=${JAVAC/ecj/ecj -1.5}
+JAVAC=`echo "$JAVAC" | sed -e 's/ecj/ecj -1.5/'`
# Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
# look strictly at the $JAVA_HOME in order to avoid mixing different versions
@@ -29146,7 +29148,7 @@ fi
echo ""
echo "please verify that the detected configuration matches your expectations:"
echo "------------------------------------------------------------------------"
-if test "x$USE_NLS" == "xyes"; then :
+if test "x$USE_NLS" = "xyes"; then :
echo "gettext $USE_NLS"
fi
|
