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.

diff --git a/.x-sc_no_have_config_h b/.x-sc_no_have_config_h
new file mode 100644 (file)
index 0000000..f106267
--- /dev/null
+++ b/.x-sc_no_have_config_h
@@ -0,0 +1 @@
+^gnulib/lib/strsep\.c$

diff --git a/ChangeLog b/ChangeLog
index d173a0b6fa669876317c0ae950540404391c328a..7735e1dcf88e5124afdc0d8e55ed5872e0d40abc 100644 (file)
--- 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 4543ebd8556089b499d4889eb83ebf09e58c873d..7e8ddcfb2da6f7a427295bd000ac8e8791519b4a 100644 (file)
--- 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 8624328cef568b0d18537e8997e671c4f0a8a44b..4b54bafc9ab9f93640b3eb258bced43f7174920e 100644 (file)
--- 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 deebd0716a4e695586bf5e4a11411522402e9033..d47d18e1aa6e64b296479b92931dfbe4be40af81 100644 (file)
--- 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>