aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-05-18 15:41:22 -0700
committerGlenn Morris2014-05-18 15:41:22 -0700
commit3b7865ca9b91e0bd3f18e8a2734e45a43e6fd661 (patch)
tree08bdf2f63a866cc943fe1eb2c739b4a5febb6483
parentc42ebc983bbacdb1915147cf4891a9e8000f8581 (diff)
downloademacs-3b7865ca9b91e0bd3f18e8a2734e45a43e6fd661.tar.gz
emacs-3b7865ca9b91e0bd3f18e8a2734e45a43e6fd661.zip
* configure.ac (INSTALL_INFO): Revert to just checking for "install-info".
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb04bab6136..484c696cfcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-05-18 Glenn Morris <rgm@gnu.org>
2
3 * configure.ac (INSTALL_INFO):
4 Revert to just checking for "install-info".
5
12014-05-17 Glenn Morris <rgm@gnu.org> 62014-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
969dnl "This is not dpkg install-info anymore, but GNU install-info" 969dnl "This is not dpkg install-info anymore, but GNU install-info"
970dnl if called via an absolute file name. 970dnl if called via an absolute file name.
971dnl Use the entirely-identical-but-quieter ginstall-info instead if present. 971dnl Use the entirely-identical-but-quieter ginstall-info instead if present.
972AC_PATH_PROGS(INSTALL_INFO, [ginstall-info install-info], :, 972dnl Sadly some people may have an old ginstall-info installed on
973dnl non-Debian systems, so we can't use this.
974dnl AC_PATH_PROGS(INSTALL_INFO, [ginstall-info install-info], :,
975dnl $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
976
977AC_PATH_PROG(INSTALL_INFO, install-info, :,
973 $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) 978 $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
974dnl Don't use GZIP, which is used by gzip for additional parameters. 979dnl Don't use GZIP, which is used by gzip for additional parameters.
975AC_PATH_PROG(GZIP_PROG, gzip) 980AC_PATH_PROG(GZIP_PROG, gzip)