From: Akim Demaille <akim@epita.fr>
Date: Tue, 23 May 2000 14:54:49 +0000 (+0000)
Subject: Simplify the interface: users shouldn't need to explicitly check
X-Git-Tag: autoconf-2.50~879
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7435a2e96cfbcb247fb426cc5528843b2d325d78;p=thirdparty%2Fautoconf.git

Simplify the interface: users shouldn't need to explicitly check
for special environments.

* acspecific.m4 (AC_EXEEXT, AC_OBJEXT): AU defined to
nothing.  Replace them by...
(_AC_EXEEXT, _AC_OBJEXT): this.
* aclang.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_F77): Call them.
(AC_PROG_CC_G, AC_PROG_CXX_G, AC_PROG_F77_G): Rename as...
(_AC_PROG_CC_G, _AC_PROG_CXX_G, _AC_PROG_F77_G): this.
Adjust dependencies.
* tests/Makefile.am (FILTER_MACROS): Adjust.
* doc/autoconf.texi (Compilers and Preprocessors): New section,
move the documentation of AC_PROG_CC, AC_PROG_CC_C_O,
AC_PROG_CC_STDC, AC_PROG_CPP, AC_PROG_CXX, AC_PROG_CXXCPP,
AC_PROG_F77, AC_PROG_F77_C_O, AC_PROG_GCC_TRADITIONAL here.
Factor the comment documentation of AC_PROG_CC, AC_PROG_CXX,
AC_PROG_F77.
---

diff --git a/ChangeLog b/ChangeLog
index d1c8e487f..8434e52e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2000-05-23  Akim Demaille  <akim@epita.fr>
+
+	Simplify the interface: users shouldn't need to explicitly check
+	for special environments.
+
+	* acspecific.m4 (AC_EXEEXT, AC_OBJEXT): AU defined to
+	nothing.  Replace them by...
+	(_AC_EXEEXT, _AC_OBJEXT): this.
+	* aclang.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_F77): Call them.
+	(AC_PROG_CC_G, AC_PROG_CXX_G, AC_PROG_F77_G): Rename as...
+	(_AC_PROG_CC_G, _AC_PROG_CXX_G, _AC_PROG_F77_G): this.
+	Adjust dependencies.
+	* tests/Makefile.am (FILTER_MACROS): Adjust.
+	* doc/autoconf.texi (Compilers and Preprocessors): New section,
+	move the documentation of AC_PROG_CC, AC_PROG_CC_C_O,
+	AC_PROG_CC_STDC, AC_PROG_CPP, AC_PROG_CXX, AC_PROG_CXXCPP,
+	AC_PROG_F77, AC_PROG_F77_C_O, AC_PROG_GCC_TRADITIONAL here.
+	Factor the comment documentation of AC_PROG_CC, AC_PROG_CXX,
+	AC_PROG_F77.
+
 2000-05-23  Akim Demaille  <akim@epita.fr>
 
 	Modernize AC_EXEEXT and AC_OBJEXT.
diff --git a/aclang.m4 b/aclang.m4
index ad279b66d..905aed125 100644
--- a/aclang.m4
+++ b/aclang.m4
@@ -470,7 +470,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS=
-AC_PROG_CC_G
+_AC_PROG_CC_G
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -486,6 +486,8 @@ else
     CFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -513,9 +515,9 @@ fi[]dnl
 ])# _AC_PROG_CC_GNU
 
 
-# AC_PROG_CC_G
+# _AC_PROG_CC_G
 # ------------
-AC_DEFUN([AC_PROG_CC_G],
+define([_AC_PROG_CC_G],
 [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [echo 'void f(){}' >conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -524,7 +526,7 @@ else
   ac_cv_prog_cc_g=no
 fi
 rm -f conftest*
-])])
+])])# _AC_PROG_CC_G
 
 
 # AC_PROG_GCC_TRADITIONAL
@@ -648,7 +650,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
-AC_PROG_CXX_G
+_AC_PROG_CXX_G
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -664,6 +666,8 @@ else
     CXXFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -692,9 +696,9 @@ fi[]dnl
 ])# _AC_PROG_CXX_GNU
 
 
-# AC_PROG_CXX_G
+# _AC_PROG_CXX_G
 # -------------
-AC_DEFUN([AC_PROG_CXX_G],
+define([_AC_PROG_CXX_G],
 [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [echo 'void f(){}' >conftest.cc
 if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -703,7 +707,7 @@ else
   ac_cv_prog_cxx_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_CXX_G
+])])# _AC_PROG_CXX_G
 
 
 
@@ -731,7 +735,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-AC_PROG_F77_G
+_AC_PROG_F77_G
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -747,6 +751,8 @@ else
     FFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
@@ -776,11 +782,11 @@ fi[]dnl
 ])# _AC_PROG_F77_GNU
 
 
-# AC_PROG_F77_G
+# _AC_PROG_F77_G
 # -------------
 # Test whether the Fortran 77 compiler can accept the `-g' option to
 # enable debugging.
-AC_DEFUN([AC_PROG_F77_G],
+define([_AC_PROG_F77_G],
 [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g,
 [cat >conftest.f <<EOF
        program conftest
@@ -792,7 +798,7 @@ else
   ac_cv_prog_f77_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_F77_G
+])])# _AC_PROG_F77_G
 
 
 # AC_PROG_F77_C_O
diff --git a/acspecific.m4 b/acspecific.m4
index c65357b30..43bcea8fe 100644
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -2543,14 +2543,16 @@ AU_DEFUN([AC_CYGWIN32], [])
 AU_DEFUN([AC_EMXOS2],   [])
 AU_DEFUN([AC_MING32],   [])
 
