diff --git a/NEWS b/NEWS
index 0e710881..4682476f 100644
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,8 @@ Major changes in release 2.0:
 * AC_CHECK_FUNCS and AC_CHECK_HEADERS take optional shell commands to
   execute on success.
 * AC_REMOTE_TAPE removed; it was too specific to tar and cpio.
+* AC_HAVE_POUNDBANG replaced with AC_SYS_INTERPRETER, which doesn't
+  take arguments.
 
 ** New utilities:
 * autoscan to generate a preliminary configure.in for a package by
diff --git a/acspecific.m4 b/acspecific.m4
index 85e932c2..641be641 100644
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -1132,11 +1132,13 @@ if test "$ac_cv_struct_tm_zone" = yes; then
 else
   AC_MSG_CHECKING([for tzname])
 AC_CACHE_VAL(ac_cv_var_tzname,
-[AC_TRY_LINK(changequote(<<, >>)dnl
+[AC_TRY_LINK(
+changequote(<<, >>)dnl
 <<#include <time.h>
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
-#endif>>, changequote([, ])dnl
+#endif>>,
+changequote([, ])dnl
 [atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)])dnl
   AC_MSG_RESULT($ac_cv_var_tzname)
   if test $ac_cv_var_tzname = yes; then
@@ -1238,18 +1240,18 @@ fi
 dnl
 AC_DEFUN(AC_INT_16_BITS,
 [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])
-AC_MSG_CHECKING(integer size)
+AC_MSG_CHECKING(whether int is 16 bits)
 AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
- [AC_MSG_RESULT(16 bits)
- AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(not 16 bits))
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
 ])dnl
 dnl
 AC_DEFUN(AC_LONG_64_BITS,
 [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])
-AC_MSG_CHECKING(for 64-bit long ints)
+AC_MSG_CHECKING(whether long int is 64 bits)
 AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
- [AC_MSG_RESULT(64 bits)
- AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(not 64 bits))
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
 ])dnl
 dnl
 AC_DEFUN(AC_C_BIGENDIAN,
@@ -1365,8 +1367,7 @@ dnl
 dnl ### Checks for operating system services
 dnl
 dnl
-dnl This macro is an oddball -- the only specific test that takes args.
-AC_DEFUN(AC_HAVE_POUNDBANG,
+AC_DEFUN(AC_SYS_INTERPRETER,
 [AC_MSG_CHECKING(whether [#]! works in shell scripts)
 AC_CACHE_VAL(ac_cv_sys_interpreter,
 [echo '#!/bin/cat
@@ -1381,12 +1382,6 @@ else
 fi
 rm -f conftest])dnl
 AC_MSG_RESULT($ac_cv_sys_interpreter)
-if test $ac_cv_sys_interpreter = yes; then
-  ifelse([$1], , :, [$1])
-ifelse([$2], , , [else
-  $2
-])dnl
-fi
 ])dnl
 dnl
 AC_DEFUN(AC_SYS_LONG_FILE_NAMES,
@@ -1726,10 +1721,9 @@ AC_EGREP_CPP(yes,
 ], [AC_MSG_RESULT(yes); XENIX=yes], [AC_MSG_RESULT(no); XENIX=])
 if test "$XENIX" = yes; then
   LIBS="$LIBS -lx"
-  case "$DEFS" in
-  *SYSNDIR*) ;;
-  *) LIBS="-ldir $LIBS" ;; # Make sure -ldir precedes any -lx.
-  esac
+  if test $ac_header_dir != sys/ndir.h; then
+    LIBS="-ldir $LIBS" # Make sure -ldir precedes -lx.
+  fi
 fi
 ])dnl
 dnl
diff --git a/autoconf.texi b/autoconf.texi
index e2511df5..e5dae9ee 100644
--- a/autoconf.texi
+++ b/autoconf.texi
@@ -1508,13 +1508,13 @@ that define @code{__STDC__} do not support @code{long double}.
 
 The following macros check for operating system services:
 
-@defmac AC_HAVE_POUNDBANG (@var{action-if-supported} @r{[},
-@var{action-if-not-supported}@r{]})
-@maindex HAVE_POUNDBANG
+@defmac AC_SYS_INTERPRETER
+@maindex SYS_INTERPRETER
 Check whether the system supports starting shell scripts with a line of
