aboutsummaryrefslogtreecommitdiffstats
path: root/print/lilypond-devel/files/patch-configure
blob: af0a1056ec86b0ba5753d25a880c93204861f578 (plain) (blame)
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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
--- configure.orig  2020-07-13 14:02:44 UTC
+++ configure
@@ -9035,71 +9035,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
     if test $? -eq 0; then
         if test -n "0.9.0" -o -n ""; then
 
-    r="`eval echo '$'"PKG_CONFIG"`"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
-$as_echo_n "checking $r version... " >&6; }
-    exe=`
-    ## which doesn't work in ash, if /usr/bin/which isn't installed
-    ## type -p doesn't work in ash
-    ## command -v doesn't work in zsh
-    ## command -v "$r" 2>&1
-    ## this test should work in ash, bash, pdksh (ksh), zsh
-    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
-`
-    ver=`
-    ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}'
-    ##
-    ## ARG.
-    ## Workaround for broken Debian gcc version string:
-    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
-    ##
-    ## -V: Workaround for python
+    $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
 
-    #dnl
-
-    ## Assume and hunt for dotted version multiplet.
-    ## use eval trickery, because we cannot use multi-level $() instead of ``
-    ## for compatibility reasons.
-
-    ## grab the first version number in --version output.
-    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
-        grep -E '(^| )[0-9][0-9]*\.[0-9]' |
-        head -n 1 |
-        tr ' ' '\n' |
-        sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
-        grep -E '(^| )[0-9][0-9]*\.[0-9]' |
-        head -n 1\`\"
-
-    if test -z "$_ver"; then
-        ## If empty, try date [fontforge]
-        eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \
-        | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
-        | head -n 1 \
-        | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
-    fi
-    echo "$_ver"
-    #dnl
-`
-    num=`
-    echo "$ver" | awk -F. '
-    {
-      if ($3) {three = $3}
-      else {three = 0}
-    }
-    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
-`
-    min=`
-    echo "0.9.0" | awk -F. '
-    {
-      if ($3) {three = $3}
-      else {three = 0}
-    }
-    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
-`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
-$as_echo "$ver" >&6; }
-    if test "$num" -lt "$min"; then
-
+    if test ! $?; then
+    ver=`$PKG_CONFIG --version`
     eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
 
     fi