+AU_DEFUN([AC_EXEEXT],   [])
+AU_DEFUN([AC_OBJEXT],   [])
 
-# AC_EXEEXT
-# ---------
+# _AC_EXEEXT
+# -_--------
 # Check for the extension used for executables.  This knows that we
 # add .exe for Cygwin or mingw32.  Otherwise, it compiles a test
 # executable.  If this is called, the executable extensions will be
 # automatically used by link commands run by the configure script.
-AC_DEFUN([AC_EXEEXT],
+define([_AC_EXEEXT],
 [_AC_CYGWIN
 _AC_MINGW32
 _AC_EMXOS2
@@ -2573,15 +2575,15 @@ test "$ac_cv_exeext" != no && EXEEXT=$ac_cv_exeext
 dnl Setting ac_exeext will implicitly change the ac_link command.
 ac_exeext=$EXEEXT
 AC_SUBST(EXEEXT)dnl
-])# AC_EXEEXT
+])# _AC_EXEEXT
 
 
-# AC_OBJEXT
-# ---------
+# _AC_OBJEXT
+# ----------
 # Check the object extension used by the compiler: typically .o or
 # .obj.  If this is called, some other behaviour will change,
 # determined by ac_objext.
-AC_DEFUN([AC_OBJEXT],
+define([_AC_OBJEXT],
 [AC_CACHE_CHECK([for object suffix], ac_cv_objext,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
    [for ac_file in conftest.*; do
@@ -2593,7 +2595,7 @@ AC_DEFUN([AC_OBJEXT],
    [AC_MSG_ERROR([cannot compile])])])
 AC_SUBST(OBJEXT, $ac_cv_objext)dnl
 ac_objext=$ac_cv_objext
-])
+])# _AC_OBJEXT
 
 
 
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 502ecdc61..821f6faf5 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -194,6 +194,7 @@ Existing Tests
 * Declarations::                Declarations that may be missing
 * Structures::                  Structures or members that might be missing
 * Types::                       Types that might be missing
+* Compilers and Preprocessors::  Checking for compiling programs
 * C Compiler Characteristics::
 * Fortran 77 Compiler Characteristics::
 * System Services::             Operating system services
@@ -2211,6 +2212,7 @@ Symbols}, for how to get those symbol definitions into your program.
 * Declarations::                Declarations that may be missing
 * Structures::                  Structures or members that might be missing
 * Types::                       Types that might be missing
+* Compilers and Preprocessors::  Checking for compiling programs
 * C Compiler Characteristics::
 * Fortran 77 Compiler Characteristics::
 * System Services::             Operating system services
@@ -2343,177 +2345,6 @@ finds.  It tries @code{mawk} first because that is reported to be the
 fastest implementation.
 @end defmac
 
