|
Lines 1-25
Link Here
|
| 1 |
--- configure.orig 2019-03-20 13:52:23 UTC |
1 |
--- configure.orig 2020-02-04 16:12:57 UTC |
| 2 |
+++ configure |
2 |
+++ configure |
| 3 |
@@ -10512,13 +10512,8 @@ $as_echo_n "checking $r version... " >&6; } |
3 |
@@ -2295,13 +2295,8 @@ $as_echo_n "checking $r version... " >&6; } |
| 4 |
## for compatibility reasons. |
4 |
## for compatibility reasons. |
| 5 |
|
5 |
|
| 6 |
## grab the first version number in --version output. |
6 |
## grab the first version number in --version output. |
| 7 |
- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | |
7 |
- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | |
| 8 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
8 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
| 9 |
- head -n 1 | |
9 |
- head -n 1 | |
| 10 |
- tr ' ' '\n' | |
10 |
- tr ' ' '\n' | |
| 11 |
- sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | |
11 |
- sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | |
| 12 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
12 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
| 13 |
- head -n 1\`\" |
13 |
- head -n 1\`\" |
| 14 |
+ eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null | |
14 |
+ eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null | |
| 15 |
+ awk '$1 ~ "fontforge" { print $2 }'\`\" |
15 |
+ awk '$1 ~ "fontforge" { print $2 }'\`\" |
| 16 |
|
16 |
|
| 17 |
if test -z "$_ver"; then |
17 |
if test -z "$_ver"; then |
| 18 |
## If empty, try date [fontforge] |
18 |
## If empty, try date [fontforge] |
| 19 |
@@ -11595,75 +11590,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" |
19 |
@@ -11593,71 +11588,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" |
|
|
20 |
if test $? -eq 0; then |
| 21 |
if test -n "0.9.0" -o -n ""; then |
| 20 |
|
22 |
|
| 21 |
if test $? -eq 0 -a -n "0.9.0"; then |
|
|
| 22 |
|
| 23 |
- r="`eval echo '$'"PKG_CONFIG"`" |
23 |
- r="`eval echo '$'"PKG_CONFIG"`" |
| 24 |
- { $as_echo "$as_me:$LINENO: checking $r version" >&5 |
24 |
- { $as_echo "$as_me:$LINENO: checking $r version" >&5 |
| 25 |
-$as_echo_n "checking $r version... " >&6; } |
25 |
-$as_echo_n "checking $r version... " >&6; } |
|
Lines 31-40
Link Here
|
| 31 |
- ## this test should work in ash, bash, pdksh (ksh), zsh |
31 |
- ## this test should work in ash, bash, pdksh (ksh), zsh |
| 32 |
- type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' |
32 |
- type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' |
| 33 |
-` |
33 |
-` |
| 34 |
- if test -n ""; then |
34 |
- ver=` |
| 35 |
- ver="" |
|
|
| 36 |
- else |
| 37 |
- ver=` |
| 38 |
- ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' |
35 |
- ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' |
| 39 |
- ## |
36 |
- ## |
| 40 |
- ## ARG. |
37 |
- ## ARG. |
|
Lines 50-75
Link Here
|
| 50 |
- ## use eval trickery, because we cannot use multi-level $() instead of `` |
47 |
- ## use eval trickery, because we cannot use multi-level $() instead of `` |
| 51 |
- ## for compatibility reasons. |
48 |
- ## for compatibility reasons. |
| 52 |
- |
49 |
- |
| 53 |
- ## grab the first version number in --version output. |
50 |
- ## grab the first version number in --version output. |
| 54 |
- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | |
51 |
- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | |
| 55 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
52 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
| 56 |
- head -n 1 | |
53 |
- head -n 1 | |
| 57 |
- tr ' ' '\n' | |
54 |
- tr ' ' '\n' | |
| 58 |
- sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | |
55 |
- sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | |
| 59 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
56 |
- grep -E '(^| )[0-9][0-9]*\.[0-9]' | |
| 60 |
- head -n 1\`\" |
57 |
- head -n 1\`\" |
| 61 |
- |
58 |
- |
| 62 |
- if test -z "$_ver"; then |
59 |
- if test -z "$_ver"; then |
| 63 |
- ## If empty, try date [fontforge] |
60 |
- ## If empty, try date [fontforge] |
| 64 |
- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ |
61 |
- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ |
| 65 |
- | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ |
62 |
- | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ |
| 66 |
- | head -n 1 \ |
63 |
- | head -n 1 \ |
| 67 |
- | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" |
64 |
- | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" |
| 68 |
- fi |
65 |
- fi |
| 69 |
- echo "$_ver" |
66 |
- echo "$_ver" |
| 70 |
- #dnl |
67 |
- #dnl |
| 71 |
-` |
68 |
-` |
| 72 |
- fi |
|
|
| 73 |
- num=` |
69 |
- num=` |
| 74 |
- echo "$ver" | awk -F. ' |
70 |
- echo "$ver" | awk -F. ' |
| 75 |
- { |
71 |
- { |
|
Lines 78-84
Link Here
|
| 78 |
- } |
74 |
- } |
| 79 |
- {printf "%.0f\n", $1*1000000 + $2*1000 + three}' |
75 |
- {printf "%.0f\n", $1*1000000 + $2*1000 + three}' |
| 80 |
-` |
76 |
-` |
| 81 |
- req=` |
77 |
- min=` |
| 82 |
- echo "0.9.0" | awk -F. ' |
78 |
- echo "0.9.0" | awk -F. ' |
| 83 |
- { |
79 |
- { |
| 84 |
- if ($3) {three = $3} |
80 |
- if ($3) {three = $3} |
|
Lines 88-94
Link Here
|
| 88 |
-` |
84 |
-` |
| 89 |
- { $as_echo "$as_me:$LINENO: result: $ver" >&5 |
85 |
- { $as_echo "$as_me:$LINENO: result: $ver" >&5 |
| 90 |
-$as_echo "$ver" >&6; } |
86 |
-$as_echo "$ver" >&6; } |
| 91 |
- if test "$num" -lt "$req"; then |
87 |
- if test "$num" -lt "$min"; then |
| 92 |
- |
88 |
- |
| 93 |
+ if test ! $?; then |
89 |
+ if test ! $?; then |
| 94 |
+ ver=`$PKG_CONFIG --version` |
90 |
+ ver=`$PKG_CONFIG --version` |