diff options
| author | Glenn Morris | 2014-05-18 15:41:22 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-18 15:41:22 -0700 |
| commit | 3b7865ca9b91e0bd3f18e8a2734e45a43e6fd661 (patch) | |
| tree | 08bdf2f63a866cc943fe1eb2c739b4a5febb6483 | |
| parent | c42ebc983bbacdb1915147cf4891a9e8000f8581 (diff) | |
| download | emacs-3b7865ca9b91e0bd3f18e8a2734e45a43e6fd661.tar.gz emacs-3b7865ca9b91e0bd3f18e8a2734e45a43e6fd661.zip | |
* configure.ac (INSTALL_INFO): Revert to just checking for "install-info".
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 11 insertions, 1 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-05-18 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * configure.ac (INSTALL_INFO): | ||
| 4 | Revert to just checking for "install-info". | ||
| 5 | |||
| 1 | 2014-05-17 Glenn Morris <rgm@gnu.org> | 6 | 2014-05-17 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * configure.ac (INSTALL_INFO): Try the identical-but-quieter-on-Debian | 8 | * configure.ac (INSTALL_INFO): Try the identical-but-quieter-on-Debian |
diff --git a/configure.ac b/configure.ac index f1ed74e2374..a29c786d63b 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -969,7 +969,12 @@ dnl On some Debian versions, "install-info" prints irritating messages | |||
| 969 | dnl "This is not dpkg install-info anymore, but GNU install-info" | 969 | dnl "This is not dpkg install-info anymore, but GNU install-info" |
| 970 | dnl if called via an absolute file name. | 970 | dnl if called via an absolute file name. |
| 971 | dnl Use the entirely-identical-but-quieter ginstall-info instead if present. | 971 | dnl Use the entirely-identical-but-quieter ginstall-info instead if present. |
| 972 | AC_PATH_PROGS(INSTALL_INFO, [ginstall-info install-info], :, | 972 | dnl Sadly some people may have an old ginstall-info installed on |
| 973 | dnl non-Debian systems, so we can't use this. | ||
| 974 | dnl AC_PATH_PROGS(INSTALL_INFO, [ginstall-info install-info], :, | ||
| 975 | dnl $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) | ||
| 976 | |||
| 977 | AC_PATH_PROG(INSTALL_INFO, install-info, :, | ||
| 973 | $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) | 978 | $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) |
| 974 | dnl Don't use GZIP, which is used by gzip for additional parameters. | 979 | dnl Don't use GZIP, which is used by gzip for additional parameters. |
| 975 | AC_PATH_PROG(GZIP_PROG, gzip) | 980 | AC_PATH_PROG(GZIP_PROG, gzip) |