From: Jim Meyering <meyering@redhat.com>
Date: Wed, 27 Jul 2011 18:27:48 +0000 (+0200)
Subject: maint.mk: avoid sc_prohibit_always-defined_macros failure in coreutils
X-Git-Tag: v0.1~2048
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=c6f9e663d25b0980c51f609a3fe237deca168461

maint.mk: avoid sc_prohibit_always-defined_macros failure in coreutils

* top/maint.mk (gl_extract_significant_defines_): Now that
SA_RESETHAND and SA_RESTART are #defined (albeit conditionally) in
gnulib/lib/signal.in.h, and now that we recommend to
define-if-undefined those two symbols in application code,
we must filter them out of the "significant" list.
This avoids a "make syntax-check" failure in coreutils.
---

diff --git a/ChangeLog b/ChangeLog
index 566156b1e..aad436b5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-27  Jim Meyering  <meyering@redhat.com>
+
+	maint.mk: avoid sc_prohibit_always-defined_macros failure in coreutils
+	* top/maint.mk (gl_extract_significant_defines_): Now that
+	SA_RESETHAND and SA_RESTART are #defined (albeit conditionally) in
+	gnulib/lib/signal.in.h, and now that we recommend to
+	define-if-undefined those two symbols in application code,
+	we must filter them out of the "significant" list.
+	This avoids a "make syntax-check" failure in coreutils.
+
 2011-07-26  Eric Blake  <eblake@redhat.com>
 
 	warnings: add comments about previous patch
diff --git a/top/maint.mk b/top/maint.mk
index 935772862..6c1bf443c 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -753,6 +753,7 @@ gl_extract_significant_defines_ = \
   /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/\
     && $$2 !~ /(?:rpl_|_used_without_)/\
     && $$1 !~ /^(?:NSIG)$$/\
+    && $$1 !~ /^(?:SA_RESETHAND|SA_RESTART)$$/\
     and print $$1
 
 # Create a list of regular expressions matching the names