summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bin/autoupdate.in4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a45513f3..eda69956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-07-21 Eric Blake <ebb9@byu.net>
+ Ignore undefined macros, necessary with m4 1.6.
+ * bin/autoupdate.in (_au___undefine): New macro,...
+ (_au__undefine): ...wrapped by ifdef to silence m4 warnings.
+ Reported by Ralf Wildenhues.
+
Resync with gnulib.
* GNUmakefile: Grab from upstream, to fix issue where 'make
install' would allow installation of stale version string.
diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index 3a01af78..644de19c 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -267,8 +267,10 @@ foreach my $file (@ARGV)
# Define our special macros:
define([_au__defn], defn([defn]))
define([_au__divert], defn([divert]))
+ define([_au__ifdef], defn([ifdef]))
define([_au__include], defn([include]))
- define([_au__undefine], defn([undefine]))
+ define([_au___undefine], defn([undefine]))
+ define([_au__undefine], [_au__ifdef([$1], [_au___undefine([$1])])])
define([_au__save], [m4_ifdef([$1], [m4_copy([$1], [_au_$1])])])
define([_au__restore],
[_au_m4_ifdef([_au_$1],