procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.ac (MAKEINFO): Clean up some configuration bitrot.

Browse source 
MAKEINFO is already set before we get here, so no need to call AC_PATH_PROG.
Bypass $am_missing_run.  Simplify version-number checking.
This commit is contained in:
Paul Eggert 2014-09-03 19:02:46 -07:00
parent 5788005d5f
commit 315d21d20f
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2014-09-04 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (MAKEINFO): Clean up some configuration bitrot.
MAKEINFO is already set before we get here, so no need to call AC_PATH_PROG.
Bypass $am_missing_run. Simplify version-number checking.
2014-09-02 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:

17
configure.ac
View file

@ -1087,15 +1087,16 @@ if test $opsys = gnu-linux; then
fi
## Need makeinfo >= 4.7 (?) to build the manuals.
AC_PATH_PROG(MAKEINFO, makeinfo, no)
dnl By this stage, configure has already checked for egrep and set EGREP,
dnl or exited with an error if no egrep was found.
if test "$MAKEINFO" != "no"; then
case `
$MAKEINFO --version 2> /dev/null |
$EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)'
` in
'') MAKEINFO=no;;
if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then
MAKEINFO=makeinfo
fi
case `($MAKEINFO --version) 2>/dev/null` in
'makeinfo (GNU texinfo) '4.[[7-9]]* | \
'makeinfo (GNU texinfo) '4.[[1-9][0-9]]* | \
'makeinfo (GNU texinfo) '[[5-9]]* | \
'makeinfo (GNU texinfo) '[[1-9][0-9]]* ) ;;
*) MAKEINFO=no;;
esac
fi