From db4037e592c0b93c0348ae6e5278e4e03a8a3e7b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 7 Feb 2008 19:20:36 +0000
Subject: [PATCH] Enable another syntax-check rule.

* Makefile.cfg (local-checks-to-skip): Remove sc_no_have_config_h.
* qemud/mdns.c: Remove "#ifdef HAVE_CONFIG_H".
* Makefile.maint (sc_no_have_config_h): Tighten up regexp,
so that the above mention of "HAVE_CONFIG_H" doesn't match.
* .x-sc_no_have_config_h: New file, to exempt gnulib/ straggler.
---
 .x-sc_no_have_config_h | 1 +
 ChangeLog              | 7 +++++++
 Makefile.cfg           | 1 -
 Makefile.maint         | 2 +-
 qemud/mdns.c           | 2 --
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 .x-sc_no_have_config_h

diff --git a/.x-sc_no_have_config_h b/.x-sc_no_have_config_h
new file mode 100644
index 0000000000..f1062679f6
--- /dev/null
+++ b/.x-sc_no_have_config_h
@@ -0,0 +1 @@
+^gnulib/lib/strsep\.c$
diff --git a/ChangeLog b/ChangeLog
index d173a0b6fa..7735e1dcf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 Thu Feb  7 20:19:19 CET 2008 Jim Meyering  <meyering@redhat.com>
 
+	Enable another syntax-check rule.
+	* Makefile.cfg (local-checks-to-skip): Remove sc_no_have_config_h.
+	* qemud/mdns.c: Remove "#ifdef HAVE_CONFIG_H".
+	* Makefile.maint (sc_no_have_config_h): Tighten up regexp,
+	so that the above mention of "HAVE_CONFIG_H" doesn't match.
+	* .x-sc_no_have_config_h: New file, to exempt gnulib/ straggler.
+
 	* autobuild.sh: Run "make syntax-check", so the autobuilder does this.
 
 Thu Feb  7 18:02:22 CET 2008 Daniel Veillard <veillard@redhat.com>
diff --git a/Makefile.cfg b/Makefile.cfg
index 4543ebd855..7e8ddcfb2d 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -28,7 +28,6 @@ url_dir_list = \
 local-checks-to-skip =			\
   makefile_path_separator_check		\
   makefile-check			\
-  sc_no_have_config_h			\
   sc_tight_scope			\
   sc_GPL_version			\
   sc_always_defined_macros		\
diff --git a/Makefile.maint b/Makefile.maint
index 8624328cef..4b54bafc9a 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -96,7 +96,7 @@ sc_file_system:
 	    exit 1; } || :
 
 sc_no_have_config_h:
-	@grep -n 'HAVE''_CONFIG_H' $$($(CVS_LIST_EXCEPT)) &&		\
+	@grep -n '^# *if.*HAVE''_CONFIG_H' $$($(CVS_LIST_EXCEPT)) &&	\
 	  { echo '$(ME): found use of HAVE''_CONFIG_H; remove'		\
 		1>&2; exit 1; } || :
 
diff --git a/qemud/mdns.c b/qemud/mdns.c
index deebd0716a..d47d18e1aa 100644
--- a/qemud/mdns.c
+++ b/qemud/mdns.c
@@ -22,9 +22,7 @@
  * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <time.h>
 #include <stdio.h>