Mercurial > hg > xemacs-beta
diff configure @ 5748:3ccb4aaf91c7
* configure.ac (makeinfo):
Use basic regexp. Avoid autoconf errors on empty version strings.
Report version found if insufficient. Lightly tested.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sun, 28 Jul 2013 02:46:02 +0900 |
| parents | 9c17f7be0b92 |
| children | a9fd35f939a5 |
line wrap: on
line diff
--- a/configure Wed Jul 10 14:32:02 2013 +0100 +++ b/configure Sun Jul 28 02:46:02 2013 +0900 @@ -10564,10 +10564,10 @@ $as_echo_n "checking for makeinfo >= 4.12... " >&6; } MAKEINFO= for prog in `which -a makeinfo`; do - mi_verstr=`$prog --version | sed -rn '1s/.*+[[:blank:]]([^[:blank:]]+)$/\1/p'` + mi_verstr=`$prog --version | sed -n '1s/^.* \([0-9][0-9]*\.[0-9][0-9]*\)$/\1/p'` mi_major=`echo $mi_verstr | cut -d. -f1` mi_minor=`echo $mi_verstr | cut -d. -f2` - if test $mi_major -gt 4 || ( test $mi_major -eq 4 && test $mi_minor -gt 11 ); + if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 && test "$mi_minor" -gt 11 ); then MAKEINFO=$prog break @@ -10576,8 +10576,8 @@ if test -z $MAKEINFO; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Makeinfo 4.12 or later required to build info files." >&5 -$as_echo "$as_me: WARNING: Makeinfo 4.12 or later required to build info files." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makeinfo $mi_verstr. 4.12 or later required." >&5 +$as_echo "$as_me: WARNING: Found Makeinfo $mi_verstr. 4.12 or later required." >&2;} else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; }