-@defmac AC_PROG_CC (@ovar{compiler-search-list})
-@maindex PROG_CC
-@ovindex CC
-@ovindex CFLAGS
-Determine a C compiler to use.  If @code{CC} is not already set in the
-environment, check for @code{gcc}, and use @code{cc} if that's not found.
-Set output variable @code{CC} to the name of the compiler found.
-
-This macro may, however, be invoked with an optional first argument
-which, if specified, must be a space separated list of C compilers to
-search for.  This just gives the user an opportunity to specify an
-alternative search list for the C compiler.  For example, if you didn't
-like the default order, then you could invoke @code{AC_PROG_CC} like
-this:
-
-@example
-AC_PROG_CC(cl egcs gcc cc)
-@end example
-
-If using the @sc{gnu} C compiler, set shell variable @code{GCC} to
-@samp{yes}.  If output variable @code{CFLAGS} was not already set, set
-it to @samp{-g -O2} for the @sc{gnu} C compiler (@samp{-O2} on systems
-where GCC does not accept @samp{-g}), or @samp{-g} for other compilers.
-
-If the compiler being used does not produce executables, fail.  If the
-executables can't be run, and cross-compilation is not enabled, fail.
-@xref{Manual Configuration}, for more on support for cross compiling.
-@end defmac
-
-@defmac AC_PROG_CC_C_O
-@maindex PROG_CC_C_O
-@cvindex NO_MINUS_C_MINUS_O
-If the C compiler does not accept the @samp{-c} and @samp{-o} options
-simultaneously, define @code{NO_MINUS_C_MINUS_O}.  This macro actually
-tests both the compiler found by @code{AC_PROG_CC}, and, if different,
-the first @code{cc} in the path.  The test fails if one fails.  This
-macro was created for @sc{gnu} Make to choose the default C compilation
-rule.
-@end defmac
-
-@defmac AC_PROG_CC_STDC
-@maindex PROG_CC_STDC
-@ovindex CC
-If the C compiler in not in @sc{ansi} C mode by default, try to add an
-option to output variable @code{CC} to make it so.  This macro tries
-various options that select @sc{ansi} C on some system or another.  It
-considers the compiler to be in @sc{ansi} C mode if it handles function
-prototypes correctly.
-
-If you use this macro, you should check after calling it whether the C
-compiler has been set to accept @sc{ansi} C; if not, the shell variable
-@code{ac_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-code in @sc{ansi} C, you can make an un-@sc{ansi}fied copy of it by
-using the program @code{ansi2knr}, which comes with Ghostscript.
-@end defmac
-
-
-@defmac AC_PROG_CPP
-@maindex PROG_CPP
-@ovindex CPP
-Set output variable @code{CPP} to a command that runs the
-C preprocessor.  If @samp{$CC -E} doesn't work, it uses @file{/lib/cpp}.
-It is only portable to run @code{CPP} on files with a @file{.c}
-extension.
-
-If the current language is C (@pxref{Language Choice}), many of the
-specific test macros use the value of @code{CPP} indirectly by calling
-@code{AC_TRY_CPP}, @code{AC_CHECK_HEADER}, @code{AC_EGREP_HEADER}, or
-@code{AC_EGREP_CPP}.
-@end defmac
-
-@defmac AC_PROG_CXX (@ovar{compiler-search-list})
-@maindex PROG_CXX
-@ovindex CXX
-@ovindex CXXFLAGS
-Determine a C++ compiler to use.  Check if the environment variable
-@code{CXX} or @code{CCC} (in that order) is set; if so, then set output
-variable @code{CXX} to its value.
-
-Otherwise, if the macro is invoked without an argument, then search for
-a C++ compiler under the likely names @code{c++}, @code{g++},
-@code{gcc}, @code{CC}, @code{cxx}, @code{cc++} and @code{cl} (in that
-order).  If none of those checks succeed, then as a last resort set
-@code{CXX} to @code{gcc}.
-
-This macro may, however, be invoked with an optional first argument
-which, if specified, must be a space separated list of C++ compilers to
-search for.  This just gives the user an opportunity to specify an
-alternative search list for the C++ compiler.  For example, if you
-didn't like the default order, then you could invoke @code{AC_PROG_CXX}
-like this:
-
-@example
-AC_PROG_CXX(cl KCC CC cxx cc++ xlC aCC c++ g++ egcs gcc)
-@end example
-
-If using the @sc{gnu} C++ compiler, set shell variable @code{GXX} to
-@samp{yes}.  If output variable @code{CXXFLAGS} was not already set, set
-it to @samp{-g -O2} for the @sc{gnu} C++ compiler (@samp{-O2} on systems
-where G++ does not accept @samp{-g}), or @samp{-g} for other compilers.
-
-If the compiler being used does not produce executables, fail.  If the
-executables can't be run, and cross-compilation is not enabled, fail.
-@xref{Manual Configuration}, for more on support for cross compiling.
-@end defmac
-
-@defmac AC_PROG_CXXCPP
-@maindex PROG_CXXCPP
-@ovindex CXXCPP
-Set output variable @code{CXXCPP} to a command that runs the
-C++ preprocessor.  If @samp{$CXX -E} doesn't work, it uses @file{/lib/cpp}.
-It is only portable to run @code{CXXCPP} on files with a @file{.c},
-@file{.C}, or @file{.cc} extension.
-
-If the current language is C++ (@pxref{Language Choice}), many of the
-specific test macros use the value of @code{CXXCPP} indirectly by
-calling @code{AC_TRY_CPP}, @code{AC_CHECK_HEADER},
-@code{AC_EGREP_HEADER}, or @code{AC_EGREP_CPP}.
-@end defmac
-
-@defmac AC_PROG_F77 (@ovar{compiler-search-list})
-@maindex PROG_FORTRAN
-@ovindex F77
-@ovindex FFLAGS
-Determine a Fortran 77 compiler to use.  If @code{F77} is not already
-set in the environment, then check for @code{g77}, @code{f77},
-@code{xlf}, @code{cf77}, @code{fl32}, @code{fort77}, @code{f90},
-@code{xlf90} and @code{f2c}, in that order.  Set the output variable
-@code{F77} to the name of the compiler found.
-
-This macro may, however, be invoked with an optional first argument
-which, if specified, must be a space separated list of Fortran 77
-compilers to search for.  This just gives the user an opportunity to
-specify an alternative search list for the Fortran 77 compiler.  For
-example, if you didn't like the default order, then you could invoke
-@code{AC_PROG_F77} like this:
-
-@example
-AC_PROG_F77(fl32 f77 fort77 xlf cf77 g77 f90 xlf90 f2c)
-@end example
-
-If using @code{g77} (the @sc{gnu} Fortran 77 compiler), then
-@code{AC_PROG_F77} will set the shell variable @code{G77} to @samp{yes}.
-If the output variable @code{FFLAGS} was not already set in the
-environment, then set it to @samp{-g -02} for @code{g77} (or @samp{-O2}
-where @code{g77} does not accept @samp{-g}).  Otherwise, set
-@code{FFLAGS} to @samp{-g} for all other Fortran 77 compilers.
-
-If the compiler being used does not produce executables, fail.  If the
-executables can't be run, and cross-compilation is not enabled, fail.
-@xref{Manual Configuration}, for more on support for cross compiling.
-@end defmac
-
-@defmac AC_PROG_F77_C_O
-@maindex PROG_F77_C_O
-@cvindex F77_NO_MINUS_C_MINUS_O
-Test if the Fortran 77 compiler accepts the options @samp{-c} and
-@samp{-o} simultaneously, and define @code{F77_NO_MINUS_C_MINUS_O} if it
-does not.
-@end defmac
-
-@defmac AC_PROG_GCC_TRADITIONAL
-@maindex PROG_GCC_TRADITIONAL
-@ovindex CC
-Add @samp{-traditional} to output variable @code{CC} if using the
-@sc{gnu} C compiler and @code{ioctl} does not work properly without
-@samp{-traditional}.  That usually happens when the fixed header files
-have not been installed on an old system.  Since recent versions of the
-@sc{gnu} C compiler fix the header files automatically when installed,
-this is becoming a less prevalent problem.
-@end defmac
 
 @defmac AC_PROG_INSTALL
 @maindex PROG_INSTALL
@@ -3624,7 +3455,7 @@ AC_CHECK_MEMBERS([struct stat.st_rdev, struct stat.st_blksize])
 @end defmac
 
 
-@node Types, C Compiler Characteristics, Structures, Existing Tests
+@node Types, Compilers and Preprocessors, Structures, Existing Tests
 @section Types
 
 The following macros check for C types, either builtin or typedefs.  If
@@ -3740,9 +3571,197 @@ the documentation of the former @code{AC_CHECK_TYPE}, see @ref{Obsolete
 Macros}.
 
 
+@node Compilers and Preprocessors, C Compiler Characteristics, Types, Existing Tests
+@section Compilers and Preprocessors
 
+@ovindex EXEEXT
+All the tests for compilers (@code{AC_PROG_CC}, @code{AC_PROG_CXX},
+@code{AC_PROG_F77}) define the output variable @code{EXEEXT} based on
+the output of the compiler, after @samp{.$ac_ext} (i.e. source files of
+the current language), @samp{.o}, @samp{.obj} and @samp{.xcoff} files
+have been excluded.  Typically set to empty string if Unix and
+@samp{.exe} if Win32 or OS/2.
+
+@ovindex CYGWIN
+@ovindex EMXOS2
+@ovindex MINGW32
+They also set the shell variable @code{CYGWIN} to @samp{yes} if run in
+the Cygwin environment, @code{EMXOS2} to @samp{yes} if in the EMX
+environment on OS/2, and @code{MINGW32} to @samp{yes} with the MingW32
+compiler.
+
+@ovindex OBJEXT
+Finally, they define the output variable @code{OBJEXT} based on the
+output of the compiler, after .c files have been excluded.  Typically
+set to @samp{o} if Unix, @samp{obj} if Win32.
+
+If the compiler being used does not produce executables, they fail.  If
+the executables can't be run, and cross-compilation is not enabled, they
+fail too.  @xref{Manual Configuration}, for more on support for cross
+compiling.
 
-@node C Compiler Characteristics, Fortran 77 Compiler Characteristics, Types, Existing Tests
+@defmac AC_PROG_CC (@ovar{compiler-search-list})
+@maindex PROG_CC
+@ovindex CC
+@ovindex CFLAGS
+Determine a C compiler to use.  If @code{CC} is not already set in the
+environment, check for @code{gcc}, and use @code{cc} if that's not found.
+Set output variable @code{CC} to the name of the compiler found.
+
+This macro may, however, be invoked with an optional first argument
+which, if specified, must be a space separated list of C compilers to
+search for.  This just gives the user an opportunity to specify an
+alternative search list for the C compiler.  For example, if you didn't
+like the default order, then you could invoke @code{AC_PROG_CC} like
+this:
+
+@example
+AC_PROG_CC(cl egcs gcc cc)
+@end example
+
+If using the @sc{gnu} C compiler, set shell variable @code{GCC} to
+@samp{yes}.  If output variable @code{CFLAGS} was not already set, set
+it to @samp{-g -O2} for the @sc{gnu} C compiler (@samp{-O2} on systems
+where GCC does not accept @samp{-g}), or @samp{-g} for other compilers.
+@end defmac
+
+@defmac AC_PROG_CC_C_O
+@maindex PROG_CC_C_O
+@cvindex NO_MINUS_C_MINUS_O
+If the C compiler does not accept the @samp{-c} and @samp{-o} options
+simultaneously, define @code{NO_MINUS_C_MINUS_O}.  This macro actually
+tests both the compiler found by @code{AC_PROG_CC}, and, if different,
+the first @code{cc} in the path.  The test fails if one fails.  This
+macro was created for @sc{gnu} Make to choose the default C compilation
+rule.
+@end defmac
+
+@defmac AC_PROG_CC_STDC
+@maindex PROG_CC_STDC
+@ovindex CC
+If the C compiler in not in @sc{ansi} C mode by default, try to add an
+option to output variable @code{CC} to make it so.  This macro tries
+various options that select @sc{ansi} C on some system or another.  It
+considers the compiler to be in @sc{ansi} C mode if it handles function
+prototypes correctly.
+
+If you use this macro, you should check after calling it whether the C
+compiler has been set to accept @sc{ansi} C; if not, the shell variable
+@code{ac_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
+code in @sc{ansi} C, you can make an un-@sc{ansi}fied copy of it by
+using the program @code{ansi2knr}, which comes with Ghostscript.
+@end defmac
+
+
+@defmac AC_PROG_CPP
+@maindex PROG_CPP
+@ovindex CPP
+Set output variable @code{CPP} to a command that runs the
+C preprocessor.  If @samp{$CC -E} doesn't work, it uses @file{/lib/cpp}.
+It is only portable to run @code{CPP} on files with a @file{.c}
+extension.
+
+If the current language is C (@pxref{Language Choice}), many of the
+specific test macros use the value of @code{CPP} indirectly by calling
+@code{AC_TRY_CPP}, @code{AC_CHECK_HEADER}, @code{AC_EGREP_HEADER}, or
+@code{AC_EGREP_CPP}.
+@end defmac
+
+@defmac AC_PROG_CXX (@ovar{compiler-search-list})
+@maindex PROG_CXX
+@ovindex CXX
+@ovindex CXXFLAGS
+Determine a C++ compiler to use.  Check if the environment variable
+@code{CXX} or @code{CCC} (in that order) is set; if so, then set output
+variable @code{CXX} to its value.
+
+Otherwise, if the macro is invoked without an argument, then search for
+a C++ compiler under the likely names @code{c++}, @code{g++},
+@code{gcc}, @code{CC}, @code{cxx}, @code{cc++} and @code{cl} (in that
+order).  If none of those checks succeed, then as a last resort set
+@code{CXX} to @code{gcc}.
+
+This macro may, however, be invoked with an optional first argument
+which, if specified, must be a space separated list of C++ compilers to
+search for.  This just gives the user an opportunity to specify an
+alternative search list for the C++ compiler.  For example, if you
+didn't like the default order, then you could invoke @code{AC_PROG_CXX}
+like this:
+
+@example
+AC_PROG_CXX(cl KCC CC cxx cc++ xlC aCC c++ g++ egcs gcc)
+@end example
+
+If using the @sc{gnu} C++ compiler, set shell variable @code{GXX} to
+@samp{yes}.  If output variable @code{CXXFLAGS} was not already set, set
+it to @samp{-g -O2} for the @sc{gnu} C++ compiler (@samp{-O2} on systems
+where G++ does not accept @samp{-g}), or @samp{-g} for other compilers.
+@end defmac
+
+@defmac AC_PROG_CXXCPP
+@maindex PROG_CXXCPP
+@ovindex CXXCPP
+Set output variable @code{CXXCPP} to a command that runs the
+C++ preprocessor.  If @samp{$CXX -E} doesn't work, it uses @file{/lib/cpp}.
+It is only portable to run @code{CXXCPP} on files with a @file{.c},
+@file{.C}, or @file{.cc} extension.
+
+If the current language is C++ (@pxref{Language Choice}), many of the
+specific test macros use the value of @code{CXXCPP} indirectly by
+calling @code{AC_TRY_CPP}, @code{AC_CHECK_HEADER},
+@code{AC_EGREP_HEADER}, or @code{AC_EGREP_CPP}.
+@end defmac
+
+@defmac AC_PROG_F77 (@ovar{compiler-search-list})
+@maindex PROG_FORTRAN
+@ovindex F77
+@ovindex FFLAGS
+Determine a Fortran 77 compiler to use.  If @code{F77} is not already
+set in the environment, then check for @code{g77}, @code{f77},
+@code{xlf}, @code{cf77}, @code{fl32}, @code{fort77}, @code{f90},
+@code{xlf90} and @code{f2c}, in that order.  Set the output variable
+@code{F77} to the name of the compiler found.
+
+This macro may, however, be invoked with an optional first argument
+which, if specified, must be a space separated list of Fortran 77
+compilers to search for.  This just gives the user an opportunity to
+specify an alternative search list for the Fortran 77 compiler.  For
+example, if you didn't like the default order, then you could invoke
+@code{AC_PROG_F77} like this:
+
+@example
+AC_PROG_F77(fl32 f77 fort77 xlf cf77 g77 f90 xlf90 f2c)
+@end example
+
+If using @code{g77} (the @sc{gnu} Fortran 77 compiler), then
+@code{AC_PROG_F77} will set the shell variable @code{G77} to @samp{yes}.
+If the output variable @code{FFLAGS} was not already set in the
+environment, then set it to @samp{-g -02} for @code{g77} (or @samp{-O2}
+where @code{g77} does not accept @samp{-g}).  Otherwise, set
+@code{FFLAGS} to @samp{-g} for all other Fortran 77 compilers.
+@end defmac
+
+@defmac AC_PROG_F77_C_O
+@maindex PROG_F77_C_O
+@cvindex F77_NO_MINUS_C_MINUS_O
+Test if the Fortran 77 compiler accepts the options @samp{-c} and
+@samp{-o} simultaneously, and define @code{F77_NO_MINUS_C_MINUS_O} if it
+does not.
+@end defmac
+
+@defmac AC_PROG_GCC_TRADITIONAL
+@maindex PROG_GCC_TRADITIONAL
+@ovindex CC
+Add @samp{-traditional} to output variable @code{CC} if using the
+@sc{gnu} C compiler and @code{ioctl} does not work properly without
+@samp{-traditional}.  That usually happens when the fixed header files
+have not been installed on an old system.  Since recent versions of the
+@sc{gnu} C compiler fix the header files automatically when installed,
+this is becoming a less prevalent problem.
+@end defmac
+
+
+@node C Compiler Characteristics, Fortran 77 Compiler Characteristics, Compilers and Preprocessors, Existing Tests
 @section C Compiler Characteristics
 
 The following macros check for C compiler or machine architecture
@@ -4040,32 +4059,6 @@ The @code{AC_F77_FUNC_WRAPPER} macro uses the
 
 The following macros check for operating system services or capabilities.
 
-@defmac AC_EXEEXT
-@maindex EXEEXT
-@ovindex EXEEXT
-@maindex CYGWIN
-@maindex EMXOS2
-@maindex MINGW32
-Defines substitute variable @code{EXEEXT} based on the output of the
-compiler, after @samp{.$ac_ext} (i.e. source files of the current
-language), @samp{.o}, @samp{.obj} and @samp{.xcoff} files have been
-excluded.  Typically set to empty string if Unix and @samp{.exe} if
-Win32 or OS/2.
-
-This macro sets the shell variable @code{CYGWIN} to @samp{yes} if run in
-the Cygwin environment, @code{EMXOS2} to @samp{yes} if in the EMX
-environment on OS/2, and @code{MINGW32} to @samp{yes} with the MingW32
-compiler.
-@end defmac
-
-@defmac AC_OBJEXT
-@maindex OBJEXT
-@ovindex OBJEXT
-Defines substitute variable @code{OBJEXT} based on the output of the
-compiler, after .c files have been excluded.  Typically
-set to @samp{o} if Unix, @samp{obj} if Win32.
-@end defmac
-
 @defmac AC_PATH_X
 @maindex PATH_X
 Try to locate the X Window System include files and libraries.  If the
@@ -7720,6 +7713,26 @@ If on Dynix/PTX (Sequent @sc{unix}), add @samp{-lseq} to output variable
 @code{AC_FUNC_GETMNTENT}.
 @end defmac
 
+@defmac AC_EXEEXT
+@maindex EXEEXT
+@ovindex EXEEXT
+@ovindex CYGWIN
+@ovindex EMXOS2
+@ovindex MINGW32
+Defined the output variable @code{EXEEXT} based on the output of the
+compiler, after @samp{.$ac_ext} (i.e. source files of the current
+language), @samp{.o}, @samp{.obj} and @samp{.xcoff} files have been
+excluded.  Typically set to empty string if Unix and @samp{.exe} if
+Win32 or OS/2.
+
+This macro sets the shell variable @code{CYGWIN} to @samp{yes} if run in
+the Cygwin environment, @code{EMXOS2} to @samp{yes} if in the EMX
+environment on OS/2, and @code{MINGW32} to @samp{yes} with the MingW32
+compiler.
+
+Now handled by the macros checking for the compiler.
+@end defmac
+
 @defmac AC_EMXOS2
 @maindex EMXOS2
 Checks for the EMX environment on OS/2in which case the shell variable
@@ -7911,6 +7924,15 @@ handles this task.
 @code{AC_TYPE_MODE_T}
 @end defmac
 
+@defmac AC_OBJEXT
+@maindex OBJEXT
+@ovindex OBJEXT
+Defined the output variable @code{OBJEXT} based on the output of the
+compiler, after .c files have been excluded.  Typically set to @samp{o}
+if Unix, @samp{obj} if Win32.  Now the compiler checking macros handle
+this.
+@end defmac
+
 @defmac AC_OBSOLETE (@var{this-macro-name}, @ovar{suggestion})
 @maindex OBSOLETE
 Make @code{m4} print a message on the standard error output warning that
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index ad279b66d..905aed125 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -470,7 +470,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS=
-AC_PROG_CC_G
+_AC_PROG_CC_G
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -486,6 +486,8 @@ else
     CFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -513,9 +515,9 @@ fi[]dnl
 ])# _AC_PROG_CC_GNU
 
 
