Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 26136 | Differences between
and this patch

Collapse All | Expand All

(-)lilypond-1.8.0/autogen.sh (-1 / +1 lines)
Lines 23-29 Link Here
23
# If you have such a setup, invoke this script as:
23
# If you have such a setup, invoke this script as:
24
#   autoconf=autoconf2.50 ./autogen.sh
24
#   autoconf=autoconf2.50 ./autogen.sh
25
for i in autoconf2.50 autoconf-2.50 autoconf  false; do
25
for i in autoconf2.50 autoconf-2.50 autoconf  false; do
26
  version=`$i --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
26
  version=`$i --version 2>/dev/null | head -n 1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
27
  if test "0$version" -ge 250; then
27
  if test "0$version" -ge 250; then
28
    autoconf=$i
28
    autoconf=$i
29
    break
29
    break
(-)lilypond-1.8.0/stepmake/aclocal.m4 (-3 / +3 lines)
Lines 11-23 Link Here
11
    ## command -v doesn't work in zsh
11
    ## command -v doesn't work in zsh
12
    ## command -v "$1" 2>&1
12
    ## command -v "$1" 2>&1
13
    ## this test should work in ash, bash, pdksh (ksh), zsh
13
    ## this test should work in ash, bash, pdksh (ksh), zsh
14
    type -p "$1" 2>/dev/null | tail -1 | awk '{print $NF}'
14
    type -p "$1" 2>/dev/null | tail -n 1 | awk '{print $NF}'
15
])
15
])
16
16
17
17
18
# Get version string from executable ($1)
18
# Get version string from executable ($1)
19
AC_DEFUN(STEPMAKE_GET_VERSION, [
19
AC_DEFUN(STEPMAKE_GET_VERSION, [
20
    ## "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
20
    ## "$1" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}'
21
    ##
21
    ##
22
    ## ARG.
22
    ## ARG.
23
    ## Workaround for broken Debian gcc version string:
23
    ## Workaround for broken Debian gcc version string:
Lines 28-34 Link Here
28
    ## Assume, and hunt for, dotted version multiplet.
28
    ## Assume, and hunt for, dotted version multiplet.
29
29
30
    changequote(<<, >>)dnl
30
    changequote(<<, >>)dnl
31
    ("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' | head -1 | \
31
    ("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' | head -n 1 | \
32
	sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/'
32
	sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/'
33
    changequote([, ])dnl
33
    changequote([, ])dnl
34
])
34
])

Return to bug 26136