-the form @samp{#!/bin/csh} to select the shell to use.  If @samp{#!}
-works, execute shell commands @var{action-if-supported}; if not, execute
-@var{action-if-not-supported}.
+the form @samp{#!/bin/csh} to select the shell to use.  After running
+this macro, shell code in @code{configure.in} can check the variable
+@code{ac_cv_sys_interpreter}; it will be set to @samp{yes} if the system
+supports @samp{#!}, @samp{no} if not.
 @end defmac
 
 @defmac AC_PATH_X
@@ -2788,20 +2788,21 @@ newlines or calls to other macros, as well.
 Autoconf (in @file{acgeneral.m4}) changes the @code{m4} quote characters
 from the default @samp{`} and @samp{'} to @samp{[} and @samp{]}, because
 many of the macros use @samp{`} and @samp{'}, mismatched.  However, in a
-few places the macros need to use brackets.  In those places, they use
-the @code{m4} builtin command @code{changequote} to temporarily disable
-quoting before the code that uses brackets, like this:
-
-@example
-changequote(, )dnl
-@end example
-
-@noindent
-Then they turn quoting back on again with another call to
-@code{changequote}:
+few places the macros need to use brackets (usually in C program text or
+regular expressions).  In those places, they use the @code{m4} builtin
+command @code{changequote} to temporarily change the quote characters to
+@samp{<<} and @samp{>>}.  Sometimes, if they don't need to quote
+anything, they disable quoting entirely instead.  Here is an example:
 
 @example
+AC_TRY_LINK(
+changequote(<<, >>)dnl
+<<#include <time.h>
+#ifndef tzname /* For SGI.  */
+extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+#endif>>,
 changequote([, ])dnl
+[atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)
 @end example
 
 When you create a @code{configure} script using newly written macros,
@@ -3488,62 +3489,70 @@ for backward compatibility, the old names are considered obsolete.
 @xref{Macro Naming}, for a description of the new naming scheme.
 
 @table @code
-@item AC_NOTICE
-@vindex NOTICE
-@vindex INIT_NOTICE
-@code{AC_INIT_NOTICE}
-@item AC_PREPARE
-@vindex PREPARE
-@vindex INIT_PREPARE
-@code{AC_INIT_PREPARE}
-@item AC_WARN
-@vindex WARN
-@vindex MSG_WARN
-@code{AC_MSG_WARN}
+@item AC_AIX
+@vindex AIX
+@vindex OS_AIX
+@code{AC_OS_AIX}
+@item AC_ALLOCA
+@vindex ALLOCA
+@vindex FUNC_ALLOCA
+@code{AC_FUNC_ALLOCA}
+@item AC_ARG_ARRAY
+@vindex ARG_ARRAY
+@vindex C_ARG_ARRAY
+@code{AC_C_ARG_ARRAY}
+@item AC_CHAR_UNSIGNED
+@vindex CHAR_UNSIGNED
+@vindex C_CHAR_UNSIGNED
+@code{AC_C_CHAR_UNSIGNED}
+@item AC_CONST
+@vindex CONST
+@vindex C_CONST
+@code{AC_C_CONST}
+@item AC_CROSS_CHECK
+@vindex CROSS_CHECK
+@vindex C_CROSS
+@code{AC_C_CROSS}
+@item AC_DYNIX_SEQ
+@vindex DYNIX_SEQ
+@vindex OS_DYNIX
+@code{AC_OS_DYNIX}
 @item AC_ERROR
 @vindex ERROR
 @vindex MSG_ERROR
 @code{AC_MSG_ERROR}
-@item AC_PROGRAM_CHECK
-@vindex PROGRAM_CHECK
-@vindex CHECK_PROG
-@code{AC_CHECK_PROG}
-@item AC_PROGRAM_PATH
-@vindex PROGRAM_PATH
-@vindex PATH_PROG
-@code{AC_PATH_PROG}
-@item AC_PROGRAMS_CHECK
-@vindex PROGRAMS_CHECK
-@vindex CHECK_PROGS
-@code{AC_CHECK_PROGS}
-@item AC_PROGRAMS_PATH
-@vindex PROGRAMS_PATH
-@vindex PATH_PROGS
-@code{AC_PATH_PROGS}
-@item AC_HEADER_EGREP
-@vindex HEADER_EGREP
-@vindex EGREP_HEADER
-@code{AC_EGREP_HEADER}
-@item AC_PROGRAM_EGREP
-@vindex PROGRAM_EGREP
-@vindex EGREP_CPP
-@code{AC_EGREP_CPP}
-@item AC_TEST_PROGRAM
-@vindex TEST_PROGRAM
-@vindex TRY_RUN
-@code{AC_TRY_RUN}
-@item AC_TEST_CPP
-@vindex TEST_CPP
-@vindex TRY_CPP
-@code{AC_TRY_CPP}
-@item AC_HEADER_CHECK
-@vindex HEADER_CHECK
-@vindex CHECK_HEADER
-@code{AC_CHECK_HEADER}
+@item AC_FIND_X
+@vindex FIND_X
+@vindex PATH_X
+@code{AC_PATH_X}
+@item AC_FIND_XTRA
+@vindex FIND_XTRA
+@vindex PATH_XTRA
+@code{AC_PATH_XTRA}
+@item AC_FIND_X_DIRECT
+@vindex FIND_X_DIRECT
+@vindex PATH_X_DIRECT
+@code{AC_PATH_X_DIRECT}
+@item AC_FIND_X_XMKMF
+@vindex FIND_X_XMKMF
+@vindex PATH_X_XMKMF
+@code{AC_PATH_X_XMKMF}
 @item AC_FUNC_CHECK
 @vindex FUNC_CHECK
 @vindex CHECK_FUNC
 @code{AC_CHECK_FUNC}
+@item AC_GCC_TRADITIONAL
+@vindex GCC_TRADITIONAL
+@vindex PROG_GCC_TRADITIONAL
+@code{AC_PROG_GCC_TRADITIONAL}
+@item AC_GETGROUPS_T
+@vindex GETGROUPS_T
+@vindex TYPE_GETGROUPS
+@code{AC_TYPE_GETGROUPS}
+@item AC_GETLOADAVG
+@vindex GETLOADAVG
+@vindex FUNC_GETLOADAVG
+@code{AC_FUNC_GETLOADAVG}
 @item AC_HAVE_FUNCS
 @vindex HAVE_FUNCS
 @vindex CHECK_FUNCS
@@ -3552,217 +3561,213 @@ for backward compatibility, the old names are considered obsolete.
 @vindex HAVE_HEADERS
 @vindex CHECK_HEADERS
 @code{AC_CHECK_HEADERS}
-@item AC_SIZEOF_TYPE
-@vindex SIZEOF_TYPE
-@vindex CHECK_SIZEOF
-@code{AC_CHECK_SIZEOF}
-@item AC_GCC_TRADITIONAL
-@vindex GCC_TRADITIONAL
-@vindex PROG_GCC_TRADITIONAL
-@code{AC_PROG_GCC_TRADITIONAL}
-@item AC_MINUS_C_MINUS_O
-@vindex MINUS_C_MINUS_O
-@vindex PROG_CC_C_O
-@code{AC_PROG_CC_C_O}
-@item AC_SET_MAKE
-@vindex SET_MAKE
-@vindex PROG_MAKE_SET
-@code{AC_PROG_MAKE_SET}
-@item AC_YYTEXT_POINTER
-@vindex YYTEXT_POINTER
-@vindex DECL_YYTEXT
-@code{AC_DECL_YYTEXT}
-@item AC_LN_S
-@vindex LN_S
-@vindex PROG_LN_S
-@code{AC_PROG_LN_S}
-@item AC_RSH
-@vindex RSH
-@vindex PROG_RSH
-@code{AC_PROG_RSH}
-@item AC_STDC_HEADERS
-@vindex STDC_HEADERS
-@vindex HEADER_STDC
-@code{AC_HEADER_STDC}
-@item AC_MAJOR_HEADER
-@vindex MAJOR_HEADER
-@vindex HEADER_MAJOR
-@code{AC_HEADER_MAJOR}
-@item AC_STAT_MACROS_BROKEN
-@vindex STAT_MACROS_BROKEN
-@vindex HEADER_STAT
-@code{AC_HEADER_STAT}
-@item AC_SYS_SIGLIST_DECLARED
-@vindex SYS_SIGLIST_DECLARED
-@vindex DECL_SYS_SIGLIST
-@code{AC_DECL_SYS_SIGLIST}
-@item AC_GETGROUPS_T
-@vindex GETGROUPS_T
-@vindex TYPE_GETGROUPS
-@code{AC_TYPE_GETGROUPS}
-@item AC_UID_T
-@vindex UID_T
-@vindex TYPE_UID_T
-@code{AC_TYPE_UID_T}
-@item AC_SIZE_T
-@vindex SIZE_T
-@vindex TYPE_SIZE_T
-@code{AC_TYPE_SIZE_T}
-@item AC_PID_T
-@vindex PID_T
-@vindex TYPE_PID_T
-@code{AC_TYPE_PID_T}
-@item AC_OFF_T
-@vindex OFF_T
-@vindex TYPE_OFF_T
-@code{AC_TYPE_OFF_T}
-@item AC_MODE_T
-@vindex MODE_T
-@vindex TYPE_MODE_T
-@code{AC_TYPE_MODE_T}
-@item AC_RETSIGTYPE
-@vindex RETSIGTYPE
-@vindex TYPE_SIGNAL
-@code{AC_TYPE_SIGNAL}
-@item AC_MMAP
-@vindex MMAP
-@vindex FUNC_MMAP
-@code{AC_FUNC_MMAP}
-@item AC_VPRINTF
-@vindex VPRINTF
-@vindex FUNC_VPRINTF
-@code{AC_FUNC_VPRINTF}
-@item AC_VFORK
-@vindex VFORK
-@vindex FUNC_VFORK
-@code{AC_FUNC_VFORK}
-@item AC_WAIT3
-@vindex WAIT3
-@vindex FUNC_WAIT3
-@code{AC_FUNC_WAIT3}
-@item AC_ALLOCA
-@vindex ALLOCA
-@vindex FUNC_ALLOCA
-@code{AC_FUNC_ALLOCA}
-@item AC_GETLOADAVG
-@vindex GETLOADAVG
-@vindex FUNC_GETLOADAVG
-@code{AC_FUNC_GETLOADAVG}
-@item AC_UTIME_NULL
-@vindex UTIME_NULL
-@vindex FUNC_UTIME_NULL
-@code{AC_FUNC_UTIME_NULL}
-@item AC_STRCOLL
-@vindex STRCOLL
-@vindex FUNC_STRCOLL
-@code{AC_FUNC_STRCOLL}
-@item AC_SETVBUF_REVERSED
-@vindex SETVBUF_REVERSED
-@vindex FUNC_SETVBUF_REVERSED
-@code{AC_FUNC_SETVBUF_REVERSED}
-@item AC_TIME_WITH_SYS_TIME
-@vindex TIME_WITH_SYS_TIME
-@vindex HEADER_TIME
-@code{AC_HEADER_TIME}
-@item AC_TIMEZONE
-@vindex TIMEZONE
-@vindex STRUCT_TIMEZONE
-@code{AC_STRUCT_TIMEZONE}
-@item AC_ST_BLOCKS
-@vindex ST_BLOCKS
-@vindex STRUCT_ST_BLOCKS
-@code{AC_STRUCT_ST_BLOCKS}
-@item AC_ST_BLKSIZE
-@vindex ST_BLKSIZE
-@vindex STRUCT_ST_BLKSIZE
-@code{AC_STRUCT_ST_BLKSIZE}
-@item AC_ST_RDEV
-@vindex ST_RDEV
-@vindex STRUCT_ST_RDEV
-@code{AC_STRUCT_ST_RDEV}
-@item AC_CROSS_CHECK
-@vindex CROSS_CHECK
-@vindex C_CROSS
-@code{AC_C_CROSS}
-@item AC_CHAR_UNSIGNED
-@vindex CHAR_UNSIGNED
-@vindex C_CHAR_UNSIGNED
-@code{AC_C_CHAR_UNSIGNED}
-@item AC_LONG_DOUBLE
-@vindex LONG_DOUBLE
-@vindex C_LONG_DOUBLE
-@code{AC_C_LONG_DOUBLE}
-@item AC_WORDS_BIGENDIAN
-@vindex WORDS_BIGENDIAN
-@vindex C_BIGENDIAN
-@code{AC_C_BIGENDIAN}
-@item AC_ARG_ARRAY
-@vindex ARG_ARRAY
-@vindex C_ARG_ARRAY
-@code{AC_C_ARG_ARRAY}
+@item AC_HAVE_POUNDBANG
+@vindex HAVE_POUNDBANG
+@vindex SYS_INTERPRETER
+@code{AC_SYS_INTERPRETER} (different calling convention)
+@item AC_HEADER_CHECK
+@vindex HEADER_CHECK
+@vindex CHECK_HEADER
+@code{AC_CHECK_HEADER}
+@item AC_HEADER_EGREP
+@vindex HEADER_EGREP
+@vindex EGREP_HEADER
+@code{AC_EGREP_HEADER}
 @item AC_INLINE
 @vindex INLINE
 @vindex C_INLINE
 @code{AC_C_INLINE}
-@item AC_CONST
-@vindex CONST
-@vindex C_CONST
-@code{AC_C_CONST}
-@item AC_REMOTE_TAPE
-@vindex REMOTE_TAPE
-removed
-@item AC_LONG_FILE_NAMES
-@vindex LONG_FILE_NAMES
-@vindex SYS_LONG_FILE_NAMES
-@code{AC_SYS_LONG_FILE_NAMES}
-@item AC_RESTARTABLE_SYSCALLS
-@vindex RESTARTABLE_SYSCALLS
-@vindex SYS_RESTARTABLE_SYSCALLS
-@code{AC_SYS_RESTARTABLE_SYSCALLS}
-@item AC_FIND_X
-@vindex FIND_X
-@vindex PATH_X
-@code{AC_PATH_X}
-@item AC_FIND_X_XMKMF
-@vindex FIND_X_XMKMF
-@vindex PATH_X_XMKMF
-@code{AC_PATH_X_XMKMF}
-@item AC_FIND_X_DIRECT
-@vindex FIND_X_DIRECT
-@vindex PATH_X_DIRECT
-@code{AC_PATH_X_DIRECT}
-@item AC_FIND_XTRA
-@vindex FIND_XTRA
-@vindex PATH_XTRA
-@code{AC_PATH_XTRA}
-@item AC_AIX
-@vindex AIX
-@vindex OS_AIX
-@code{AC_OS_AIX}
-@item AC_MINIX
-@vindex MINIX
-@vindex OS_MINIX
-@code{AC_OS_MINIX}
-@item AC_ISC_POSIX
-@vindex ISC_POSIX
-@vindex OS_ISC
-@code{AC_OS_ISC}
-@item AC_XENIX_DIR
-@vindex XENIX_DIR
-@vindex OS_XENIX
-@code{AC_OS_XENIX}
-@item AC_SCO_INTL
-@vindex SCO_INTL
-@vindex OS_SCO
-@code{AC_OS_SCO}
 @item AC_IRIX_SUN
 @vindex IRIX_SUN
 @vindex OS_IRIX
 @code{AC_OS_IRIX}
-@item AC_DYNIX_SEQ
-@vindex DYNIX_SEQ
-@vindex OS_DYNIX
-@code{AC_OS_DYNIX}
+@item AC_ISC_POSIX
+@vindex ISC_POSIX
+@vindex OS_ISC
+@code{AC_OS_ISC}
+@item AC_LN_S
+@vindex LN_S
+@vindex PROG_LN_S
+@code{AC_PROG_LN_S}
+@item AC_LONG_DOUBLE
+@vindex LONG_DOUBLE
+@vindex C_LONG_DOUBLE
+@code{AC_C_LONG_DOUBLE}
+@item AC_LONG_FILE_NAMES
+@vindex LONG_FILE_NAMES
+@vindex SYS_LONG_FILE_NAMES
+@code{AC_SYS_LONG_FILE_NAMES}
+@item AC_MAJOR_HEADER
+@vindex MAJOR_HEADER
+@vindex HEADER_MAJOR
+@code{AC_HEADER_MAJOR}
+@item AC_MINIX
+@vindex MINIX
+@vindex OS_MINIX
+@code{AC_OS_MINIX}
+@item AC_MINUS_C_MINUS_O
+@vindex MINUS_C_MINUS_O
+@vindex PROG_CC_C_O
+@code{AC_PROG_CC_C_O}
+@item AC_MMAP
+@vindex MMAP
+@vindex FUNC_MMAP
+@code{AC_FUNC_MMAP}
+@item AC_MODE_T
+@vindex MODE_T
+@vindex TYPE_MODE_T
+@code{AC_TYPE_MODE_T}
+@item AC_NOTICE
+@vindex NOTICE
+@vindex INIT_NOTICE
+@code{AC_INIT_NOTICE}
+@item AC_OFF_T
+@vindex OFF_T
+@vindex TYPE_OFF_T
+@code{AC_TYPE_OFF_T}
+@item AC_PID_T
+@vindex PID_T
+@vindex TYPE_PID_T
+@code{AC_TYPE_PID_T}
+@item AC_PREPARE
+@vindex PREPARE
+@vindex INIT_PREPARE
+@code{AC_INIT_PREPARE}
+@item AC_PROGRAMS_CHECK
+@vindex PROGRAMS_CHECK
+@vindex CHECK_PROGS
+@code{AC_CHECK_PROGS}
+@item AC_PROGRAMS_PATH
+@vindex PROGRAMS_PATH
+@vindex PATH_PROGS
+@code{AC_PATH_PROGS}
+@item AC_PROGRAM_CHECK
+@vindex PROGRAM_CHECK
+@vindex CHECK_PROG
+@code{AC_CHECK_PROG}
+@item AC_PROGRAM_EGREP
+@vindex PROGRAM_EGREP
+@vindex EGREP_CPP
+@code{AC_EGREP_CPP}
+@item AC_PROGRAM_PATH
+@vindex PROGRAM_PATH
+@vindex PATH_PROG
+@code{AC_PATH_PROG}
+@item AC_REMOTE_TAPE
+@vindex REMOTE_TAPE
+removed because of limited usefulness
+@item AC_RESTARTABLE_SYSCALLS
+@vindex RESTARTABLE_SYSCALLS
+@vindex SYS_RESTARTABLE_SYSCALLS
+@code{AC_SYS_RESTARTABLE_SYSCALLS}
+@item AC_RETSIGTYPE
+@vindex RETSIGTYPE
+@vindex TYPE_SIGNAL
+@code{AC_TYPE_SIGNAL}
+@item AC_RSH
+@vindex RSH
+@vindex PROG_RSH
+@code{AC_PROG_RSH}
+@item AC_SCO_INTL
+@vindex SCO_INTL
+@vindex OS_SCO
+@code{AC_OS_SCO}
+@item AC_SETVBUF_REVERSED
+@vindex SETVBUF_REVERSED
+@vindex FUNC_SETVBUF_REVERSED
+@code{AC_FUNC_SETVBUF_REVERSED}
+@item AC_SET_MAKE
+@vindex SET_MAKE
+@vindex PROG_MAKE_SET
+@code{AC_PROG_MAKE_SET}
+@item AC_SIZEOF_TYPE
+@vindex SIZEOF_TYPE
+@vindex CHECK_SIZEOF
+@code{AC_CHECK_SIZEOF}
+@item AC_SIZE_T
+@vindex SIZE_T
+@vindex TYPE_SIZE_T
+@code{AC_TYPE_SIZE_T}
+@item AC_STAT_MACROS_BROKEN
+@vindex STAT_MACROS_BROKEN
+@vindex HEADER_STAT
+@code{AC_HEADER_STAT}
+@item AC_STDC_HEADERS
+@vindex STDC_HEADERS
+@vindex HEADER_STDC
+@code{AC_HEADER_STDC}
+@item AC_STRCOLL
+@vindex STRCOLL
+@vindex FUNC_STRCOLL
+@code{AC_FUNC_STRCOLL}
+@item AC_ST_BLKSIZE
+@vindex ST_BLKSIZE
+@vindex STRUCT_ST_BLKSIZE
+@code{AC_STRUCT_ST_BLKSIZE}
+@item AC_ST_BLOCKS
+@vindex ST_BLOCKS
+@vindex STRUCT_ST_BLOCKS
+@code{AC_STRUCT_ST_BLOCKS}
+@item AC_ST_RDEV
+@vindex ST_RDEV
+@vindex STRUCT_ST_RDEV
+@code{AC_STRUCT_ST_RDEV}
+@item AC_SYS_SIGLIST_DECLARED
+@vindex SYS_SIGLIST_DECLARED
+@vindex DECL_SYS_SIGLIST
+@code{AC_DECL_SYS_SIGLIST}
+@item AC_TEST_CPP
+@vindex TEST_CPP
+@vindex TRY_CPP
+@code{AC_TRY_CPP}
+@item AC_TEST_PROGRAM
+@vindex TEST_PROGRAM
+@vindex TRY_RUN
+@code{AC_TRY_RUN}
+@item AC_TIMEZONE
+@vindex TIMEZONE
+@vindex STRUCT_TIMEZONE
+@code{AC_STRUCT_TIMEZONE}
+@item AC_TIME_WITH_SYS_TIME
+@vindex TIME_WITH_SYS_TIME
+@vindex HEADER_TIME
+@code{AC_HEADER_TIME}
+@item AC_UID_T
+@vindex UID_T
+@vindex TYPE_UID_T
+@code{AC_TYPE_UID_T}
+@item AC_UTIME_NULL
+@vindex UTIME_NULL
+@vindex FUNC_UTIME_NULL
+@code{AC_FUNC_UTIME_NULL}
+@item AC_VFORK
+@vindex VFORK
+@vindex FUNC_VFORK
+@code{AC_FUNC_VFORK}
+@item AC_VPRINTF
+@vindex VPRINTF
+@vindex FUNC_VPRINTF
+@code{AC_FUNC_VPRINTF}
+@item AC_WAIT3
+@vindex WAIT3
+@vindex FUNC_WAIT3
+@code{AC_FUNC_WAIT3}
+@item AC_WARN
+@vindex WARN
+@vindex MSG_WARN
+@code{AC_MSG_WARN}
+@item AC_WORDS_BIGENDIAN
+@vindex WORDS_BIGENDIAN
+@vindex C_BIGENDIAN
+@code{AC_C_BIGENDIAN}
+@item AC_XENIX_DIR
+@vindex XENIX_DIR
+@vindex OS_XENIX
+@code{AC_OS_XENIX}
+@item AC_YYTEXT_POINTER
+@vindex YYTEXT_POINTER
+@vindex DECL_YYTEXT
+@code{AC_DECL_YYTEXT}
 @end table
 
 @node Example, History, Old Macro Names, Top
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index e2511df5..e5dae9ee 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1508,13 +1508,13 @@ that define @code{__STDC__} do not support @code{long double}.
 
 The following macros check for operating system services:
 
-@defmac AC_HAVE_POUNDBANG (@var{action-if-supported} @r{[},
-@var{action-if-not-supported}@r{]})
-@maindex HAVE_POUNDBANG
+@defmac AC_SYS_INTERPRETER
+@maindex SYS_INTERPRETER
 Check whether the system supports starting shell scripts with a line of
-the form @samp{#!/bin/csh} to select the shell to use.  If @samp{#!}
-works, execute shell commands @var{action-if-supported}; if not, execute
-@var{action-if-not-supported}.
+the form @samp{#!/bin/csh} to select the shell to use.  After running
+this macro, shell code in @code{configure.in} can check the variable
+@code{ac_cv_sys_interpreter}; it will be set to @samp{yes} if the system
+supports @samp{#!}, @samp{no} if not.
 @end defmac
 
 @defmac AC_PATH_X
@@ -2788,20 +2788,21 @@ newlines or calls to other macros, as well.
 Autoconf (in @file{acgeneral.m4}) changes the @code{m4} quote characters
 from the default @samp{`} and @samp{'} to @samp{[} and @samp{]}, because
 many of the macros use @samp{`} and @samp{'}, mismatched.  However, in a
-few places the macros need to use brackets.  In those places, they use
-the @code{m4} builtin command @code{changequote} to temporarily disable
-quoting before the code that uses brackets, like this:
-
-@example
-changequote(, )dnl
-@end example
-
-@noindent
-Then they turn quoting back on again with another call to
-@code{changequote}:
+few places the macros need to use brackets (usually in C program text or
+regular expressions).  In those places, they use the @code{m4} builtin
+command @code{changequote} to temporarily change the quote characters to
+@samp{<<} and @samp{>>}.  Sometimes, if they don't need to quote
+anything, they disable quoting entirely instead.  Here is an example:
 
 @example
+AC_TRY_LINK(
+changequote(<<, >>)dnl
+<<#include <time.h>
+#ifndef tzname /* For SGI.  */
+extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+#endif>>,
 changequote([, ])dnl
+[atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)
 @end example
 
 When you create a @code{configure} script using newly written macros,
@@ -3488,62 +3489,70 @@ for backward compatibility, the old names are considered obsolete.
 @xref{Macro Naming}, for a description of the new naming scheme.
 
 @table @code
-@item AC_NOTICE
-@vindex NOTICE
-@vindex INIT_NOTICE
-@code{AC_INIT_NOTICE}
-@item AC_PREPARE
-@vindex PREPARE
-@vindex INIT_PREPARE
-@code{AC_INIT_PREPARE}
-@item AC_WARN
-@vindex WARN
-@vindex MSG_WARN
-@code{AC_MSG_WARN}
+@item AC_AIX
+@vindex AIX
+@vindex OS_AIX
+@code{AC_OS_AIX}
+@item AC_ALLOCA
+@vindex ALLOCA
+@vindex FUNC_ALLOCA
+@code{AC_FUNC_ALLOCA}
+@item AC_ARG_ARRAY
+@vindex ARG_ARRAY
+@vindex C_ARG_ARRAY
+@code{AC_C_ARG_ARRAY}
+@item AC_CHAR_UNSIGNED
+@vindex CHAR_UNSIGNED
+@vindex C_CHAR_UNSIGNED
+@code{AC_C_CHAR_UNSIGNED}
+@item AC_CONST
+@vindex CONST
+@vindex C_CONST
+@code{AC_C_CONST}
+@item AC_CROSS_CHECK
+@vindex CROSS_CHECK
+@vindex C_CROSS
+@code{AC_C_CROSS}
+@item AC_DYNIX_SEQ
+@vindex DYNIX_SEQ
+@vindex OS_DYNIX
+@code{AC_OS_DYNIX}
 @item AC_ERROR
 @vindex ERROR
 @vindex MSG_ERROR
 @code{AC_MSG_ERROR}
-@item AC_PROGRAM_CHECK
-@vindex PROGRAM_CHECK
-@vindex CHECK_PROG
-@code{AC_CHECK_PROG}
-@item AC_PROGRAM_PATH
-@vindex PROGRAM_PATH
-@vindex PATH_PROG
-@code{AC_PATH_PROG}
-@item AC_PROGRAMS_CHECK
-@vindex PROGRAMS_CHECK
-@vindex CHECK_PROGS
-@code{AC_CHECK_PROGS}
-@item AC_PROGRAMS_PATH
-@vindex PROGRAMS_PATH
-@vindex PATH_PROGS
-@code{AC_PATH_PROGS}
-@item AC_HEADER_EGREP
-@vindex HEADER_EGREP
-@vindex EGREP_HEADER
-@code{AC_EGREP_HEADER}
-@item AC_PROGRAM_EGREP
-@vindex PROGRAM_EGREP
-@vindex EGREP_CPP
-@code{AC_EGREP_CPP}
-@item AC_TEST_PROGRAM
-@vindex TEST_PROGRAM
-@vindex TRY_RUN
-@code{AC_TRY_RUN}
-@item AC_TEST_CPP
-@vindex TEST_CPP
-@vindex TRY_CPP
-@code{AC_TRY_CPP}
-@item AC_HEADER_CHECK
-@vindex HEADER_CHECK
-@vindex CHECK_HEADER
-@code{AC_CHECK_HEADER}
+@item AC_FIND_X
+@vindex FIND_X
+@vindex PATH_X
+@code{AC_PATH_X}
+@item AC_FIND_XTRA
+@vindex FIND_XTRA
+@vindex PATH_XTRA
+@code{AC_PATH_XTRA}
+@item AC_FIND_X_DIRECT
+@vindex FIND_X_DIRECT
+@vindex PATH_X_DIRECT
+@code{AC_PATH_X_DIRECT}
+@item AC_FIND_X_XMKMF
+@vindex FIND_X_XMKMF
+@vindex PATH_X_XMKMF
+@code{AC_PATH_X_XMKMF}
 @item AC_FUNC_CHECK
 @vindex FUNC_CHECK
 @vindex CHECK_FUNC
 @code{AC_CHECK_FUNC}
+@item AC_GCC_TRADITIONAL
+@vindex GCC_TRADITIONAL
+@vindex PROG_GCC_TRADITIONAL
+@code{AC_PROG_GCC_TRADITIONAL}
+@item AC_GETGROUPS_T
+@vindex GETGROUPS_T
+@vindex TYPE_GETGROUPS
+@code{AC_TYPE_GETGROUPS}
+@item AC_GETLOADAVG
+@vindex GETLOADAVG
+@vindex FUNC_GETLOADAVG
+@code{AC_FUNC_GETLOADAVG}
 @item AC_HAVE_FUNCS
 @vindex HAVE_FUNCS
 @vindex CHECK_FUNCS
@@ -3552,217 +3561,213 @@ for backward compatibility, the old names are considered obsolete.
 @vindex HAVE_HEADERS
 @vindex CHECK_HEADERS
 @code{AC_CHECK_HEADERS}
-@item AC_SIZEOF_TYPE
-@vindex SIZEOF_TYPE
-@vindex CHECK_SIZEOF
-@code{AC_CHECK_SIZEOF}
-@item AC_GCC_TRADITIONAL
-@vindex GCC_TRADITIONAL
-@vindex PROG_GCC_TRADITIONAL
-@code{AC_PROG_GCC_TRADITIONAL}
-@item AC_MINUS_C_MINUS_O
-@vindex MINUS_C_MINUS_O
-@vindex PROG_CC_C_O
-@code{AC_PROG_CC_C_O}
-@item AC_SET_MAKE
-@vindex SET_MAKE
-@vindex PROG_MAKE_SET
-@code{AC_PROG_MAKE_SET}
-@item AC_YYTEXT_POINTER
-@vindex YYTEXT_POINTER
-@vindex DECL_YYTEXT
-@code{AC_DECL_YYTEXT}
-@item AC_LN_S
-@vindex LN_S
-@vindex PROG_LN_S
-@code{AC_PROG_LN_S}
-@item AC_RSH
-@vindex RSH
-@vindex PROG_RSH
-@code{AC_PROG_RSH}
-@item AC_STDC_HEADERS
-@vindex STDC_HEADERS
-@vindex HEADER_STDC
-@code{AC_HEADER_STDC}
-@item AC_MAJOR_HEADER
-@vindex MAJOR_HEADER
-@vindex HEADER_MAJOR
-@code{AC_HEADER_MAJOR}
-@item AC_STAT_MACROS_BROKEN
-@vindex STAT_MACROS_BROKEN
-@vindex HEADER_STAT
-@code{AC_HEADER_STAT}
-@item AC_SYS_SIGLIST_DECLARED
-@vindex SYS_SIGLIST_DECLARED
-@vindex DECL_SYS_SIGLIST
-@code{AC_DECL_SYS_SIGLIST}
-@item AC_GETGROUPS_T
-@vindex GETGROUPS_T
-@vindex TYPE_GETGROUPS
-@code{AC_TYPE_GETGROUPS}
-@item AC_UID_T
-@vindex UID_T
-@vindex TYPE_UID_T
-@code{AC_TYPE_UID_T}
-@item AC_SIZE_T
-@vindex SIZE_T
-@vindex TYPE_SIZE_T
-@code{AC_TYPE_SIZE_T}
-@item AC_PID_T
-@vindex PID_T
-@vindex TYPE_PID_T
-@code{AC_TYPE_PID_T}
-@item AC_OFF_T
-@vindex OFF_T
-@vindex TYPE_OFF_T
-@code{AC_TYPE_OFF_T}
-@item AC_MODE_T
-@vindex MODE_T
-@vindex TYPE_MODE_T
-@code{AC_TYPE_MODE_T}
-@item AC_RETSIGTYPE
-@vindex RETSIGTYPE
-@vindex TYPE_SIGNAL
-@code{AC_TYPE_SIGNAL}
-@item AC_MMAP
-@vindex MMAP
-@vindex FUNC_MMAP
-@code{AC_FUNC_MMAP}
-@item AC_VPRINTF
-@vindex VPRINTF
-@vindex FUNC_VPRINTF
-@code{AC_FUNC_VPRINTF}
-@item AC_VFORK
-@vindex VFORK
-@vindex FUNC_VFORK
-@code{AC_FUNC_VFORK}
-@item AC_WAIT3
-@vindex WAIT3
-@vindex FUNC_WAIT3
-@code{AC_FUNC_WAIT3}
-@item AC_ALLOCA
-@vindex ALLOCA
-@vindex FUNC_ALLOCA
-@code{AC_FUNC_ALLOCA}
-@item AC_GETLOADAVG
-@vindex GETLOADAVG
-@vindex FUNC_GETLOADAVG
-@code{AC_FUNC_GETLOADAVG}
-@item AC_UTIME_NULL
-@vindex UTIME_NULL
-@vindex FUNC_UTIME_NULL
-@code{AC_FUNC_UTIME_NULL}
-@item AC_STRCOLL
-@vindex STRCOLL
-@vindex FUNC_STRCOLL
-@code{AC_FUNC_STRCOLL}
-@item AC_SETVBUF_REVERSED
-@vindex SETVBUF_REVERSED
-@vindex FUNC_SETVBUF_REVERSED
-@code{AC_FUNC_SETVBUF_REVERSED}
-@item AC_TIME_WITH_SYS_TIME
-@vindex TIME_WITH_SYS_TIME
-@vindex HEADER_TIME
-@code{AC_HEADER_TIME}
-@item AC_TIMEZONE
-@vindex TIMEZONE
-@vindex STRUCT_TIMEZONE
-@code{AC_STRUCT_TIMEZONE}
-@item AC_ST_BLOCKS
-@vindex ST_BLOCKS
-@vindex STRUCT_ST_BLOCKS
-@code{AC_STRUCT_ST_BLOCKS}
-@item AC_ST_BLKSIZE
-@vindex ST_BLKSIZE
-@vindex STRUCT_ST_BLKSIZE
-@code{AC_STRUCT_ST_BLKSIZE}
-@item AC_ST_RDEV
-@vindex ST_RDEV
-@vindex STRUCT_ST_RDEV
-@code{AC_STRUCT_ST_RDEV}
-@item AC_CROSS_CHECK
-@vindex CROSS_CHECK
-@vindex C_CROSS
-@code{AC_C_CROSS}
-@item AC_CHAR_UNSIGNED
-@vindex CHAR_UNSIGNED
-@vindex C_CHAR_UNSIGNED
-@code{AC_C_CHAR_UNSIGNED}
-@item AC_LONG_DOUBLE
-@vindex LONG_DOUBLE
-@vindex C_LONG_DOUBLE
-@code{AC_C_LONG_DOUBLE}
-@item AC_WORDS_BIGENDIAN
-@vindex WORDS_BIGENDIAN
-@vindex C_BIGENDIAN
-@code{AC_C_BIGENDIAN}
-@item AC_ARG_ARRAY
-@vindex ARG_ARRAY
-@vindex C_ARG_ARRAY
-@code{AC_C_ARG_ARRAY}
+@item AC_HAVE_POUNDBANG
+@vindex HAVE_POUNDBANG
+@vindex SYS_INTERPRETER
+@code{AC_SYS_INTERPRETER} (different calling convention)
+@item AC_HEADER_CHECK
+@vindex HEADER_CHECK
+@vindex CHECK_HEADER
+@code{AC_CHECK_HEADER}
+@item AC_HEADER_EGREP
+@vindex HEADER_EGREP
+@vindex EGREP_HEADER
+@code{AC_EGREP_HEADER}
 @item AC_INLINE
 @vindex INLINE
 @vindex C_INLINE
 @code{AC_C_INLINE}
-@item AC_CONST
-@vindex CONST
-@vindex C_CONST
-@code{AC_C_CONST}
-@item AC_REMOTE_TAPE
-@vindex REMOTE_TAPE
-removed
-@item AC_LONG_FILE_NAMES
-@vindex LONG_FILE_NAMES
-@vindex SYS_LONG_FILE_NAMES
-@code{AC_SYS_LONG_FILE_NAMES}
-@item AC_RESTARTABLE_SYSCALLS
-@vindex RESTARTABLE_SYSCALLS
-@vindex SYS_RESTARTABLE_SYSCALLS
-@code{AC_SYS_RESTARTABLE_SYSCALLS}
-@item AC_FIND_X
-@vindex FIND_X
-@vindex PATH_X
-@code{AC_PATH_X}
-@item AC_FIND_X_XMKMF
-@vindex FIND_X_XMKMF
-@vindex PATH_X_XMKMF
-@code{AC_PATH_X_XMKMF}
-@item AC_FIND_X_DIRECT
-@vindex FIND_X_DIRECT
-@vindex PATH_X_DIRECT
-@code{AC_PATH_X_DIRECT}
-@item AC_FIND_XTRA
-@vindex FIND_XTRA
-@vindex PATH_XTRA
-@code{AC_PATH_XTRA}
-@item AC_AIX
-@vindex AIX
-@vindex OS_AIX
-@code{AC_OS_AIX}
-@item AC_MINIX
-@vindex MINIX
-@vindex OS_MINIX
-@code{AC_OS_MINIX}
-@item AC_ISC_POSIX
-@vindex ISC_POSIX
-@vindex OS_ISC
-@code{AC_OS_ISC}
-@item AC_XENIX_DIR
-@vindex XENIX_DIR
-@vindex OS_XENIX
-@code{AC_OS_XENIX}
-@item AC_SCO_INTL
-@vindex SCO_INTL
-@vindex OS_SCO
-@code{AC_OS_SCO}
 @item AC_IRIX_SUN
 @vindex IRIX_SUN
 @vindex OS_IRIX
 @code{AC_OS_IRIX}
-@item AC_DYNIX_SEQ
-@vindex DYNIX_SEQ
-@vindex OS_DYNIX
-@code{AC_OS_DYNIX}
+@item AC_ISC_POSIX
+@vindex ISC_POSIX
+@vindex OS_ISC
+@code{AC_OS_ISC}
+@item AC_LN_S
+@vindex LN_S
+@vindex PROG_LN_S
+@code{AC_PROG_LN_S}
+@item AC_LONG_DOUBLE
+@vindex LONG_DOUBLE
+@vindex C_LONG_DOUBLE
+@code{AC_C_LONG_DOUBLE}
+@item AC_LONG_FILE_NAMES
+@vindex LONG_FILE_NAMES
+@vindex SYS_LONG_FILE_NAMES
+@code{AC_SYS_LONG_FILE_NAMES}
+@item AC_MAJOR_HEADER
+@vindex MAJOR_HEADER
+@vindex HEADER_MAJOR
+@code{AC_HEADER_MAJOR}
+@item AC_MINIX
+@vindex MINIX
+@vindex OS_MINIX
+@code{AC_OS_MINIX}
+@item AC_MINUS_C_MINUS_O
+@vindex MINUS_C_MINUS_O
+@vindex PROG_CC_C_O
+@code{AC_PROG_CC_C_O}
+@item AC_MMAP
+@vindex MMAP
+@vindex FUNC_MMAP
+@code{AC_FUNC_MMAP}
+@item AC_MODE_T
+@vindex MODE_T
+@vindex TYPE_MODE_T
+@code{AC_TYPE_MODE_T}
+@item AC_NOTICE
+@vindex NOTICE
+@vindex INIT_NOTICE
+@code{AC_INIT_NOTICE}
+@item AC_OFF_T
+@vindex OFF_T
+@vindex TYPE_OFF_T
+@code{AC_TYPE_OFF_T}
+@item AC_PID_T
+@vindex PID_T
+@vindex TYPE_PID_T
+@code{AC_TYPE_PID_T}
+@item AC_PREPARE
+@vindex PREPARE
+@vindex INIT_PREPARE
+@code{AC_INIT_PREPARE}
+@item AC_PROGRAMS_CHECK
+@vindex PROGRAMS_CHECK
+@vindex CHECK_PROGS
+@code{AC_CHECK_PROGS}
+@item AC_PROGRAMS_PATH
+@vindex PROGRAMS_PATH
+@vindex PATH_PROGS
+@code{AC_PATH_PROGS}
+@item AC_PROGRAM_CHECK
+@vindex PROGRAM_CHECK
+@vindex CHECK_PROG
+@code{AC_CHECK_PROG}
+@item AC_PROGRAM_EGREP
+@vindex PROGRAM_EGREP
+@vindex EGREP_CPP
+@code{AC_EGREP_CPP}
+@item AC_PROGRAM_PATH
+@vindex PROGRAM_PATH
+@vindex PATH_PROG
+@code{AC_PATH_PROG}
+@item AC_REMOTE_TAPE
+@vindex REMOTE_TAPE
+removed because of limited usefulness
+@item AC_RESTARTABLE_SYSCALLS
+@vindex RESTARTABLE_SYSCALLS
+@vindex SYS_RESTARTABLE_SYSCALLS
+@code{AC_SYS_RESTARTABLE_SYSCALLS}
+@item AC_RETSIGTYPE
+@vindex RETSIGTYPE
+@vindex TYPE_SIGNAL
+@code{AC_TYPE_SIGNAL}
+@item AC_RSH
+@vindex RSH
+@vindex PROG_RSH
+@code{AC_PROG_RSH}
+@item AC_SCO_INTL
+@vindex SCO_INTL
+@vindex OS_SCO
+@code{AC_OS_SCO}
+@item AC_SETVBUF_REVERSED
+@vindex SETVBUF_REVERSED
+@vindex FUNC_SETVBUF_REVERSED
+@code{AC_FUNC_SETVBUF_REVERSED}
+@item AC_SET_MAKE
+@vindex SET_MAKE
+@vindex PROG_MAKE_SET
+@code{AC_PROG_MAKE_SET}
+@item AC_SIZEOF_TYPE
+@vindex SIZEOF_TYPE
+@vindex CHECK_SIZEOF
+@code{AC_CHECK_SIZEOF}
+@item AC_SIZE_T
+@vindex SIZE_T
+@vindex TYPE_SIZE_T
+@code{AC_TYPE_SIZE_T}
+@item AC_STAT_MACROS_BROKEN
+@vindex STAT_MACROS_BROKEN
+@vindex HEADER_STAT
+@code{AC_HEADER_STAT}
+@item AC_STDC_HEADERS
+@vindex STDC_HEADERS
+@vindex HEADER_STDC
+@code{AC_HEADER_STDC}
+@item AC_STRCOLL
+@vindex STRCOLL
+@vindex FUNC_STRCOLL
+@code{AC_FUNC_STRCOLL}
+@item AC_ST_BLKSIZE
+@vindex ST_BLKSIZE
+@vindex STRUCT_ST_BLKSIZE
+@code{AC_STRUCT_ST_BLKSIZE}
+@item AC_ST_BLOCKS
+@vindex ST_BLOCKS
+@vindex STRUCT_ST_BLOCKS
+@code{AC_STRUCT_ST_BLOCKS}
+@item AC_ST_RDEV
+@vindex ST_RDEV
+@vindex STRUCT_ST_RDEV
+@code{AC_STRUCT_ST_RDEV}
+@item AC_SYS_SIGLIST_DECLARED
+@vindex SYS_SIGLIST_DECLARED
+@vindex DECL_SYS_SIGLIST
+@code{AC_DECL_SYS_SIGLIST}
+@item AC_TEST_CPP
+@vindex TEST_CPP
+@vindex TRY_CPP
+@code{AC_TRY_CPP}
+@item AC_TEST_PROGRAM
+@vindex TEST_PROGRAM
+@vindex TRY_RUN
+@code{AC_TRY_RUN}
+@item AC_TIMEZONE
+@vindex TIMEZONE
+@vindex STRUCT_TIMEZONE
+@code{AC_STRUCT_TIMEZONE}
+@item AC_TIME_WITH_SYS_TIME
+@vindex TIME_WITH_SYS_TIME
+@vindex HEADER_TIME
+@code{AC_HEADER_TIME}
+@item AC_UID_T
+@vindex UID_T
+@vindex TYPE_UID_T
+@code{AC_TYPE_UID_T}
+@item AC_UTIME_NULL
+@vindex UTIME_NULL
+@vindex FUNC_UTIME_NULL
+@code{AC_FUNC_UTIME_NULL}
+@item AC_VFORK
+@vindex VFORK
+@vindex FUNC_VFORK
+@code{AC_FUNC_VFORK}
+@item AC_VPRINTF
+@vindex VPRINTF
+@vindex FUNC_VPRINTF
+@code{AC_FUNC_VPRINTF}
+@item AC_WAIT3
+@vindex WAIT3
+@vindex FUNC_WAIT3
+@code{AC_FUNC_WAIT3}
+@item AC_WARN
+@vindex WARN
+@vindex MSG_WARN
+@code{AC_MSG_WARN}
+@item AC_WORDS_BIGENDIAN
+@vindex WORDS_BIGENDIAN
+@vindex C_BIGENDIAN
+@code{AC_C_BIGENDIAN}
+@item AC_XENIX_DIR
+@vindex XENIX_DIR
+@vindex OS_XENIX
+@code{AC_OS_XENIX}
+@item AC_YYTEXT_POINTER
+@vindex YYTEXT_POINTER
+@vindex DECL_YYTEXT
+@code{AC_DECL_YYTEXT}
 @end table
 
 @node Example, History, Old Macro Names, Top
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 85e932c2..641be641 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -1132,11 +1132,13 @@ if test "$ac_cv_struct_tm_zone" = yes; then
 else
   AC_MSG_CHECKING([for tzname])
 AC_CACHE_VAL(ac_cv_var_tzname,
-[AC_TRY_LINK(changequote(<<, >>)dnl
+[AC_TRY_LINK(
+changequote(<<, >>)dnl
 <<#include <time.h>
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
-#endif>>, changequote([, ])dnl
+#endif>>,
+changequote([, ])dnl
 [atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)])dnl
   AC_MSG_RESULT($ac_cv_var_tzname)
   if test $ac_cv_var_tzname = yes; then
@@ -1238,18 +1240,18 @@ fi
 dnl
 AC_DEFUN(AC_INT_16_BITS,
 [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])
-AC_MSG_CHECKING(integer size)
+AC_MSG_CHECKING(whether int is 16 bits)
 AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
- [AC_MSG_RESULT(16 bits)
- AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(not 16 bits))
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
 ])dnl
 dnl
 AC_DEFUN(AC_LONG_64_BITS,
 [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])
-AC_MSG_CHECKING(for 64-bit long ints)
+AC_MSG_CHECKING(whether long int is 64 bits)
 AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
- [AC_MSG_RESULT(64 bits)
- AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(not 64 bits))
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
 ])dnl
 dnl
 AC_DEFUN(AC_C_BIGENDIAN,
@@ -1365,8 +1367,7 @@ dnl
 dnl ### Checks for operating system services
 dnl
 dnl
-dnl This macro is an oddball -- the only specific test that takes args.
-AC_DEFUN(AC_HAVE_POUNDBANG,
+AC_DEFUN(AC_SYS_INTERPRETER,
 [AC_MSG_CHECKING(whether [#]! works in shell scripts)
 AC_CACHE_VAL(ac_cv_sys_interpreter,
 [echo '#!/bin/cat
@@ -1381,12 +1382,6 @@ else
 fi
 rm -f conftest])dnl
 AC_MSG_RESULT($ac_cv_sys_interpreter)
-if test $ac_cv_sys_interpreter = yes; then
-  ifelse([$1], , :, [$1])
-ifelse([$2], , , [else
-  $2
-])dnl
-fi
 ])dnl
 dnl
 AC_DEFUN(AC_SYS_LONG_FILE_NAMES,
@@ -1726,10 +1721,9 @@ AC_EGREP_CPP(yes,
 ], [AC_MSG_RESULT(yes); XENIX=yes], [AC_MSG_RESULT(no); XENIX=])
 if test "$XENIX" = yes; then
   LIBS="$LIBS -lx"
-  case "$DEFS" in
-  *SYSNDIR*) ;;
-  *) LIBS="-ldir $LIBS" ;; # Make sure -ldir precedes any -lx.
-  esac
+  if test $ac_header_dir != sys/ndir.h; then
+    LIBS="-ldir $LIBS" # Make sure -ldir precedes -lx.
+  fi
 fi
 ])dnl
 dnl