-# AC_PROG_CC_G
+# _AC_PROG_CC_G
 # ------------
-AC_DEFUN([AC_PROG_CC_G],
+define([_AC_PROG_CC_G],
 [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [echo 'void f(){}' >conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -524,7 +526,7 @@ else
   ac_cv_prog_cc_g=no
 fi
 rm -f conftest*
-])])
+])])# _AC_PROG_CC_G
 
 
 # AC_PROG_GCC_TRADITIONAL
@@ -648,7 +650,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
-AC_PROG_CXX_G
+_AC_PROG_CXX_G
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -664,6 +666,8 @@ else
     CXXFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -692,9 +696,9 @@ fi[]dnl
 ])# _AC_PROG_CXX_GNU
 
 
-# AC_PROG_CXX_G
+# _AC_PROG_CXX_G
 # -------------
-AC_DEFUN([AC_PROG_CXX_G],
+define([_AC_PROG_CXX_G],
 [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [echo 'void f(){}' >conftest.cc
 if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -703,7 +707,7 @@ else
   ac_cv_prog_cxx_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_CXX_G
+])])# _AC_PROG_CXX_G
 
 
 
@@ -731,7 +735,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-AC_PROG_F77_G
+_AC_PROG_F77_G
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -747,6 +751,8 @@ else
     FFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
