diff options
| author | Glenn Morris <rgm@gnu.org> | 2007-09-15 19:45:45 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2007-09-15 19:45:45 +0000 |
| commit | d4840f44f76157dac920967177aca0791f95a10c (patch) | |
| tree | 55d98534e93d8b496d9b2668a3685629c4a2fbeb | |
| parent | 02ff9df4735463487b5ab674b4586d332107a5e0 (diff) | |
| download | emacs-d4840f44f76157dac920967177aca0791f95a10c.tar.gz | |
Fix makeinfo version regexp.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure index d12d86c7f37..b989534f26d 100755 --- a/configure +++ b/configure @@ -5390,7 +5390,7 @@ fi if test "$MAKEINFO" != "no" && \ - test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([5-9]|4\.[6-9])'`" = x; then + test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([1-4][0-9]+|[5-9]|4\.[6-9]|4\.[1-5][0-9]+)'`" = x; then MAKEINFO=no fi diff --git a/configure.in b/configure.in index 306f8441973..3686753e8c7 100644 --- a/configure.in +++ b/configure.in @@ -1347,7 +1347,7 @@ 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" && \ - test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[5-9]]|4\.[[6-9]])'`" = x; then + test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[6-9]]|4\.[[1-5]][[0-9]]+)'`" = x; then MAKEINFO=no fi |