2000-01-29 Akim Demaille <akim@epita.fr>

	* autoheader.sh: No longer rely on a system acconfig.h.

diff --git a/ChangeLog b/ChangeLog
index a50063ccd583e36116473277d2780b178ce20a89..b97d4062d2a7489b8bc3590c331176b90f4d665d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-29  Akim Demaille  <akim@epita.fr>
+
+       * autoheader.sh: No longer rely on a system acconfig.h.
+
 1999-11-01  Akim Demaille  <akim@epita.fr>
 
        Be kind to Automake: list the arguments of selected macros

diff --git a/autoheader.in b/autoheader.in
index 483f83e7658474dd5346a26995777808914fa391..a867c4a6bcaf82b80df41158b4e67f2a3d936c40 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -114,7 +114,7 @@ while test $# -gt 0 ; do
    esac
 done
 
-acconfigs="${AC_MACRODIR}/acconfig.h"
+acconfigs=
 test -r $localdir/acconfig.h && acconfigs="${acconfigs} $localdir/acconfig.h"
 
 case $# in
@@ -125,11 +125,6 @@ esac
 
 config_h=undefined
 syms=
-types=
-funcs=
-headers=
-libs=
-decls=
 
 if test "$localdir" != .; then
   use_localdir="-I$localdir -DAC_LOCALDIR=$localdir"
@@ -194,8 +189,7 @@ if test -n "$syms"; then
   # Make sure the boundary of template files is also the boundary
   # of the paragraph.  Extra newlines don't hurt since they will
   # be removed.
-  # Undocumented useless feature: stuff outside of @TOP@ and @BOTTOM@
-  # is ignored in the systemwide acconfig.h too.
+  # Stuff outside of @TOP@ and @BOTTOM@ is ignored in all the acconfig.hs.
   for t in $acconfigs; do
     sedscript=""
     grep @TOP@ $t >/dev/null && sedscript="1,/@TOP@/d;"

diff --git a/autoheader.sh b/autoheader.sh
index 483f83e7658474dd5346a26995777808914fa391..a867c4a6bcaf82b80df41158b4e67f2a3d936c40 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -114,7 +114,7 @@ while test $# -gt 0 ; do
    esac
 done
 
-acconfigs="${AC_MACRODIR}/acconfig.h"
+acconfigs=
 test -r $localdir/acconfig.h && acconfigs="${acconfigs} $localdir/acconfig.h"
 
 case $# in
@@ -125,11 +125,6 @@ esac
 
 config_h=undefined
 syms=
-types=
-funcs=
-headers=
-libs=
-decls=
 
 if test "$localdir" != .; then
   use_localdir="-I$localdir -DAC_LOCALDIR=$localdir"
@@ -194,8 +189,7 @@ if test -n "$syms"; then
   # Make sure the boundary of template files is also the boundary
   # of the paragraph.  Extra newlines don't hurt since they will
   # be removed.
-  # Undocumented useless feature: stuff outside of @TOP@ and @BOTTOM@
-  # is ignored in the systemwide acconfig.h too.
+  # Stuff outside of @TOP@ and @BOTTOM@ is ignored in all the acconfig.hs.
   for t in $acconfigs; do
     sedscript=""
     grep @TOP@ $t >/dev/null && sedscript="1,/@TOP@/d;"

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 483f83e7658474dd5346a26995777808914fa391..a867c4a6bcaf82b80df41158b4e67f2a3d936c40 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -114,7 +114,7 @@ while test $# -gt 0 ; do
    esac
 done
 
-acconfigs="${AC_MACRODIR}/acconfig.h"
+acconfigs=
 test -r $localdir/acconfig.h && acconfigs="${acconfigs} $localdir/acconfig.h"
 
 case $# in
@@ -125,11 +125,6 @@ esac
 
 config_h=undefined
 syms=
-types=
-funcs=
-headers=
-libs=
-decls=
 
 if test "$localdir" != .; then
   use_localdir="-I$localdir -DAC_LOCALDIR=$localdir"
@@ -194,8 +189,7 @@ if test -n "$syms"; then
   # Make sure the boundary of template files is also the boundary
   # of the paragraph.  Extra newlines don't hurt since they will
   # be removed.
-  # Undocumented useless feature: stuff outside of @TOP@ and @BOTTOM@
-  # is ignored in the systemwide acconfig.h too.
+  # Stuff outside of @TOP@ and @BOTTOM@ is ignored in all the acconfig.hs.
   for t in $acconfigs; do
     sedscript=""
     grep @TOP@ $t >/dev/null && sedscript="1,/@TOP@/d;"