@@ -776,11 +782,11 @@ fi[]dnl
 ])# _AC_PROG_F77_GNU
 
 
-# AC_PROG_F77_G
+# _AC_PROG_F77_G
 # -------------
 # Test whether the Fortran 77 compiler can accept the `-g' option to
 # enable debugging.
-AC_DEFUN([AC_PROG_F77_G],
+define([_AC_PROG_F77_G],
 [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g,
 [cat >conftest.f <<EOF
        program conftest
@@ -792,7 +798,7 @@ else
   ac_cv_prog_f77_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_F77_G
+])])# _AC_PROG_F77_G
 
 
 # AC_PROG_F77_C_O
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index ad279b66d..905aed125 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -470,7 +470,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS=
-AC_PROG_CC_G
+_AC_PROG_CC_G
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -486,6 +486,8 @@ else
     CFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -513,9 +515,9 @@ fi[]dnl
 ])# _AC_PROG_CC_GNU
 
 
-# AC_PROG_CC_G
+# _AC_PROG_CC_G
 # ------------
-AC_DEFUN([AC_PROG_CC_G],
+define([_AC_PROG_CC_G],
 [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [echo 'void f(){}' >conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -524,7 +526,7 @@ else
   ac_cv_prog_cc_g=no
 fi
 rm -f conftest*
-])])
+])])# _AC_PROG_CC_G
 
 
 # AC_PROG_GCC_TRADITIONAL
