[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
omitting -DHAVE_CONFIG_H from coreutils
|
From: |
Paul Eggert |
|
Subject: |
omitting -DHAVE_CONFIG_H from coreutils |
|
Date: |
Fri, 25 Aug 2006 23:57:28 -0700 |
|
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) |
I installed the following to remove the -DHAVE_CONFIG_H clutter
from "make" output.
2006-08-25 Paul Eggert <address@hidden>
* .x-sc_no_if_have_config_h: Remove; no longer needed.
* .x-sc_prohibit_assert_without_use: Remove; it was empty.
* .x-sc_two_space_separator_in_usage: Likewise.
* Makefile.maint (sc_no_have_config_h): Renamed from
sc_no_if_have_config_h, since it now checks that HAVE_CONFIG_H
is absent everywhere.
* bootstrap.conf (gnulib_modules): Add config-h.
* src/shred.c: Include <config.h> unconditionally, since
we now assume config.h exists.
* src/dircolors.c: Likewise.
* lib/euidaccess-stat.c: Include <config.h> unconditionally, since
we now assume config.h exists.
* lib/fchmodat.c: Likewise.
* lib/fd-reopen.c: Likewise.
* lib/fdopendir-glibc.c: Likewise.
* lib/memxfrm.c: Likewise.
* lib/printf-parse.c: Likewise.
* lib/rand-isaac.c: Likewise.
* lib/randint.c: Likewise.
* lib/randperm.c: Likewise.
* lib/randread.c: Likewise.
* lib/root-dev-ino.c: Likewise.
* lib/sha256.c: Likewise.
* lib/sha512.c: Likewise.
* lib/stdopen.c: Likewise.
* lib/strintcmp.c: Likewise.
* lib/strnumcmp.c: Likewise.
* lib/t-chdir-long: Likewise.
* lib/tsearch.c: Likewise.
* lib/unicodeio.c: Likewise.
* lib/vasnprintf.c: Likewise.
* lib/xfts.c: Likewise.
* lib/xmemxfrm.c: Likewise.
Index: Makefile.maint
===================================================================
RCS file: /fetish/cu/Makefile.maint,v
retrieving revision 1.247
diff -p -u -r1.247 Makefile.maint
--- Makefile.maint 22 Aug 2006 19:36:23 -0000 1.247
+++ Makefile.maint 26 Aug 2006 06:54:47 -0000
@@ -140,9 +140,9 @@ sc_file_system:
'rewrite to use "file system"' 1>&2; \
exit 1; } || :
-sc_no_if_have_config_h:
- @grep -n '^# *if HAVE_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \
- { echo '$(ME): found use of #if HAVE_CONFIG_H; use #ifdef' \
+sc_no_have_config_h:
+ @grep -n 'HAVE''_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \
+ { echo '$(ME): found use of HAVE''_CONFIG_H; remove' \
1>&2; exit 1; } || :
# Nearly all .c files must include <config.h>.
Index: bootstrap.conf
===================================================================
RCS file: /fetish/cu/bootstrap.conf,v
retrieving revision 1.4
diff -p -u -r1.4 bootstrap.conf
--- bootstrap.conf 25 Aug 2006 23:30:57 -0000 1.4
+++ bootstrap.conf 26 Aug 2006 06:54:47 -0000
@@ -38,7 +38,8 @@ gnulib_modules="
$avoided_gnulib_modules
$obsolete_gnulib_modules
acl alloca argmatch assert backupfile base64 c-strtod
- c-strtold calloc canon-host canonicalize chown cloexec configmake
+ c-strtold calloc canon-host canonicalize chown cloexec
+ config-h configmake
closeout cycle-check d-ino d-type diacrit dirfd dirname dup2
error euidaccess exclude exitfail fcntl-safer fdl file-type
fileblocks filemode filenamecat fnmatch-gnu fopen-safer
Index: lib/euidaccess-stat.c
===================================================================
RCS file: /fetish/cu/lib/euidaccess-stat.c,v
retrieving revision 1.1
diff -p -u -r1.1 euidaccess-stat.c
--- lib/euidaccess-stat.c 20 Nov 2005 08:51:10 -0000 1.1
+++ lib/euidaccess-stat.c 26 Aug 2006 06:54:48 -0000
@@ -2,7 +2,7 @@
This function is probably useful only for choosing whether to issue
a prompt in an implementation of POSIX-specified rm.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,9 +20,7 @@
/* Adapted for use in GNU remove.c by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "euidaccess-stat.h"
Index: lib/fchmodat.c
===================================================================
RCS file: /fetish/cu/lib/fchmodat.c,v
retrieving revision 1.2
diff -p -u -r1.2 fchmodat.c
--- lib/fchmodat.c 15 Aug 2006 19:17:30 -0000 1.2
+++ lib/fchmodat.c 26 Aug 2006 06:54:48 -0000
@@ -17,9 +17,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "openat.h"
#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
Index: lib/fd-reopen.c
===================================================================
RCS file: /fetish/cu/lib/fd-reopen.c,v
retrieving revision 1.3
diff -p -u -r1.3 fd-reopen.c
--- lib/fd-reopen.c 30 Oct 2005 21:44:31 -0000 1.3
+++ lib/fd-reopen.c 26 Aug 2006 06:54:48 -0000
@@ -1,6 +1,6 @@
/* Invoke open, but return either a desired file descriptor or -1.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "fd-reopen.h"
Index: lib/fdopendir-glibc.c
===================================================================
RCS file: /fetish/cu/lib/fdopendir-glibc.c,v
retrieving revision 1.2
diff -p -u -r1.2 fdopendir-glibc.c
--- lib/fdopendir-glibc.c 17 Aug 2006 19:58:20 -0000 1.2
+++ lib/fdopendir-glibc.c 26 Aug 2006 06:54:48 -0000
@@ -16,9 +16,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
Index: lib/memxfrm.c
===================================================================
RCS file: /fetish/cu/lib/memxfrm.c,v
retrieving revision 1.1
diff -p -u -r1.1 memxfrm.c
--- lib/memxfrm.c 8 Aug 2006 22:22:47 -0000 1.1
+++ lib/memxfrm.c 26 Aug 2006 06:54:48 -0000
@@ -18,9 +18,7 @@
/* Written by Paul Eggert <address@hidden>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "memxfrm.h"
Index: lib/printf-parse.c
===================================================================
RCS file: /fetish/cu/lib/printf-parse.c,v
retrieving revision 1.4
diff -p -u -r1.4 printf-parse.c
--- lib/printf-parse.c 14 May 2005 07:58:06 -0000 1.4
+++ lib/printf-parse.c 26 Aug 2006 06:54:49 -0000
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999-2000, 2002-2004 Free Software Foundation, Inc.
+ Copyright (C) 1999-2000, 2002-2004, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#if WIDE_CHAR_VERSION
Index: lib/rand-isaac.c
===================================================================
RCS file: /fetish/cu/lib/rand-isaac.c,v
retrieving revision 1.2
diff -p -u -r1.2 rand-isaac.c
--- lib/rand-isaac.c 9 Aug 2006 08:13:36 -0000 1.2
+++ lib/rand-isaac.c 26 Aug 2006 06:54:49 -0000
@@ -31,9 +31,7 @@
* and fast, and because the author did good work analyzing it.
* --------------------------------------------------------------------
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "rand-isaac.h"
Index: lib/randint.c
===================================================================
RCS file: /fetish/cu/lib/randint.c,v
retrieving revision 1.1
diff -p -u -r1.1 randint.c
--- lib/randint.c 8 Aug 2006 22:22:47 -0000 1.1
+++ lib/randint.c 26 Aug 2006 06:54:49 -0000
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "randint.h"
Index: lib/randperm.c
===================================================================
RCS file: /fetish/cu/lib/randperm.c,v
retrieving revision 1.1
diff -p -u -r1.1 randperm.c
--- lib/randperm.c 8 Aug 2006 22:22:47 -0000 1.1
+++ lib/randperm.c 26 Aug 2006 06:54:49 -0000
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "randperm.h"
Index: lib/randread.c
===================================================================
RCS file: /fetish/cu/lib/randread.c,v
retrieving revision 1.1
diff -p -u -r1.1 randread.c
--- lib/randread.c 8 Aug 2006 22:22:47 -0000 1.1
+++ lib/randread.c 26 Aug 2006 06:54:49 -0000
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "randread.h"
Index: lib/root-dev-ino.c
===================================================================
RCS file: /fetish/cu/lib/root-dev-ino.c,v
retrieving revision 1.3
diff -p -u -r1.3 root-dev-ino.c
--- lib/root-dev-ino.c 24 Sep 2005 13:32:45 -0000 1.3
+++ lib/root-dev-ino.c 26 Aug 2006 06:54:49 -0000
@@ -1,5 +1,5 @@
/* root-dev-ino.c -- get the device and inode numbers for `/'.
- Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,13 +17,12 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
-#include <stdlib.h>
#include "root-dev-ino.h"
+#include <stdlib.h>
+
/* Call lstat to get the device and inode numbers for `/'.
Upon failure, return NULL. Otherwise, set the members of
*ROOT_D_I accordingly and return ROOT_D_I. */
Index: lib/sha256.c
===================================================================
RCS file: /fetish/cu/lib/sha256.c,v
retrieving revision 1.5
diff -p -u -r1.5 sha256.c
--- lib/sha256.c 12 Jan 2006 07:17:25 -0000 1.5
+++ lib/sha256.c 26 Aug 2006 06:54:49 -0000
@@ -21,9 +21,7 @@
Scott G. Miller's sha1.c
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "sha256.h"
Index: lib/sha512.c
===================================================================
RCS file: /fetish/cu/lib/sha512.c,v
retrieving revision 1.4
diff -p -u -r1.4 sha512.c
--- lib/sha512.c 12 Jan 2006 07:17:25 -0000 1.4
+++ lib/sha512.c 26 Aug 2006 06:54:49 -0000
@@ -21,9 +21,7 @@
Scott G. Miller's sha1.c
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "sha512.h"
Index: lib/stdopen.c
===================================================================
RCS file: /fetish/cu/lib/stdopen.c,v
retrieving revision 1.8
diff -p -u -r1.8 stdopen.c
--- lib/stdopen.c 9 Nov 2005 20:53:41 -0000 1.8
+++ lib/stdopen.c 26 Aug 2006 06:54:49 -0000
@@ -1,6 +1,6 @@
/* stdopen.c - ensure that the three standard file descriptors are in use
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
/* Written by Paul Eggert and Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "stdopen.h"
Index: lib/strintcmp.c
===================================================================
RCS file: /fetish/cu/lib/strintcmp.c,v
retrieving revision 1.2
diff -p -u -r1.2 strintcmp.c
--- lib/strintcmp.c 24 Sep 2005 13:26:41 -0000 1.2
+++ lib/strintcmp.c 26 Aug 2006 06:54:49 -0000
@@ -1,6 +1,6 @@
/* Compare integer strings.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "strnumcmp-in.h"
Index: lib/strnumcmp.c
===================================================================
RCS file: /fetish/cu/lib/strnumcmp.c,v
retrieving revision 1.2
diff -p -u -r1.2 strnumcmp.c
--- lib/strnumcmp.c 27 Sep 2005 08:21:28 -0000 1.2
+++ lib/strnumcmp.c 26 Aug 2006 06:54:49 -0000
@@ -1,6 +1,6 @@
/* Compare numeric strings.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "strnumcmp-in.h"
Index: lib/t-chdir-long
===================================================================
RCS file: /fetish/cu/lib/t-chdir-long,v
retrieving revision 1.6
diff -p -u -r1.6 t-chdir-long
--- lib/t-chdir-long 17 Aug 2006 19:58:20 -0000 1.6
+++ lib/t-chdir-long 26 Aug 2006 06:54:49 -0000
@@ -1,7 +1,7 @@
#!/bin/sh
# Exercise chdir-long's sample main program.
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
# temporary directories are easier to remove.
# FIXME: don't clobber a.out
-gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall \
+gcc -DTEST_CHDIR -g -O -W -Wall \
chdir-long.c libcoreutils.a
vg='valgrind --track-fds=yes --leak-check=yes --quiet --num-callers=9'
Index: lib/tsearch.c
===================================================================
RCS file: /fetish/cu/lib/tsearch.c,v
retrieving revision 1.5
diff -p -u -r1.5 tsearch.c
--- lib/tsearch.c 24 Sep 2005 13:32:58 -0000 1.5
+++ lib/tsearch.c 26 Aug 2006 06:54:49 -0000
@@ -1,4 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997, 2000, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2000, 2005, 2006 Free Software
+ Foundation, Inc.
+
This file is part of the GNU C Library.
Contributed by Bernd Schmidt <address@hidden>, 1997.
@@ -84,9 +86,7 @@
In this case, A has been rotated left. This preserves the ordering of the
binary tree. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#if __GNUC__
# define alloca __builtin_alloca
Index: lib/unicodeio.c
===================================================================
RCS file: /fetish/cu/lib/unicodeio.c,v
retrieving revision 1.24
diff -p -u -r1.24 unicodeio.c
--- lib/unicodeio.c 4 Jul 2006 05:39:07 -0000 1.24
+++ lib/unicodeio.c 26 Aug 2006 06:54:49 -0000
@@ -21,9 +21,7 @@
/* Note: This file requires the locale_charset() function. See in
libiconv-1.8/libcharset/INTEGRATE for how to obtain it. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "unicodeio.h"
Index: lib/vasnprintf.c
===================================================================
RCS file: /fetish/cu/lib/vasnprintf.c,v
retrieving revision 1.10
diff -p -u -r1.10 vasnprintf.c
--- lib/vasnprintf.c 14 Feb 2006 23:09:00 -0000 1.10
+++ lib/vasnprintf.c 26 Aug 2006 06:54:49 -0000
@@ -22,9 +22,8 @@
# define _GNU_SOURCE 1
#endif
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
#ifndef IN_LIBINTL
# include <alloca.h>
#endif
Index: lib/xfts.c
===================================================================
RCS file: /fetish/cu/lib/xfts.c,v
retrieving revision 1.4
diff -p -u -r1.4 xfts.c
--- lib/xfts.c 15 May 2006 13:28:24 -0000 1.4
+++ lib/xfts.c 26 Aug 2006 06:54:49 -0000
@@ -18,9 +18,7 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <stdbool.h>
Index: lib/xmemxfrm.c
===================================================================
RCS file: /fetish/cu/lib/xmemxfrm.c,v
retrieving revision 1.1
diff -p -u -r1.1 xmemxfrm.c
--- lib/xmemxfrm.c 8 Aug 2006 22:22:47 -0000 1.1
+++ lib/xmemxfrm.c 26 Aug 2006 06:54:49 -0000
@@ -18,9 +18,7 @@
/* Written by Paul Eggert <address@hidden>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "xmemxfrm.h"
Index: src/dircolors.c
===================================================================
RCS file: /fetish/cu/src/dircolors.c,v
retrieving revision 1.99
diff -p -u -r1.99 dircolors.c
--- src/dircolors.c 9 Jul 2006 17:08:55 -0000 1.99
+++ src/dircolors.c 26 Aug 2006 06:54:49 -0000
@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <sys/types.h>
#include <getopt.h>
Index: src/shred.c
===================================================================
RCS file: /fetish/cu/src/shred.c,v
retrieving revision 1.128
diff -p -u -r1.128 shred.c
--- src/shred.c 25 Aug 2006 23:12:01 -0000 1.128
+++ src/shred.c 26 Aug 2006 06:54:49 -0000
@@ -85,9 +85,7 @@
#define AUTHORS "Colin Plumb"
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <getopt.h>
#include <stdio.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- omitting -DHAVE_CONFIG_H from coreutils,
Paul Eggert <=