# HG changeset patch
# User Eric Blake <eblake@redhat.com>
# Date 1368239061 21600
# Node ID 70c2a43965efe80d4cdcb37b5c23cc8377b682d2
# Parent  9815ae1c3b4fd6821a5075ef336a90dbbaaebf82
maint.mk: catch more abuse of HAVE_DECL in syntax-check

Libvirt had a patch that attempted to do:

+#elif defined(SIOCSIFLLADDR) && defined(HAVE_STRUCT_IFREQ) && \
+    defined(HAVE_DECL_LINK_ADDR)

but which was not flagged by the syntax checker as suspicious
(all HAVE_DECL_* symbols defined by autoconf are always defined
after including <config.h>, although they are sometimes defined
as the value 0).  Now that code is flagged until changed to:

+#elif defined(SIOCSIFLLADDR) && defined(HAVE_STRUCT_IFREQ) && \
+    HAVE_DECL_LINK_ADDR

* top/maint.mk (sc_prohibit_defined_have_decl_tests): Relax regex.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-10  Eric Blake  <eblake@redhat.com>
+
+	maint.mk: catch more abuse of HAVE_DECL in syntax-check
+	* top/maint.mk (sc_prohibit_defined_have_decl_tests): Relax regex.
+
 2012-05-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	deps: require Automake >= 1.9.6 in generated Makefile fragments
diff --git a/top/maint.mk b/top/maint.mk
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -809,7 +809,7 @@
 	  $(_sc_search_regexp)
 
 sc_prohibit_defined_have_decl_tests:
-	@prohibit='#[	 ]*if(n?def|.*\<defined)\>[	 (]+HAVE_DECL_'	\
+	@prohibit='(#[	 ]*ifn?def|\<defined)\>[	 (]+HAVE_DECL_'	\
 	halt='HAVE_DECL macros are always defined'			\
 	  $(_sc_search_regexp)