@@ -648,7 +650,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
-AC_PROG_CXX_G
+_AC_PROG_CXX_G
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -664,6 +666,8 @@ else
     CXXFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -692,9 +696,9 @@ fi[]dnl
 ])# _AC_PROG_CXX_GNU
 
 
-# AC_PROG_CXX_G
+# _AC_PROG_CXX_G
 # -------------
-AC_DEFUN([AC_PROG_CXX_G],
+define([_AC_PROG_CXX_G],
 [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [echo 'void f(){}' >conftest.cc
 if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -703,7 +707,7 @@ else
   ac_cv_prog_cxx_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_CXX_G
+])])# _AC_PROG_CXX_G
 
 
 
@@ -731,7 +735,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-AC_PROG_F77_G
+_AC_PROG_F77_G
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -747,6 +751,8 @@ else
     FFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
@@ -776,11 +782,11 @@ fi[]dnl
 ])# _AC_PROG_F77_GNU
 
 
-# AC_PROG_F77_G
+# _AC_PROG_F77_G
 # -------------
 # Test whether the Fortran 77 compiler can accept the `-g' option to
 # enable debugging.
-AC_DEFUN([AC_PROG_F77_G],
+define([_AC_PROG_F77_G],
 [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g,
 [cat >conftest.f <<EOF
        program conftest
@@ -792,7 +798,7 @@ else
   ac_cv_prog_f77_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_F77_G
+])])# _AC_PROG_F77_G
 
 
 # AC_PROG_F77_C_O
diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index ad279b66d..905aed125 100644
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -470,7 +470,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS=
-AC_PROG_CC_G
+_AC_PROG_CC_G
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -486,6 +486,8 @@ else
     CFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -513,9 +515,9 @@ fi[]dnl
 ])# _AC_PROG_CC_GNU
 
 
-# AC_PROG_CC_G
+# _AC_PROG_CC_G
 # ------------
-AC_DEFUN([AC_PROG_CC_G],
+define([_AC_PROG_CC_G],
 [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [echo 'void f(){}' >conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -524,7 +526,7 @@ else
   ac_cv_prog_cc_g=no
 fi
 rm -f conftest*
-])])
+])])# _AC_PROG_CC_G
 
 
 # AC_PROG_GCC_TRADITIONAL
@@ -648,7 +650,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
-AC_PROG_CXX_G
+_AC_PROG_CXX_G
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -664,6 +666,8 @@ else
     CXXFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -692,9 +696,9 @@ fi[]dnl
 ])# _AC_PROG_CXX_GNU
 
 
-# AC_PROG_CXX_G
+# _AC_PROG_CXX_G
 # -------------
-AC_DEFUN([AC_PROG_CXX_G],
+define([_AC_PROG_CXX_G],
 [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [echo 'void f(){}' >conftest.cc
 if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -703,7 +707,7 @@ else
   ac_cv_prog_cxx_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_CXX_G
+])])# _AC_PROG_CXX_G
 
 
 
@@ -731,7 +735,7 @@ dnl normal versions of a library), tasteless as that idea is.
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-AC_PROG_F77_G
+_AC_PROG_F77_G
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -747,6 +751,8 @@ else
     FFLAGS=
   fi
 fi
+AC_EXPAND_ONCE([_AC_EXEEXT])
+AC_EXPAND_ONCE([_AC_OBJEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
@@ -776,11 +782,11 @@ fi[]dnl
 ])# _AC_PROG_F77_GNU
 
 
-# AC_PROG_F77_G
+# _AC_PROG_F77_G
 # -------------
 # Test whether the Fortran 77 compiler can accept the `-g' option to
 # enable debugging.
-AC_DEFUN([AC_PROG_F77_G],
+define([_AC_PROG_F77_G],
 [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g,
 [cat >conftest.f <<EOF
        program conftest
@@ -792,7 +798,7 @@ else
   ac_cv_prog_f77_g=no
 fi
 rm -f conftest*
-])])# AC_PROG_F77_G
+])])# _AC_PROG_F77_G
 
 
 # AC_PROG_F77_C_O
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index c65357b30..43bcea8fe 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -2543,14 +2543,16 @@ AU_DEFUN([AC_CYGWIN32], [])
 AU_DEFUN([AC_EMXOS2],   [])
 AU_DEFUN([AC_MING32],   [])
 
+AU_DEFUN([AC_EXEEXT],   [])
+AU_DEFUN([AC_OBJEXT],   [])
 
-# AC_EXEEXT
-# ---------
+# _AC_EXEEXT
+# -_--------
 # Check for the extension used for executables.  This knows that we
 # add .exe for Cygwin or mingw32.  Otherwise, it compiles a test
 # executable.  If this is called, the executable extensions will be
 # automatically used by link commands run by the configure script.
-AC_DEFUN([AC_EXEEXT],
+define([_AC_EXEEXT],
 [_AC_CYGWIN
 _AC_MINGW32
 _AC_EMXOS2
@@ -2573,15 +2575,15 @@ test "$ac_cv_exeext" != no && EXEEXT=$ac_cv_exeext
 dnl Setting ac_exeext will implicitly change the ac_link command.
 ac_exeext=$EXEEXT
 AC_SUBST(EXEEXT)dnl
-])# AC_EXEEXT
+])# _AC_EXEEXT
 
 
-# AC_OBJEXT
-# ---------
+# _AC_OBJEXT
+# ----------
 # Check the object extension used by the compiler: typically .o or
 # .obj.  If this is called, some other behaviour will change,
 # determined by ac_objext.
-AC_DEFUN([AC_OBJEXT],
+define([_AC_OBJEXT],
 [AC_CACHE_CHECK([for object suffix], ac_cv_objext,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
    [for ac_file in conftest.*; do
@@ -2593,7 +2595,7 @@ AC_DEFUN([AC_OBJEXT],
    [AC_MSG_ERROR([cannot compile])])])
 AC_SUBST(OBJEXT, $ac_cv_objext)dnl
 ac_objext=$ac_cv_objext
-])
+])# _AC_OBJEXT
 
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b57203b93..836e0ee05 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,8 +58,6 @@ testsuite: atgeneral.m4 atspecific.m4 suite.m4 macros.m4 $(SUITE)
 #   infinite m4 recursion if AC_INIT it used twice.
 # - AC_LANG*
 #   Heavily used by other macros.
-# - AC_PROG_(CC|CXX|F77)_(GNU|WORKS)
-#   are used in AC_PROG_CC etc.
 # - AC_PATH_PROGS?
 #   They produce `= val' because $1, the variable used to store the result,
 #   is empty.
@@ -73,6 +71,8 @@ testsuite: atgeneral.m4 atspecific.m4 suite.m4 macros.m4 $(SUITE)
 #   Is a number.
 # - AC_PROG_CC, AC_C_(CONST|INLINE|VOLATILE)
 #   Checked in semantics.
+# - AC_CYGWIN, AC_CYGWIN32, AC_EMXOS2, AC_MING32, AC_EXEEXT, AC_OBJEXT
+#   AU defined to nothing.
 #
 # Multiple `-e' to egrep are not portable, so join all the patterns together.
 # We use the fact that automake will replace all the `\\\n' with ` '.
