Changeset View
Changeset View
Standalone View
Standalone View
print/lilypond-devel/files/patch-configure
| --- configure.orig 2017-02-12 12:13:29 UTC | --- configure.orig 2017-10-15 16:42:11 UTC | ||||
| +++ configure | +++ configure | ||||
| @@ -11503,74 +11503,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" | @@ -11527,75 +11527,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" | ||||
| if test $? -eq 0 -a -n "0.9.0"; then | if test $? -eq 0 -a -n "0.9.0"; then | ||||
| - r="`eval echo '$'"PKG_CONFIG"`" | - r="`eval echo '$'"PKG_CONFIG"`" | ||||
| - { $as_echo "$as_me:$LINENO: checking $r version" >&5 | - { $as_echo "$as_me:$LINENO: checking $r version" >&5 | ||||
| -$as_echo_n "checking $r version... " >&6; } | -$as_echo_n "checking $r version... " >&6; } | ||||
| - exe=` | - exe=` | ||||
| - ## which doesn't work in ash, if /usr/bin/which isn't installed | - ## which doesn't work in ash, if /usr/bin/which isn't installed | ||||
| ▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Lines | |||||
| - if ($3) {three = $3} | - if ($3) {three = $3} | ||||
| - else {three = 0} | - else {three = 0} | ||||
| - } | - } | ||||
| - {printf "%.0f\n", $1*1000000 + $2*1000 + three}' | - {printf "%.0f\n", $1*1000000 + $2*1000 + three}' | ||||
| -` | -` | ||||
| - { $as_echo "$as_me:$LINENO: result: $ver" >&5 | - { $as_echo "$as_me:$LINENO: result: $ver" >&5 | ||||
| -$as_echo "$ver" >&6; } | -$as_echo "$ver" >&6; } | ||||
| - if test "$num" -lt "$req"; then | - if test "$num" -lt "$req"; then | ||||
| + if $exe --atleast-pkgconfig-version 0.9.0; then | - | ||||
| + $PKG_CONFIG --atleast-pkgconfig-version 0.9.0 | |||||
| + | |||||
| + if test ! $?; then | |||||
| + ver=`$PKG_CONFIG --version` | |||||
| eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\" | eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\" | ||||
| fi | |||||