| @@ -1,25 +1,25 @@ | | | @@ -1,25 +1,25 @@ |
1 | $NetBSD: patch-configure,v 1.5 2016/11/16 12:08:26 wiz Exp $ | | 1 | $NetBSD: patch-configure,v 1.6 2017/01/03 19:21:49 wiz Exp $ |
2 | | | 2 | |
3 | Allow building with python 3.4 and 3.5. | | 3 | Allow building with python 3.4-3.6. |
4 | Fix unportable test(1) operator. | | 4 | Fix unportable test(1) operator. |
5 | | | 5 | |
6 | --- configure.orig 2016-11-01 15:17:51.000000000 +0000 | | 6 | --- configure.orig 2016-11-01 15:17:51.000000000 +0000 |
7 | +++ configure | | 7 | +++ configure |
8 | @@ -15509,7 +15509,7 @@ fi | | 8 | @@ -15509,7 +15509,7 @@ fi |
9 | | | 9 | |
10 | # Find any Python interpreter. | | 10 | # Find any Python interpreter. |
11 | if test -z "$PYTHON"; then | | 11 | if test -z "$PYTHON"; then |
12 | - for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 | | 12 | - for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 |
13 | + for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 | | 13 | + for ac_prog in python python2 python3 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 |
14 | do | | 14 | do |
15 | # Extract the first word of "$ac_prog", so it can be a program name with args. | | 15 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
16 | set dummy $ac_prog; ac_word=$2 | | 16 | set dummy $ac_prog; ac_word=$2 |
17 | @@ -18255,7 +18255,7 @@ fi | | 17 | @@ -18255,7 +18255,7 @@ fi |
18 | --disable-omx-rpi --disable-cuda --disable-cuvid --disable-libmfx \ | | 18 | --disable-omx-rpi --disable-cuda --disable-cuvid --disable-libmfx \ |
19 | --disable-libnpp --disable-iconv --disable-jni --enable-optimizations" | | 19 | --disable-libnpp --disable-iconv --disable-jni --enable-optimizations" |
20 | | | 20 | |
21 | - if test "x$enable_gpl" == "xyes"; then | | 21 | - if test "x$enable_gpl" == "xyes"; then |
22 | + if test "x$enable_gpl" = "xyes"; then | | 22 | + if test "x$enable_gpl" = "xyes"; then |
23 | emblibav_configure_args="$emblibav_configure_args --enable-gpl" | | 23 | emblibav_configure_args="$emblibav_configure_args --enable-gpl" |
24 | fi | | 24 | fi |
25 | | | 25 | |