Enable the <config.h>-requiring test; fix violations Use <config.h>, not "config.h", per autoconf documentation. * Makefile.cfg (local-checks-to-skip) [sc_require_config_h]: Enable. * .x-sc_require_config_h: New file, to list exempted files. * Makefile.am (EXTRA_DIST): Add .x-sc_require_config_h. Signed-off-by: Jim Meyering <meyering@redhat.com> --- .x-sc_require_config_h | 5 +++++ ChangeLog | 8 ++++---- Makefile.am | 3 ++- Makefile.cfg | 1 - proxy/libvirt_proxy.c | 2 +- python/libvir.c | 2 +- python/types.c | 2 +- qemud/event.c | 2 +- qemud/qemud.c | 2 +- src/bridge.h | 2 +- src/buf.c | 2 +- src/conf.c | 2 +- src/console.c | 2 +- src/event.c | 2 +- src/gnutls_1_0_compat.h | 2 +- src/hash.c | 2 +- src/iptables.c | 2 +- src/libvirt.c | 2 +- src/nodeinfo.c | 2 +- src/openvz_conf.c | 2 +- src/proxy_internal.c | 2 +- src/qemu_conf.c | 2 +- src/qemu_conf.h | 2 +- src/qemu_driver.c | 2 +- src/qemu_driver.h | 2 +- src/remote_internal.c | 2 +- src/sexpr.c | 2 +- src/stats_linux.c | 2 +- src/test.c | 2 +- src/util.c | 2 +- src/uuid.c | 2 +- src/virsh.c | 2 +- src/virterror.c | 2 +- src/xen_internal.c | 2 +- src/xen_unified.c | 2 +- src/xend_internal.c | 2 +- src/xm_internal.c | 2 +- src/xml.c | 2 +- src/xmlrpc.c | 2 +- src/xs_internal.c | 2 +- tests/conftest.c | 2 +- tests/nodeinfotest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/reconnect.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/testutils.c | 2 +- tests/virshtest.c | 2 +- tests/xencapstest.c | 2 +- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xmlrpctest.c | 2 +- 52 files changed, 59 insertions(+), 54 deletions(-) create mode 100644 .x-sc_require_config_h diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h new file mode 100644 index 0000000..e0903ac --- /dev/null +++ b/.x-sc_require_config_h @@ -0,0 +1,5 @@ +^docs/examples/info1\.c$ +^docs/examples/suspend\.c$ +^gnulib/lib/dummy\.c$ +^gnulib/tests/dummy\.c$ +^qemud/remote_protocol\.c$ diff --git a/ChangeLog b/ChangeLog index 5493e51..7d5e058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -555,7 +555,7 @@ Fri Dec 7 14:27:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com> Fri Dec 7 11:06:58 CET 2007 Jim Meyering <meyering@redhat.com> - Include "config.h" in remaining non-generated files. + Include <config.h> in remaining non-generated files. * proxy/libvirt_proxy.c: Likewise. * python/libvir.c: Likewise. * python/types.c: Likewise. @@ -619,7 +619,7 @@ Wed Dec 5 23:57:53 CET 2007 Jim Meyering <meyering@redhat.com> Wed Dec 5 22:38:18 CET 2007 Jim Meyering <meyering@redhat.com> - Include "config.h". + Include <config.h>. * qemud/event.c: Likewise. * src/buf.c: Likewise. * src/hash.c: Likewise. @@ -673,10 +673,10 @@ Wed Dec 5 22:30:03 CET 2007 Jim Meyering <meyering@redhat.com> * tests/nodeinfodata/linux-nodeinfo-5.txt: * tests/nodeinfodata/linux-nodeinfo-6.txt: * src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that - would conflict with the one now in "config.h". + would conflict with the one now in <config.h>. * autogen.sh: Add -I gnulib/m4. * src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE. - Instead, include "config.h". + Instead, include <config.h>. * qemud/qemud.c: Remove definition of _GNU_SOURCE. * src/openvz_driver.c: Likewise. * src/qemu_driver.c: Likewise. diff --git a/Makefile.am b/Makefile.am index 5154203..e32033a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,8 @@ EXTRA_DIST = \ libvirt.spec libvirt.spec.in \ libvirt.pc libvirt.pc.in \ $(man_MANS) autobuild.sh \ - .x-sc_avoid_if_before_free + .x-sc_avoid_if_before_free \ + .x-sc_require_config_h man_MANS = virsh.1 diff --git a/Makefile.cfg b/Makefile.cfg index ba59f29..2c1c9e7 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -49,7 +49,6 @@ local-checks-to-skip = \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ sc_prohibit_strcmp \ - sc_require_config_h \ sc_root_tests \ sc_space_tab \ sc_sun_os_names \ diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index 5ccf855..83cf39d 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -9,7 +9,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_XEN diff --git a/python/libvir.c b/python/libvir.c index 0fe11f2..e2f7c5b 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -9,7 +9,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include <Python.h> #include "libvirt/libvirt.h" diff --git a/python/types.c b/python/types.c index 146bb24..c91d8da 100644 --- a/python/types.c +++ b/python/types.c @@ -7,7 +7,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt_wrap.h" diff --git a/qemud/event.c b/qemud/event.c index b7d75a0..ca7dc11 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #include <stdlib.h> #include <string.h> diff --git a/qemud/qemud.c b/qemud/qemud.c index 5f3c875..77a2352 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/src/bridge.h b/src/bridge.h index 52f805b..5dcca00 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -22,7 +22,7 @@ #ifndef __QEMUD_BRIDGE_H__ #define __QEMUD_BRIDGE_H__ -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/buf.c b/src/buf.c index 188d040..5bb2bd4 100644 --- a/src/buf.c +++ b/src/buf.c @@ -8,7 +8,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" diff --git a/src/conf.c b/src/conf.c index 8e66d84..8b3aae5 100644 --- a/src/conf.c +++ b/src/conf.c @@ -8,7 +8,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include <string.h> diff --git a/src/console.c b/src/console.c index 6b336d9..02a9c7f 100644 --- a/src/console.c +++ b/src/console.c @@ -20,7 +20,7 @@ * Daniel Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #ifndef __MINGW32__ diff --git a/src/event.c b/src/event.c index 7dcbf32..274db9d 100644 --- a/src/event.c +++ b/src/event.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #include "event.h" diff --git a/src/gnutls_1_0_compat.h b/src/gnutls_1_0_compat.h index 7ec8b63..38f6954 100644 --- a/src/gnutls_1_0_compat.h +++ b/src/gnutls_1_0_compat.h @@ -22,7 +22,7 @@ #ifndef LIBVIRT_GNUTLS_1_0_COMPAT_H__ -#include "config.h" +#include <config.h> #ifdef GNUTLS_1_0_COMPAT #define gnutls_session_t gnutls_session diff --git a/src/hash.c b/src/hash.c index 4e4ce60..d92c92c 100644 --- a/src/hash.c +++ b/src/hash.c @@ -18,7 +18,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include <string.h> #include <stdlib.h> diff --git a/src/iptables.c b/src/iptables.c index b59faa4..1486411 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -19,7 +19,7 @@ * Mark McLoughlin <markmc@redhat.com> */ -#include "config.h" +#include <config.h> #if WITH_QEMU diff --git a/src/libvirt.c b/src/libvirt.c index f4ee2e0..defadc1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9,7 +9,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" #include <stdio.h> diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1b0191b..65a2cf1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/src/openvz_conf.c b/src/openvz_conf.c index 4e4019c..9084184 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -27,7 +27,7 @@ #ifdef WITH_OPENVZ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/proxy_internal.c b/src/proxy_internal.c index e0e5631..a8a7962 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -10,7 +10,7 @@ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 0de641d..9886300 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 7b242f7..9f09ec1 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -24,7 +24,7 @@ #ifndef __QEMUD_CONF_H #define __QEMUD_CONF_H -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 71a3125..f80a121 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/qemu_driver.h b/src/qemu_driver.h index 66b60b7..72b397c 100644 --- a/src/qemu_driver.h +++ b/src/qemu_driver.h @@ -25,7 +25,7 @@ #ifndef QEMUD_DRIVER_H #define QEMUD_DRIVER_H -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/remote_internal.c b/src/remote_internal.c index 4d855ab..aa6bb5c 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -21,7 +21,7 @@ * Author: Richard Jones <rjones@redhat.com> */ -#include "config.h" +#include <config.h> /* Windows socket compatibility functions. */ #include "socketcompat.h" diff --git a/src/sexpr.c b/src/sexpr.c index bbf0791..e7ea6c8 100644 --- a/src/sexpr.c +++ b/src/sexpr.c @@ -10,7 +10,7 @@ * archive for more details. */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/stats_linux.c b/src/stats_linux.c index de73cef..d2dda88 100644 --- a/src/stats_linux.c +++ b/src/stats_linux.c @@ -8,7 +8,7 @@ * Richard W.M. Jones <rjones@redhat.com> */ -#include "config.h" +#include <config.h> /* This file only applies on Linux. */ #ifdef __linux__ diff --git a/src/test.c b/src/test.c index d39207f..2afd86f 100644 --- a/src/test.c +++ b/src/test.c @@ -21,7 +21,7 @@ * Daniel Berrange <berrange@redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_TEST diff --git a/src/util.c b/src/util.c index f16aaf4..0c42124 100644 --- a/src/util.c +++ b/src/util.c @@ -24,7 +24,7 @@ * File created Jul 18, 2007 - Shuveb Hussain <shuveb@binarykarma.com> */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdarg.h> diff --git a/src/uuid.c b/src/uuid.c index b2022c4..ae30217 100644 --- a/src/uuid.c +++ b/src/uuid.c @@ -19,7 +19,7 @@ * Mark McLoughlin <markmc@redhat.com> */ -#include "config.h" +#include <config.h> #include "uuid.h" diff --git a/src/virsh.c b/src/virsh.c index d081008..a1b3e38 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -13,7 +13,7 @@ * $Id$ */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" #include "libvirt/virterror.h" diff --git a/src/virterror.c b/src/virterror.c index bf4062d..83cf7ca 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -8,7 +8,7 @@ * Author: Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/xen_internal.c b/src/xen_internal.c index a8cecef..1292382 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -10,7 +10,7 @@ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/src/xen_unified.c b/src/xen_unified.c index d46e63b..d5b2ec2 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -8,7 +8,7 @@ * Richard W.M. Jones <rjones@redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_XEN diff --git a/src/xend_internal.c b/src/xend_internal.c index 61af69b..814d16f 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -11,7 +11,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <sys/types.h> diff --git a/src/xm_internal.c b/src/xm_internal.c index 90dc1a4..57d0eb4 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -23,7 +23,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <dirent.h> #include <time.h> diff --git a/src/xml.c b/src/xml.c index a546002..76ca91c 100644 --- a/src/xml.c +++ b/src/xml.c @@ -8,7 +8,7 @@ * Daniel Veillard <veillard@redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" diff --git a/src/xmlrpc.c b/src/xmlrpc.c index f956f0d..ac4ea6e 100644 --- a/src/xmlrpc.c +++ b/src/xmlrpc.c @@ -8,7 +8,7 @@ * Anthony Liguori <aliguori@us.ibm.com> */ -#include "config.h" +#include <config.h> #include "xmlrpc.h" #include "internal.h" diff --git a/src/xs_internal.c b/src/xs_internal.c index 1dbbba6..6d8610c 100644 --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -9,7 +9,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/conftest.c b/tests/conftest.c index abb68fd..637b737 100644 --- a/tests/conftest.c +++ b/tests/conftest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <unistd.h> #include <stdlib.h> diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 969b85c..c80e65c 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 22e2e81..5606744 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2ab1696..1be0e46 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/reconnect.c b/tests/reconnect.c index 4c4d648..e9bdcdb 100644 --- a/tests/reconnect.c +++ b/tests/reconnect.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index 6586e92..c55aa4b 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/testutils.c b/tests/testutils.c index 4fea6b6..80b1022 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -10,7 +10,7 @@ * $Id$ */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/virshtest.c b/tests/virshtest.c index fd6dcbb..676cb71 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/xencapstest.c b/tests/xencapstest.c index bf9ce07..1307d80 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 51f4b67..424eae4 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -21,7 +21,7 @@ * */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index 2d18e60..3118379 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -1,5 +1,5 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/xmlrpctest.c b/tests/xmlrpctest.c index 5fa937f..eb75f64 100644 --- a/tests/xmlrpctest.c +++ b/tests/xmlrpctest.c @@ -10,7 +10,7 @@ * $Id$ */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> -- 1.5.4.rc4.15.g215c5