* autoconf.sh (task install): We no longer use AC_INCLUDE.

diff --git a/ChangeLog b/ChangeLog
index 6056ac730fd24e80c22ee92766f74b8f2789d6c8..73ab946913cb73a1d3f4f6c816c1b093d37c850b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+       * autoconf.sh (task install): We no longer use AC_INCLUDE.
+
 2000-07-10  Akim Demaille  <akim@epita.fr>
 
        * acoldnames.m4: Remove the obsolete comments.  The technology is

diff --git a/autoconf.in b/autoconf.in
index a7d9003f077f5f89f12765c15644847ed42da29d..56caf60d3c81275b611137b9be01b16398225fd1 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -561,11 +561,6 @@ define([AC_DEFUN],
          [define([AC_DECLARED{$1}])errprint(]]__file__:__line__:[[ [$1]
 )])dnl
 ][$2])])
-
-dnl All the includes must be disabled.  If they are not, since people don't
-dnl protect the first argument of AC_DEFUN, then, if read a second time
-dnl this argument will be expanded, and we'll get pure junk out of m4.
-define([AC_INCLUDE])
 EOF
 
   # Run m4 with all the library files, discard stdout, save stderr in
@@ -580,6 +575,7 @@ EOF
   # Save in `installed' the list of installed links.
   $verbose "Required macros:" >&2
   $verbose "`sed -e 's/^/| /' $tmp/requested`" >&2
+  : >$tmp/installed
   cat $tmp/requested |
     while read line
     do
@@ -606,9 +602,7 @@ EOF
   # Use yourself to get the list of the included files.
   export AC_ACLOCALDIR
   export AC_MACRODIR
-  # Not m4_s?include, because it would catch acsite and aclocal, which
-  # we don't care about.
-  $0 -l "$localdir" -t AC_INCLUDE:'$1' $infile |
+  $0 -l "$localdir" -t include:'$1' -t m4_include:'$1' -t m4_sinclude:'$1' $infile |
     sort |
     uniq >$tmp/included
   # All the included files are needed.

diff --git a/autoconf.sh b/autoconf.sh
index a7d9003f077f5f89f12765c15644847ed42da29d..56caf60d3c81275b611137b9be01b16398225fd1 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -561,11 +561,6 @@ define([AC_DEFUN],
          [define([AC_DECLARED{$1}])errprint(]]__file__:__line__:[[ [$1]
 )])dnl
 ][$2])])
-
-dnl All the includes must be disabled.  If they are not, since people don't
-dnl protect the first argument of AC_DEFUN, then, if read a second time
-dnl this argument will be expanded, and we'll get pure junk out of m4.
-define([AC_INCLUDE])
 EOF
 
   # Run m4 with all the library files, discard stdout, save stderr in
@@ -580,6 +575,7 @@ EOF
   # Save in `installed' the list of installed links.
   $verbose "Required macros:" >&2
   $verbose "`sed -e 's/^/| /' $tmp/requested`" >&2
+  : >$tmp/installed
   cat $tmp/requested |
     while read line
     do
@@ -606,9 +602,7 @@ EOF
   # Use yourself to get the list of the included files.
   export AC_ACLOCALDIR
   export AC_MACRODIR
-  # Not m4_s?include, because it would catch acsite and aclocal, which
-  # we don't care about.
-  $0 -l "$localdir" -t AC_INCLUDE:'$1' $infile |
+  $0 -l "$localdir" -t include:'$1' -t m4_include:'$1' -t m4_sinclude:'$1' $infile |
     sort |
     uniq >$tmp/included
   # All the included files are needed.

diff --git a/bin/autoconf.in b/bin/autoconf.in
index a7d9003f077f5f89f12765c15644847ed42da29d..56caf60d3c81275b611137b9be01b16398225fd1 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -561,11 +561,6 @@ define([AC_DEFUN],
          [define([AC_DECLARED{$1}])errprint(]]__file__:__line__:[[ [$1]
 )])dnl
 ][$2])])
-
-dnl All the includes must be disabled.  If they are not, since people don't
-dnl protect the first argument of AC_DEFUN, then, if read a second time
-dnl this argument will be expanded, and we'll get pure junk out of m4.
-define([AC_INCLUDE])
 EOF
 
   # Run m4 with all the library files, discard stdout, save stderr in
@@ -580,6 +575,7 @@ EOF
   # Save in `installed' the list of installed links.
   $verbose "Required macros:" >&2
   $verbose "`sed -e 's/^/| /' $tmp/requested`" >&2
+  : >$tmp/installed
   cat $tmp/requested |
     while read line
     do
@@ -606,9 +602,7 @@ EOF
   # Use yourself to get the list of the included files.
   export AC_ACLOCALDIR
   export AC_MACRODIR
-  # Not m4_s?include, because it would catch acsite and aclocal, which
-  # we don't care about.
-  $0 -l "$localdir" -t AC_INCLUDE:'$1' $infile |
+  $0 -l "$localdir" -t include:'$1' -t m4_include:'$1' -t m4_sinclude:'$1' $infile |
     sort |
     uniq >$tmp/included
   # All the included files are needed.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 7bd18df74601964ba8eafdd819700e305eddf7a2..2a06a7e025a100b5db5bd243974525d7121555ce 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1616,6 +1616,16 @@ set when you call @code{AC_PROG_CXX} (or empty if you don't).
 C++ features.
 @end defvar
 
+@defvar DEFS
+@ovindex DEFS
+@option{-D} options to pass to the C compiler.  If @code{AC_CONFIG_HEADERS}
+is called, @code{configure} replaces @samp{@@DEFS@@} with
+@option{-DHAVE_CONFIG_H} instead (@pxref{Configuration Headers}).  This
+variable is not defined while @code{configure} is performing its tests,
+only when creating the output files.  @xref{Setting Output Variables}, for
+how to check the results of previous tests.
+@end defvar
+
 @defvar ECHO_C
 @defvarx ECHO_N
 @defvarx ECHO_T
@@ -1645,16 +1655,6 @@ value is set when you call @code{AC_PROG_F77} (or empty if you don't).
 Fortran 77 features.
 @end defvar
 
-@defvar DEFS
-@ovindex DEFS
-@option{-D} options to pass to the C compiler.  If @code{AC_CONFIG_HEADERS}
-is called, @code{configure} replaces @samp{@@DEFS@@} with
-@option{-DHAVE_CONFIG_H} instead (@pxref{Configuration Headers}).  This
-variable is not defined while @code{configure} is performing its tests,
-only when creating the output files.  @xref{Setting Output Variables}, for
-how to check the results of previous tests.
-@end defvar
-
 @defvar LDFLAGS
 @ovindex LDFLAGS
 Stripping (@option{-s}), path (@option{-L}), and any other miscellaneous