diff options
| author | Glenn Morris <[email protected]> | 2014-05-25 19:28:09 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-05-25 19:28:09 -0700 |
| commit | 015936fba1bcaa51b7886a73144d4c088200c0aa (patch) | |
| tree | c9628339352c1a97e574df28966e977143c43e41 /configure.ac | |
| parent | 5e26d9849a79bf78fda821979fc937f7e5e6df52 (diff) | |
| parent | e8f2cc26e712f42f6391fa52cd67c3e791096f1e (diff) | |
Merge from emacs-24; up to 2014-05-26T10:21:[email protected]
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2cfc1ad103..d727c0253f 100644 --- a/configure.ac +++ b/configure.ac @@ -547,7 +547,7 @@ case "${canonical}" in rs6000-ibm-aix[56]* ) opsys=aix4-2 ;; - powerpc-ibm-aix[56]* ) + powerpc-ibm-aix[5-9]* | powerpc-ibm-aix[1-9][0-9]* ) opsys=aix4-2 ;; @@ -999,6 +999,15 @@ if test "$opsys" = "mingw32"; then LN_S="/bin/ln" fi +dnl On some Debian versions, "install-info" prints irritating messages +dnl "This is not dpkg install-info anymore, but GNU install-info" +dnl if called via an absolute file name. +dnl Use the entirely-identical-but-quieter ginstall-info instead if present. +dnl Sadly some people may have an old ginstall-info installed on +dnl non-Debian systems, so we can't use this. +dnl AC_PATH_PROGS(INSTALL_INFO, [ginstall-info install-info], :, +dnl $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) + AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) dnl Don't use GZIP, which is used by gzip for additional parameters. |