@@ -88,13 +88,13 @@ FILTER_MACROS = egrep -v -e \
 ^AC_LIST_MEMBER_OF$$\
 ^AC_OUTPUT$$\
 ^AC_PATH_(TOOL|PROG)S?$$\
-^AC_PROG_(CC|CXX|F77)_(GNU|WORKS)$$\
 ^AC_REPLACE_FUNCS$$\
 ^AC_SEARCH_LIBS$$\
 ^AC_TRY\
 ^AC_.*_IFELSE$$\
 ^AC_FD_CC$$\
 ^(AC_(PROG_CC|C_CONST|C_INLINE|C_VOLATILE))$$\
+^AC_(CYGWIN|CYGWIN32|EMXOS2|MING32|EXEEXT|OBJEXT)$$\
 _AC_' | tr ' ' '|'`
 
 # The files which contains macro we check for syntax.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index cca9264ac..21600b860 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,6 +32,8 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+DESTDIR =
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -43,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -55,15 +57,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
-@SET_MAKE@
 AWK = @AWK@
 HELP2MAN = @HELP2MAN@
 M4 = @M4@
 PERLSCRIPTS = @PERLSCRIPTS@
 standards_texi = @standards_texi@
 
-
 AUTOMAKE_OPTIONS = gnits
 
 SUITE = torture.m4 semantics.m4 syntax.m4 base.m4 tools.m4
@@ -92,8 +91,6 @@ PERL = perl
 #   infinite m4 recursion if AC_INIT it used twice.
 # - AC_LANG*
 #   Heavily used by other macros.
-# - AC_PROG_(CC|CXX|F77)_(GNU|WORKS)
-#   are used in AC_PROG_CC etc.
 # - AC_PATH_PROGS?
 #   They produce `= val' because $1, the variable used to store the result,
 #   is empty.
@@ -107,59 +104,39 @@ PERL = perl
 #   Is a number.
 # - AC_PROG_CC, AC_C_(CONST|INLINE|VOLATILE)
 #   Checked in semantics.
+# - AC_CYGWIN, AC_CYGWIN32, AC_EMXOS2, AC_MING32, AC_EXEEXT, AC_OBJEXT
+#   AU defined to nothing.
 #
 # Multiple `-e' to egrep are not portable, so join all the patterns together.
 # We use the fact that automake will replace all the `\\\n' with ` '.
-FILTER_MACROS = egrep -v -e \
-`echo '^AC_ARG_VAR$$\
-^AC_CANONICALIZE$$\
-^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TYPE)S?$$\
-^AC_CONFIG\
-^AC_INIT\
-^AC_LANG\
-^AC_LINKER_OPTION$$\
-^AC_LINK_FILES$$\
-^AC_LIST_MEMBER_OF$$\
-^AC_OUTPUT$$\
-^AC_PATH_(TOOL|PROG)S?$$\
-^AC_PROG_(CC|CXX|F77)_(GNU|WORKS)$$\
-^AC_REPLACE_FUNCS$$\
-^AC_SEARCH_LIBS$$\
-^AC_TRY\
-^AC_.*_IFELSE$$\
-^AC_FD_CC$$\
-^(AC_(PROG_CC|C_CONST|C_INLINE|C_VOLATILE))$$\
-_AC_' | tr ' ' '|'`
+FILTER_MACROS = egrep -v -e `echo '^AC_ARG_VAR$$ ^AC_CANONICALIZE$$ ^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TYPE)S?$$ ^AC_CONFIG ^AC_INIT ^AC_LANG ^AC_LINKER_OPTION$$ ^AC_LINK_FILES$$ ^AC_LIST_MEMBER_OF$$ ^AC_OUTPUT$$ ^AC_PATH_(TOOL|PROG)S?$$ ^AC_REPLACE_FUNCS$$ ^AC_SEARCH_LIBS$$ ^AC_TRY ^AC_.*_IFELSE$$ ^AC_FD_CC$$ ^(AC_(PROG_CC|C_CONST|C_INLINE|C_VOLATILE))$$ ^AC_(CYGWIN|CYGWIN32|EMXOS2|MING32|EXEEXT|OBJEXT)$$ _AC_' | tr ' ' '|'`
 
 
 # The files which contains macro we check for syntax.
-MACRO_FILES = $(top_srcdir)/acgeneral.m4 $(top_srcdir)/acspecific.m4 \
-              $(top_srcdir)/aclang.m4
+MACRO_FILES = $(top_srcdir)/acgeneral.m4 $(top_srcdir)/acspecific.m4               $(top_srcdir)/aclang.m4
 
 
-CLEANFILES = debug-*.sh macro configure configure.in config.status \
-config.cache config.log config.h.in config.h
+CLEANFILES = debug-*.sh macro configure configure.in config.status config.cache config.log config.h.in config.h
 
 DISTCLEANFILES = atconfig testsuite
-subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =  atconfig
-DIST_SOURCES = 
 DIST_COMMON =  Makefile.am Makefile.in atconfig.in
 
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -171,16 +148,22 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
+subdir = tests
+
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits tests/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
 info-am:
@@ -206,7 +189,7 @@ uninstall: uninstall-am
 all-am: Makefile
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 
 
@@ -221,7 +204,6 @@ distclean-generic:
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
-	-rm -f Makefile.in
 mostlyclean-am:  mostlyclean-generic
 
 mostlyclean: mostlyclean-am
@@ -243,7 +225,7 @@ maintainer-clean: maintainer-clean-am
 .PHONY: tags distdir info-am info dvi-am dvi check-local check check-am \
 installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
+all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean