From 2d0c5eefd05ebe38eaf003940b4fd0feaa3e7b2f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 22 Sep 2005 06:05:39 +0000 Subject: [PATCH] Sync from gnulib. --- build-aux/config.guess | 3 +- build-aux/install-sh | 206 ++++++++++++++++++++++++++++------------- lib/__fpending.c | 2 +- lib/__fpending.h | 4 - lib/acl.c | 2 +- lib/argmatch.c | 2 +- lib/atexit.c | 4 +- lib/backupfile.c | 2 +- lib/basename.c | 2 +- lib/calloc.c | 2 +- lib/canonicalize.c | 13 +-- lib/chdir-long.c | 4 +- lib/chown.c | 4 +- lib/cloexec.c | 5 +- lib/closeout.c | 2 +- lib/creat-safer.c | 2 +- lib/cycle-check.c | 2 +- lib/dirfd.c | 2 +- lib/dirfd.h | 4 - lib/dirname.c | 2 +- lib/dup-safer.c | 2 +- lib/dup2.c | 6 +- lib/euidaccess.c | 2 +- lib/exclude.c | 3 +- lib/exitfail.c | 2 +- lib/fchown-stub.c | 4 +- lib/fd-safer.c | 2 +- lib/file-type.c | 2 +- lib/fileblocks.c | 5 +- lib/filemode.c | 2 +- lib/filenamecat.c | 2 +- lib/fnmatch.c | 2 +- lib/fopen-safer.c | 2 +- lib/free.c | 2 +- lib/fsusage.c | 2 +- lib/ftruncate.c | 2 +- lib/full-write.c | 2 +- lib/getcwd.c | 2 +- lib/getcwd.h | 4 +- lib/getdate.h | 4 - lib/getgroups.c | 4 +- lib/getndelim2.c | 2 +- lib/getopt1.c | 2 +- lib/getopt_.h | 2 +- lib/gettimeofday.c | 4 +- lib/getugroups.c | 2 +- lib/group-member.c | 4 +- lib/hard-locale.c | 2 +- lib/hash-pjw.c | 2 +- lib/hash.c | 2 +- lib/human.c | 2 +- lib/human.h | 4 - lib/idcache.c | 2 +- lib/inttostr.c | 3 + lib/inttostr.h | 8 +- lib/lchown.c | 4 +- lib/long-options.c | 2 +- lib/lstat.c | 4 +- lib/malloc.c | 2 +- lib/memcasecmp.c | 2 +- lib/memchr.c | 5 +- lib/memcmp.c | 2 +- lib/memcoll.c | 2 +- lib/memcpy.c | 2 +- lib/memmove.c | 2 +- lib/mkdir.c | 4 +- lib/mkstemp.c | 4 +- lib/mktime.c | 3 +- lib/modechange.c | 2 +- lib/mountlist.c | 2 +- lib/nanosleep.c | 4 +- lib/open-safer.c | 2 +- lib/openat.c | 4 +- lib/physmem.c | 4 +- lib/pipe-safer.c | 2 +- lib/posixtm.c | 7 -- lib/posixver.c | 4 +- lib/putenv.c | 2 +- lib/quote.c | 2 +- lib/quotearg.c | 11 ++- lib/raise.c | 6 +- lib/readlink.c | 2 +- lib/readtokens0.c | 4 +- lib/readutmp.c | 4 +- lib/realloc.c | 2 +- lib/regex.c | 2 +- lib/regex_internal.h | 18 ++++ lib/rename.c | 2 +- lib/rmdir.c | 2 +- lib/rpmatch.c | 2 +- lib/safe-read.c | 4 +- lib/same.c | 2 +- lib/save-cwd.c | 4 +- lib/savedir.c | 2 +- lib/settime.c | 2 +- lib/sig2str.c | 2 +- lib/strcspn.c | 2 +- lib/stripslash.c | 2 +- lib/strndup.c | 12 +-- lib/strnlen.c | 2 +- lib/strtod.c | 2 +- lib/strtoimax.c | 2 +- lib/strtol.c | 2 +- lib/strverscmp.c | 2 +- lib/tempname.c | 2 +- lib/time_r.c | 2 +- lib/time_r.h | 13 ++- lib/timespec.h | 2 - lib/unicodeio.h | 15 ++- lib/unistd--.h | 3 + lib/unlinkdir.c | 4 +- lib/userspec.c | 2 +- lib/utimecmp.c | 2 +- lib/version-etc-fsf.c | 2 +- lib/version-etc.c | 2 +- lib/xalloc-die.c | 2 +- lib/xgetcwd.c | 2 +- lib/xgethostname.c | 1 - lib/xmalloc.c | 2 +- lib/xmemcoll.c | 2 +- lib/xnanosleep.c | 2 +- lib/xreadlink.c | 2 +- lib/xstrndup.c | 2 +- lib/xstrtoimax.c | 2 +- lib/xstrtol.c | 2 +- lib/xstrtoumax.c | 2 +- lib/yesno.c | 2 +- m4/backupfile.m4 | 3 +- m4/bison.m4 | 15 ++- m4/calloc.m4 | 5 +- m4/canonicalize.m4 | 5 +- m4/chown.m4 | 3 +- m4/cloexec.m4 | 5 +- m4/dup2.m4 | 10 +- m4/fileblocks.m4 | 6 +- m4/free.m4 | 1 - m4/ftruncate.m4 | 5 +- m4/fts.m4 | 2 +- m4/getcwd.m4 | 1 - m4/getopt.m4 | 74 ++++++++------- m4/getpagesize.m4 | 4 +- m4/getpass.m4 | 4 +- m4/getugroups.m4 | 3 +- m4/group-member.m4 | 3 +- m4/idcache.m4 | 5 +- m4/lib-link.m4 | 15 +-- m4/lib-prefix.m4 | 40 +++++++- m4/link-follow.m4 | 7 +- m4/mkdir-p.m4 | 3 +- m4/mkstemp.m4 | 4 +- m4/mktime.m4 | 11 +-- m4/mountlist.m4 | 3 +- m4/nanosleep.m4 | 3 +- m4/onceonly_2_57.m4 | 4 +- m4/pathmax.m4 | 4 +- m4/physmem.m4 | 3 +- m4/posixver.m4 | 3 +- m4/putenv.m4 | 10 +- m4/safe-read.m4 | 3 +- m4/same.m4 | 3 +- m4/save-cwd.m4 | 3 +- m4/stdio-safer.m4 | 5 +- m4/strndup.m4 | 6 +- m4/strnlen.m4 | 10 +- m4/unistd-safer.m4 | 15 +-- m4/unlinkdir.m4 | 4 +- m4/userspec.m4 | 4 +- m4/xreadlink.m4 | 3 +- m4/xstrtod.m4 | 2 +- 169 files changed, 520 insertions(+), 412 deletions(-) diff --git a/build-aux/config.guess b/build-aux/config.guess index ad5281e66e..d0d57f6945 100644 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-08-03' +timestamp='2005-09-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1185,7 +1185,6 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff --git a/build-aux/install-sh b/build-aux/install-sh index f56e147640..5ac8da43d5 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-07-09.12 +scriptversion=2005-09-13.16 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -58,7 +58,21 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -chmodcmd="$chmodprog 0755" +posix_glob= +posix_mkdir= + +# Symbolic mode for testing mkdir with directories. +# It is the same as 755, but also tests that "u+" works. +test_mode=u=rwx,g=rx,o=rx,u+wx + +# Desired mode of installed file. +mode=0755 + +# Desired mode of newly created intermediate directories. +# It is empty if not known yet. +intermediate_mode= + +chmodcmd=$chmodprog chowncmd= chgrpcmd= stripcmd= @@ -111,7 +125,7 @@ while test -n "$1"; do --help) echo "$usage"; exit $?;; - -m) chmodcmd="$chmodprog $2" + -m) mode=$2 shift shift continue;; @@ -164,6 +178,8 @@ if test -z "$1"; then exit 0 fi +test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15 + for src do # Protect names starting with `-'. @@ -173,15 +189,11 @@ do if test -n "$dir_arg"; then dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -208,53 +220,122 @@ do echo "$0: $dstarg: Is a directory" >&2 exit 1 fi - dst=$dst/`basename "$src"` + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? fi fi - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + posix_mkdir=false + if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then + posix_mkdir=true + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null + fi ;; + esac - # Make sure that the destination directory exists. + if + $posix_mkdir && { + + # With -d, create the new directory with the user-specified mode. + # Otherwise, create it using the same intermediate mode that + # mkdir -p would use when creating intermediate directories. + # POSIX says that this mode is "$(umask -S),u+wx", so use that + # if umask -S works. + + if test -n "$dir_arg"; then + mkdir_mode=$mode + else + case $intermediate_mode in + '') + if umask_S=`(umask -S) 2>/dev/null`; then + intermediate_mode=$umask_S,u+wx + else + intermediate_mode=$test_mode + fi ;; + esac + mkdir_mode=$intermediate_mode + fi + + $mkdirprog -m "$mkdir_mode" -p -- "$dstdir" + } + then : + else - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - case $dstdir in - /*) pathcomp=/ ;; - -*) pathcomp=./ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $dstdir - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit 1 - fi - pathcomp=$pathcomp/ - done + # mkdir does not conform to POSIX, or it failed possibly due to + # a race condition. Create the directory the slow way, step by + # step, checking for races as we go. + + case $dstdir in + /*) pathcomp=/ ;; + -*) pathcomp=./ ;; + *) pathcomp= ;; + esac + + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac + + oIFS=$IFS + IFS=/ + $posix_glob && set -f + set fnord $dstdir + shift + $posix_glob && set +f + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # Don't fail if two instances are running concurrently. + test -d "$pathcomp" || exit 1 + fi + pathcomp=$pathcomp/ + done + obsolete_mkdir_used=true + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1 else - dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -262,7 +343,6 @@ do # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. $doit $cpprog "$src" "$dsttmp" && @@ -276,10 +356,10 @@ do { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } && # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ || { # The rename failed, perhaps because mv can't rename something else # to itself, or perhaps because mv is so ancient that it does not @@ -291,11 +371,12 @@ do # reasons. In this case, the final cleanup might fail but the new # file should still install successfully. { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 } else @@ -304,16 +385,13 @@ do } && # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + $doit $mvcmd "$dsttmp" "$dst" } - } - fi || { (exit 1); exit 1; } -done + } || exit 1 -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} + trap - 0 + fi +done # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/lib/__fpending.c b/lib/__fpending.c index 0769f2314c..63fb7d7cc7 100644 --- a/lib/__fpending.c +++ b/lib/__fpending.c @@ -17,7 +17,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/__fpending.h b/lib/__fpending.h index 5a5158216c..36a842ed52 100644 --- a/lib/__fpending.h +++ b/lib/__fpending.h @@ -1,7 +1,3 @@ -#if HAVE_CONFIG_H -# include -#endif - #include #include diff --git a/lib/acl.c b/lib/acl.c index 47b73bd235..293582514e 100644 --- a/lib/acl.c +++ b/lib/acl.c @@ -18,7 +18,7 @@ Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/argmatch.c b/lib/argmatch.c index db883ac41c..36d5845acb 100644 --- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -20,7 +20,7 @@ /* Written by David MacKenzie Modified by Akim Demaille */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/atexit.c b/lib/atexit.c index a401b2ff8c..f4873c9ee3 100644 --- a/lib/atexit.c +++ b/lib/atexit.c @@ -1,7 +1,9 @@ /* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */ /* This function is in the public domain. --Mike Stump. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include +#endif int atexit (void (*f) (void)) diff --git a/lib/backupfile.c b/lib/backupfile.c index 35dde46471..32ffaeaa7b 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -21,7 +21,7 @@ /* Written by Paul Eggert and David MacKenzie. Some algorithms adapted from GNU Emacs. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/basename.c b/lib/basename.c index 00adc0015e..5cc97cd4a4 100644 --- a/lib/basename.c +++ b/lib/basename.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/calloc.c b/lib/calloc.c index 9edbf45523..317b4fff40 100644 --- a/lib/calloc.c +++ b/lib/calloc.c @@ -18,7 +18,7 @@ /* written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #undef calloc diff --git a/lib/canonicalize.c b/lib/canonicalize.c index b4d4c445b9..84368a493a 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -22,17 +22,8 @@ #include "canonicalize.h" -#ifdef STDC_HEADERS -# include -#else -void free (); -#endif - -#if defined STDC_HEADERS || defined HAVE_STRING_H -# include -#else -# include -#endif +#include +#include #if HAVE_SYS_PARAM_H # include diff --git a/lib/chdir-long.c b/lib/chdir-long.c index 2cc70fa532..a727817251 100644 --- a/lib/chdir-long.c +++ b/lib/chdir-long.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "chdir-long.h" diff --git a/lib/chown.c b/lib/chown.c index d6c64a48b3..729dd3b0bc 100644 --- a/lib/chown.c +++ b/lib/chown.c @@ -18,7 +18,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif /* Disable the definition of chown to rpl_chown (from config.h) in this file. Otherwise, we'd get conflicting prototypes for rpl_chown on diff --git a/lib/cloexec.c b/lib/cloexec.c index cfffa53b83..cf2308ca1a 100644 --- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -1,5 +1,5 @@ /* closexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004 Free Software Foundation, Inc. + Copyright (C) 1991, 2004, 2005 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,14 +17,13 @@ The code is taken from glibc/manual/llio.texi */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include "cloexec.h" #include - #include #ifndef FD_CLOEXEC diff --git a/lib/closeout.c b/lib/closeout.c index fb7d2bb427..5d0509dede 100644 --- a/lib/closeout.c +++ b/lib/closeout.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/creat-safer.c b/lib/creat-safer.c index 8241c69b0b..4588de3997 100644 --- a/lib/creat-safer.c +++ b/lib/creat-safer.c @@ -17,7 +17,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/cycle-check.c b/lib/cycle-check.c index 1c6e17cacd..401dd862f5 100644 --- a/lib/cycle-check.c +++ b/lib/cycle-check.c @@ -19,7 +19,7 @@ /* Written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/dirfd.c b/lib/dirfd.c index d65a35c3ef..18d5e1e5dd 100644 --- a/lib/dirfd.c +++ b/lib/dirfd.c @@ -17,7 +17,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/dirfd.h b/lib/dirfd.h index ce5ab2903e..1223b51d2f 100644 --- a/lib/dirfd.h +++ b/lib/dirfd.h @@ -17,10 +17,6 @@ Written by Jim Meyering. */ -#if HAVE_CONFIG_H -# include -#endif - #include #if HAVE_DIRENT_H diff --git a/lib/dirname.c b/lib/dirname.c index f1930c8d2f..e2b9d648c3 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/dup-safer.c b/lib/dup-safer.c index 1c46b6e722..8cbee7007b 100644 --- a/lib/dup-safer.c +++ b/lib/dup-safer.c @@ -17,7 +17,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/dup2.c b/lib/dup2.c index 315c82b152..f581d855de 100644 --- a/lib/dup2.c +++ b/lib/dup2.c @@ -1,5 +1,5 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1999, 2004, 2005 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,14 +17,12 @@ /* written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include - #include - #include #ifndef F_DUPFD diff --git a/lib/euidaccess.c b/lib/euidaccess.c index 4e1260b25b..44c5a07bc6 100644 --- a/lib/euidaccess.c +++ b/lib/euidaccess.c @@ -22,7 +22,7 @@ /* Written by David MacKenzie and Torbjorn Granlund. Adapted for GNU C library by Roland McGrath. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/exclude.c b/lib/exclude.c index 955c289563..de1a5c3f3b 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -20,7 +20,7 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -35,6 +35,7 @@ #include "exclude.h" #include "fnmatch.h" +#include "strcase.h" #include "xalloc.h" #if USE_UNLOCKED_IO diff --git a/lib/exitfail.c b/lib/exitfail.c index 1c5997b8ac..27d38c32a4 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -17,7 +17,7 @@ If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/fchown-stub.c b/lib/fchown-stub.c index beb336cafa..322baccce3 100644 --- a/lib/fchown-stub.c +++ b/lib/fchown-stub.c @@ -1,4 +1,6 @@ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include diff --git a/lib/fd-safer.c b/lib/fd-safer.c index 6b50451338..5933bcbd12 100644 --- a/lib/fd-safer.c +++ b/lib/fd-safer.c @@ -18,7 +18,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/file-type.c b/lib/file-type.c index 0a6c3ee77e..4b811903f0 100644 --- a/lib/file-type.c +++ b/lib/file-type.c @@ -19,7 +19,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/fileblocks.c b/lib/fileblocks.c index 9367176e34..9a10cc2224 100644 --- a/lib/fileblocks.c +++ b/lib/fileblocks.c @@ -1,6 +1,7 @@ /* Convert file size to number of blocks on System V-like machines. - Copyright (C) 1990, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1990, 1997, 1998, 1999, 2004, 2005 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,7 +19,7 @@ /* Written by Brian L. Matthews, blm@6sceng.UUCP. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/filemode.c b/lib/filemode.c index a5485b4011..08b9b13bb6 100644 --- a/lib/filemode.c +++ b/lib/filemode.c @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/filenamecat.c b/lib/filenamecat.c index f56697a6d2..f947346303 100644 --- a/lib/filenamecat.c +++ b/lib/filenamecat.c @@ -19,7 +19,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/fnmatch.c b/lib/fnmatch.c index ad66ce89ee..06416f6ee5 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c index ccaf1219f0..4f2ffa1b85 100644 --- a/lib/fopen-safer.c +++ b/lib/fopen-safer.c @@ -17,7 +17,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/free.c b/lib/free.c index 9e3435640e..597088d4eb 100644 --- a/lib/free.c +++ b/lib/free.c @@ -18,7 +18,7 @@ /* written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #undef free diff --git a/lib/fsusage.c b/lib/fsusage.c index 81c28690f3..b13779073c 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/ftruncate.c b/lib/ftruncate.c index 669d594903..4bfa431735 100644 --- a/lib/ftruncate.c +++ b/lib/ftruncate.c @@ -1,7 +1,7 @@ /* ftruncate emulations that work on some System V's. This file is in the public domain. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/full-write.c b/lib/full-write.c index 9626027420..106f3c7e53 100644 --- a/lib/full-write.c +++ b/lib/full-write.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/getcwd.c b/lib/getcwd.c index be10e4f1b8..666310a7e7 100644 --- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -17,7 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #if !_LIBC diff --git a/lib/getcwd.h b/lib/getcwd.h index 0503ff8247..59606ddc24 100644 --- a/lib/getcwd.h +++ b/lib/getcwd.h @@ -1,6 +1,6 @@ /* Get the working directory, compatibly with the GNU C Library. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004-2005 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 @@ -34,5 +34,7 @@ # define __GETCWD_XCONCAT(x, y) __GETCWD_CONCAT (x, y) # define __GETCWD_ID(y) __GETCWD_XCONCAT (__GETCWD_PREFIX, y) # define getcwd __GETCWD_ID (getcwd) +/* See the POSIX:2001 specification + . */ char *getcwd (char *, size_t); #endif diff --git a/lib/getdate.h b/lib/getdate.h index dd97807a76..4694cdb666 100644 --- a/lib/getdate.h +++ b/lib/getdate.h @@ -16,10 +16,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H -# include -#endif - #include #include "timespec.h" diff --git a/lib/getgroups.c b/lib/getgroups.c index 084d1f8288..126f130a06 100644 --- a/lib/getgroups.c +++ b/lib/getgroups.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include #include diff --git a/lib/getndelim2.c b/lib/getndelim2.c index e9f8cb9c53..3c0fa3f05e 100644 --- a/lib/getndelim2.c +++ b/lib/getndelim2.c @@ -20,7 +20,7 @@ /* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/getopt1.c b/lib/getopt1.c index 5acd2245af..25d792650f 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -18,7 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef _LIBC diff --git a/lib/getopt_.h b/lib/getopt_.h index 0cf7b8ad38..3c406e53dc 100644 --- a/lib/getopt_.h +++ b/lib/getopt_.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-1994,1996-1999,2001,2003,2004 + Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index f9afc22c1f..eb6de94f1e 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -20,7 +20,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif /* Disable the definitions of these functions (from config.h) so we can use the library versions here. */ diff --git a/lib/getugroups.c b/lib/getugroups.c index 60b04682a6..7aa540db79 100644 --- a/lib/getugroups.c +++ b/lib/getugroups.c @@ -1,6 +1,6 @@ /* getugroups.c -- return a list of the groups a user is in - Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004 Free + Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004, 2005 Free Software Foundation. This program is free software; you can redistribute it and/or modify diff --git a/lib/group-member.c b/lib/group-member.c index a338674b2c..7b189f2410 100644 --- a/lib/group-member.c +++ b/lib/group-member.c @@ -1,5 +1,5 @@ /* group-member.c -- determine whether group id is in calling user's group list - Copyright (C) 1994, 1997, 1998, 2003 Free Software Foundation, Inc. + Copyright (C) 1994, 1997, 1998, 2003, 2005 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,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/hard-locale.c b/lib/hard-locale.c index b0566ec218..98530fcd5e 100644 --- a/lib/hard-locale.c +++ b/lib/hard-locale.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c index 76b4db5c7d..315277abb2 100644 --- a/lib/hash-pjw.c +++ b/lib/hash-pjw.c @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/hash.c b/lib/hash.c index 2b5d5c255d..f85bd519bf 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -24,7 +24,7 @@ /* Define USE_OBSTACK to 1 if you want the allocator to use obstacks instead of malloc. If you change USE_OBSTACK, you have to recompile! */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/human.c b/lib/human.c index 282a3236f4..ed15c6a24a 100644 --- a/lib/human.c +++ b/lib/human.c @@ -19,7 +19,7 @@ /* Written by Paul Eggert and Larry McVoy. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/human.h b/lib/human.h index 15ca36bf83..902d599355 100644 --- a/lib/human.h +++ b/lib/human.h @@ -22,10 +22,6 @@ #ifndef HUMAN_H_ # define HUMAN_H_ 1 -# if HAVE_CONFIG_H -# include -# endif - # include # include diff --git a/lib/idcache.c b/lib/idcache.c index 0673d80fc1..2e46c1b047 100644 --- a/lib/idcache.c +++ b/lib/idcache.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/inttostr.c b/lib/inttostr.c index 23748a1378..2adcd2c131 100644 --- a/lib/inttostr.c +++ b/lib/inttostr.c @@ -18,6 +18,9 @@ /* Written by Paul Eggert */ +#ifdef HAVE_CONFIG_H +# include +#endif #include "inttostr.h" /* Convert I to a printable string in BUF, which must be at least diff --git a/lib/inttostr.h b/lib/inttostr.h index 952da97b62..55f80ee8e7 100644 --- a/lib/inttostr.h +++ b/lib/inttostr.h @@ -18,10 +18,6 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H -# include -#endif - #if HAVE_INTTYPES_H # include #endif @@ -29,9 +25,7 @@ # include #endif -#if HAVE_SYS_TYPES_H -# include -#endif +#include #include "intprops.h" diff --git a/lib/lchown.c b/lib/lchown.c index ff5679e7f7..0b74eac8a9 100644 --- a/lib/lchown.c +++ b/lib/lchown.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include diff --git a/lib/long-options.c b/lib/long-options.c index 33f1d4627d..7c9972a198 100644 --- a/lib/long-options.c +++ b/lib/long-options.c @@ -19,7 +19,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/lstat.c b/lib/lstat.c index 0d539fe4a6..f5a22b07b2 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -19,7 +19,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif /* The specification of these functions is in sys_stat.h. But we cannot include this include file here, because on some systems, a diff --git a/lib/malloc.c b/lib/malloc.c index a75da9b795..58fa611682 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -17,7 +17,7 @@ /* written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #undef malloc diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c index 00519f51ad..b0a492590c 100644 --- a/lib/memcasecmp.c +++ b/lib/memcasecmp.c @@ -17,7 +17,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/memchr.c b/lib/memchr.c index c4f24301c4..3c5ecfd0e1 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -21,9 +21,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -USA. */ +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 diff --git a/lib/memcmp.c b/lib/memcmp.c index ca68658f3f..6928b1e4a0 100644 --- a/lib/memcmp.c +++ b/lib/memcmp.c @@ -22,7 +22,7 @@ USA. */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #include diff --git a/lib/memcoll.c b/lib/memcoll.c index d9504b4531..82d889f409 100644 --- a/lib/memcoll.c +++ b/lib/memcoll.c @@ -17,7 +17,7 @@ /* Contributed by Paul Eggert . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/memcpy.c b/lib/memcpy.c index 09fb55d218..2ab5ed6ee7 100644 --- a/lib/memcpy.c +++ b/lib/memcpy.c @@ -16,7 +16,7 @@ /* Written by Jim Meyering . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/memmove.c b/lib/memmove.c index 79cc782739..753c899d38 100644 --- a/lib/memmove.c +++ b/lib/memmove.c @@ -3,7 +3,7 @@ In the public domain. By David MacKenzie . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/mkdir.c b/lib/mkdir.c index 807f322e5e..c921ecfdb4 100644 --- a/lib/mkdir.c +++ b/lib/mkdir.c @@ -19,7 +19,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif /* Disable the definition of mkdir to rpl_mkdir (from config.h) in this file. Otherwise, we'd get conflicting prototypes for rpl_mkdir on diff --git a/lib/mkstemp.c b/lib/mkstemp.c index 2683e4b8f7..cec5ba8bac 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -15,7 +15,9 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif /* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this file. Otherwise, we'd get conflicting prototypes for rpl_mkstemp on diff --git a/lib/mktime.c b/lib/mktime.c index e5f25d984e..b2d9e52e4b 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,6 +1,5 @@ /* Convert a `struct tm' to a time_t value. Copyright (C) 1993-1999, 2002-2004, 2005 Free Software Foundation, Inc. - Inc. This file is part of the GNU C Library. Contributed by Paul Eggert (eggert@twinsun.com). @@ -16,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Define this to have a standalone program to test this implementation of mktime. */ diff --git a/lib/modechange.c b/lib/modechange.c index a2697f67ff..6ab9cb6fdd 100644 --- a/lib/modechange.c +++ b/lib/modechange.c @@ -26,7 +26,7 @@ changing the mode of many files, this probably results in a performance gain. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/mountlist.c b/lib/mountlist.c index da39daaef8..6c4e2b9d39 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/nanosleep.c b/lib/nanosleep.c index 97d60d864f..61fc1b90b3 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif /* Undefine nanosleep here so any prototype is not redefined to be a prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2) */ diff --git a/lib/open-safer.c b/lib/open-safer.c index c7800a3959..d3ba894ac7 100644 --- a/lib/open-safer.c +++ b/lib/open-safer.c @@ -17,7 +17,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/openat.c b/lib/openat.c index ea42ec26b1..f7eb39d0ec 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "openat.h" diff --git a/lib/physmem.c b/lib/physmem.c index 99fc8465b8..ad8594d289 100644 --- a/lib/physmem.c +++ b/lib/physmem.c @@ -1,5 +1,5 @@ /* Calculate the size of physical memory. - Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2003, 2005 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,7 +17,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c index 5791657654..fb02d72177 100644 --- a/lib/pipe-safer.c +++ b/lib/pipe-safer.c @@ -17,7 +17,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/posixtm.c b/lib/posixtm.c index 397f63f46a..85936f3c6b 100644 --- a/lib/posixtm.c +++ b/lib/posixtm.c @@ -43,13 +43,6 @@ # include "unlocked-io.h" #endif -/* Use this to suppress gcc's `...may be used before initialized' warnings. */ -#ifdef lint -# define IF_LINT(Code) Code -#else -# define IF_LINT(Code) /* empty */ -#endif - /* ISDIGIT differs from isdigit, as follows: - Its arg may be any int or unsigned int; it need not be an unsigned char. - It's guaranteed to evaluate its argument exactly once. diff --git a/lib/posixver.c b/lib/posixver.c index 7fd7cd3b88..0e75676f96 100644 --- a/lib/posixver.c +++ b/lib/posixver.c @@ -1,6 +1,6 @@ /* Which POSIX version to conform to, for utilities. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 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,7 +18,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/putenv.c b/lib/putenv.c index 0a23694fac..9c7cf66eef 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/quote.c b/lib/quote.c index 4c75029a33..16cc939c16 100644 --- a/lib/quote.c +++ b/lib/quote.c @@ -17,7 +17,7 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/quotearg.c b/lib/quotearg.c index a66f882b0b..1d1b543957 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -19,7 +19,7 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -222,7 +222,8 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case locale_quoting_style: case clocale_quoting_style: { - /* Get translations for open and closing quotation marks. + /* TRANSLATORS: + Get translations for open and closing quotation marks. The message catalog should translate "`" to a left quotation mark suitable for the locale, and similarly for @@ -235,7 +236,11 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, should translate "'" to U+201D (RIGHT DOUBLE QUOTATION MARK). A British English Unicode locale should instead translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and - U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. */ + U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. + + If you don't know what to put here, please see + + and use glyphs suitable for your language. */ char const *left = gettext_quote (N_("`"), quoting_style); char const *right = gettext_quote (N_("'"), quoting_style); diff --git a/lib/raise.c b/lib/raise.c index 1225f764e4..0c1464064a 100644 --- a/lib/raise.c +++ b/lib/raise.c @@ -1,5 +1,5 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2005 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,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include diff --git a/lib/readlink.c b/lib/readlink.c index bf8a5f7830..3196aecb03 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/readtokens0.c b/lib/readtokens0.c index 494e08d55e..55b39a747f 100644 --- a/lib/readtokens0.c +++ b/lib/readtokens0.c @@ -17,7 +17,9 @@ Written by Jim Meyering. */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include "readtokens0.h" diff --git a/lib/readutmp.c b/lib/readutmp.c index 846ab3c6a2..634d9ab1ff 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -17,7 +17,9 @@ /* Written by jla; revised by djm */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "readutmp.h" diff --git a/lib/realloc.c b/lib/realloc.c index df570aa631..fe94822238 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -17,7 +17,7 @@ /* written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #undef realloc diff --git a/lib/regex.c b/lib/regex.c index 1bfdd6b9cf..82e76c0911 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -18,7 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include #endif #ifdef _LIBC diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 02087592bc..95df77cac0 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -27,6 +27,10 @@ #include #include +#ifndef _LIBC +# include "strcase.h" +#endif + #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC # include #endif @@ -84,11 +88,25 @@ # define RE_ENABLE_I18N #endif +#ifndef __GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +# else +# define __GNUC_PREREQ(maj, min) 0 +# endif +#endif + +#if !__GNUC_PREREQ (3, 1) +# define always_inline +#endif + #if __GNUC__ >= 3 # define BE(expr, val) __builtin_expect (expr, val) #else # define BE(expr, val) (expr) # define inline +# define pure #endif /* Number of single byte character. */ diff --git a/lib/rename.c b/lib/rename.c index 6f77fd09c9..9c9e7f4dff 100644 --- a/lib/rename.c +++ b/lib/rename.c @@ -19,7 +19,7 @@ /* written by Volker Borchert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #undef rename diff --git a/lib/rmdir.c b/lib/rmdir.c index ad026a641b..25564b6b48 100644 --- a/lib/rmdir.c +++ b/lib/rmdir.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/rpmatch.c b/lib/rpmatch.c index 3e3a38ecf0..ba8bc4ce93 100644 --- a/lib/rpmatch.c +++ b/lib/rpmatch.c @@ -16,7 +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. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/safe-read.c b/lib/safe-read.c index a5108356d9..9caf84666d 100644 --- a/lib/safe-read.c +++ b/lib/safe-read.c @@ -1,6 +1,6 @@ /* An interface to read and write that retries after interrupts. - Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004 Free Software + Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/same.c b/lib/same.c index 9cbf47a76b..4854b3a979 100644 --- a/lib/same.c +++ b/lib/same.c @@ -19,7 +19,7 @@ /* written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/save-cwd.c b/lib/save-cwd.c index 1e988175b5..4ff600e58a 100644 --- a/lib/save-cwd.c +++ b/lib/save-cwd.c @@ -19,8 +19,8 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_CONFIG_H +# include #endif #include "save-cwd.h" diff --git a/lib/savedir.c b/lib/savedir.c index 4eeda01939..a2cf2f6787 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -19,7 +19,7 @@ /* Written by David MacKenzie . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/settime.c b/lib/settime.c index 20edeab288..76bf706325 100644 --- a/lib/settime.c +++ b/lib/settime.c @@ -1,5 +1,5 @@ /* settime -- set the system clock - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 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 diff --git a/lib/sig2str.c b/lib/sig2str.c index 25ea5f3100..00089be782 100644 --- a/lib/sig2str.c +++ b/lib/sig2str.c @@ -18,7 +18,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/strcspn.c b/lib/strcspn.c index 7f60620b3f..9fbc5de491 100644 --- a/lib/strcspn.c +++ b/lib/strcspn.c @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/stripslash.c b/lib/stripslash.c index 870a66f387..9b55da48ed 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -16,7 +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. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/strndup.c b/lib/strndup.c index 366a4eb570..9ac2756a2b 100644 --- a/lib/strndup.c +++ b/lib/strndup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2000, 2003, 2005 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. @@ -18,18 +18,14 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #include #include -#ifndef HAVE_DECL_STRNLEN -"this configure-time declaration test was not run" -#endif -#if !HAVE_DECL_STRNLEN -size_t strnlen (); -#endif +/* Get strnlen. */ +#include "strnlen.h" #undef __strndup #undef strndup diff --git a/lib/strnlen.c b/lib/strnlen.c index 642c66fac8..97a1f810c5 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -16,7 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #undef strnlen diff --git a/lib/strtod.c b/lib/strtod.c index 79a82f29e8..7b48754e43 100644 --- a/lib/strtod.c +++ b/lib/strtod.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 4724195ac7..43a690d24b 100644 --- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -19,7 +19,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/strtol.c b/lib/strtol.c index 778898159b..9bfbe3c1af 100644 --- a/lib/strtol.c +++ b/lib/strtol.c @@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/strverscmp.c b/lib/strverscmp.c index 900c637dd1..6276bca0fa 100644 --- a/lib/strverscmp.c +++ b/lib/strverscmp.c @@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/tempname.c b/lib/tempname.c index 27663c23c5..3c9f59b32f 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/time_r.c b/lib/time_r.c index 1298728ba8..245ac924be 100644 --- a/lib/time_r.c +++ b/lib/time_r.c @@ -18,7 +18,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/time_r.h b/lib/time_r.h index f8d5d52931..1f2e94a907 100644 --- a/lib/time_r.h +++ b/lib/time_r.h @@ -1,6 +1,6 @@ /* Reentrant time functions like localtime_r. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2005 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 @@ -37,9 +37,20 @@ # define gmtime_r rpl_gmtime_r # define localtime_r rpl_localtime_r +/* See the POSIX:2001 specification + . */ char *asctime_r (struct tm const * restrict, char * restrict); + +/* See the POSIX:2001 specification + . */ char *ctime_r (time_t const *, char *); + +/* See the POSIX:2001 specification + . */ struct tm *gmtime_r (time_t const * restrict, struct tm * restrict); + +/* See the POSIX:2001 specification + . */ struct tm *localtime_r (time_t const * restrict, struct tm * restrict); #endif diff --git a/lib/timespec.h b/lib/timespec.h index 01032f3363..8188c208c0 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -19,8 +19,6 @@ #if ! defined TIMESPEC_H # define TIMESPEC_H -/* You must include config.h before including this file. */ - # include # if TIME_WITH_SYS_TIME # include diff --git a/lib/unicodeio.h b/lib/unicodeio.h index 31b69fad93..9560f6e071 100644 --- a/lib/unicodeio.h +++ b/lib/unicodeio.h @@ -1,6 +1,6 @@ /* Unicode character output to streams with locale dependent encoding. - Copyright (C) 2000-2003 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2005 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 @@ -22,6 +22,19 @@ # include # include +/* Converts the Unicode character CODE to its multibyte representation + in the current locale and calls the SUCCESS callback on the resulting + byte sequence. If an error occurs, invokes the FAILURE callback instead, + passing it CODE and an English error string. + Returns whatever the callback returned. + Assumes that the locale doesn't change between two calls. */ +extern long unicode_to_mb (unsigned int code, + long (*success) (const char *buf, size_t buflen, + void *callback_arg), + long (*failure) (unsigned int code, const char *msg, + void *callback_arg), + void *callback_arg); + /* Outputs the Unicode character CODE to the output stream STREAM. Upon failure, exit if exit_on_error is true, otherwise output a fallback notation. */ diff --git a/lib/unistd--.h b/lib/unistd--.h index 14b6e15cc3..1fe6ce8b27 100644 --- a/lib/unistd--.h +++ b/lib/unistd--.h @@ -23,3 +23,6 @@ #undef dup #define dup dup_safer + +#undef pipe +#define pipe pipe_safer diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c index 4d53fa02f9..d3584bebfb 100644 --- a/lib/unlinkdir.c +++ b/lib/unlinkdir.c @@ -18,7 +18,9 @@ /* Written by Paul Eggert and Jim Meyering. */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "unlinkdir.h" diff --git a/lib/userspec.c b/lib/userspec.c index d09a6b2126..b09c8d8a1f 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -18,7 +18,7 @@ /* Written by David MacKenzie . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/utimecmp.c b/lib/utimecmp.c index 4c8e6c9caf..7308929f43 100644 --- a/lib/utimecmp.c +++ b/lib/utimecmp.c @@ -18,7 +18,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index a91ab86873..374100563f 100644 --- a/lib/version-etc-fsf.c +++ b/lib/version-etc-fsf.c @@ -17,7 +17,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/version-etc.c b/lib/version-etc.c index f27f6a43af..05bc3ad255 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -17,7 +17,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index 637933e308..ff5ac9e675 100644 --- a/lib/xalloc-die.c +++ b/lib/xalloc-die.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c index f8116f2243..0f798dac06 100644 --- a/lib/xgetcwd.c +++ b/lib/xgetcwd.c @@ -18,7 +18,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xgethostname.c b/lib/xgethostname.c index 2facf9b1dd..656ef41013 100644 --- a/lib/xgethostname.c +++ b/lib/xgethostname.c @@ -28,7 +28,6 @@ #include #include - #include #include "xalloc.h" diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 6977703b80..687633c250 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c index 063612e95a..f04e468d8f 100644 --- a/lib/xmemcoll.c +++ b/lib/xmemcoll.c @@ -17,7 +17,7 @@ /* Contributed by Paul Eggert . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c index f2d9e93be3..bab58eecb4 100644 --- a/lib/xnanosleep.c +++ b/lib/xnanosleep.c @@ -18,7 +18,7 @@ /* Mostly written (for sleep.c) by Paul Eggert. Factored out (creating this file) by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xreadlink.c b/lib/xreadlink.c index 63f5ce1bfa..b8bb3c4dfb 100644 --- a/lib/xreadlink.c +++ b/lib/xreadlink.c @@ -19,7 +19,7 @@ /* Written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xstrndup.c b/lib/xstrndup.c index edf83cf87f..a62d4bd695 100644 --- a/lib/xstrndup.c +++ b/lib/xstrndup.c @@ -16,7 +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. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c index b1bc361629..3e585d6e00 100644 --- a/lib/xstrtoimax.c +++ b/lib/xstrtoimax.c @@ -17,7 +17,7 @@ /* Cloned by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xstrtol.c b/lib/xstrtol.c index 9940fc7705..d01db3ca9e 100644 --- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -19,7 +19,7 @@ /* Written by Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xstrtoumax.c b/lib/xstrtoumax.c index d7cf2bed81..e6208a4740 100644 --- a/lib/xstrtoumax.c +++ b/lib/xstrtoumax.c @@ -17,7 +17,7 @@ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/yesno.c b/lib/yesno.c index e4b945838e..a364a1b18d 100644 --- a/lib/yesno.c +++ b/lib/yesno.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/m4/backupfile.m4 b/m4/backupfile.m4 index 6aa3cc38b6..3c3f41b5e9 100644 --- a/m4/backupfile.m4 +++ b/m4/backupfile.m4 @@ -1,4 +1,4 @@ -# backupfile.m4 serial 8 +# backupfile.m4 serial 9 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,6 +14,5 @@ AC_DEFUN([gl_BACKUPFILE], AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO]) AC_REQUIRE([gl_AC_DOS]) AC_REQUIRE([AC_SYS_LONG_FILE_NAMES]) - AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CHECK_FUNCS_ONCE([pathconf]) ]) diff --git a/m4/bison.m4 b/m4/bison.m4 index 273b641ed3..91039b1ced 100644 --- a/m4/bison.m4 +++ b/m4/bison.m4 @@ -1,6 +1,6 @@ #serial 4 -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -9,5 +9,16 @@ AC_DEFUN([gl_BISON], [ # getdate.y works with bison only. : ${YACC='bison -y'} - AC_SUBST(YACC) +dnl +dnl Declaring YACC & YFLAGS precious will not be necessary after GNULIB +dnl requires an Autoconf greater than 2.59c, but it will probably still be +dnl useful to override the description of YACC in the --help output, re +dnl getdate.y assuming `bison -y'. + AC_ARG_VAR(YACC, +[The `Yet Another C Compiler' implementation to use. Defaults to `bison -y'. +Values other than `bison -y' will most likely break on most systems.])dnl + AC_ARG_VAR(YFLAGS, +[YFLAGS contains the list arguments that will be passed by default to Bison. +This script will default YFLAGS to the empty string to avoid a default value of +`-d' given by some make applications.])dnl ]) diff --git a/m4/calloc.m4 b/m4/calloc.m4 index d4d92f3c8f..796c71fedd 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ -# calloc.m4 serial 4 +# calloc.m4 serial 5 -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,7 +18,6 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], [AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl -AC_CHECK_HEADERS(stdlib.h) AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull, [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));])], diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index 42c688a315..0ed92e1f15 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,4 +1,4 @@ -#serial 8 +#serial 9 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -12,7 +12,6 @@ AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME], AC_LIBSOURCES([canonicalize.c, canonicalize.h]) AC_LIBOBJ([canonicalize]) - AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_HEADERS(string.h sys/param.h) + AC_CHECK_HEADERS(sys/param.h) AC_CHECK_FUNCS(resolvepath canonicalize_file_name) ]) diff --git a/m4/chown.m4 b/m4/chown.m4 index 389f0f97e7..d1a7147e55 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,4 +1,4 @@ -#serial 15 +#serial 16 # Determine whether we need the chown wrapper. dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free @@ -79,6 +79,5 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], # Prerequisites of lib/chown.c. AC_DEFUN([gl_PREREQ_CHOWN], [ - AC_CHECK_HEADERS_ONCE(unistd.h) AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)]) ]) diff --git a/m4/cloexec.m4 b/m4/cloexec.m4 index ab2d358a4d..7e0f801e91 100644 --- a/m4/cloexec.m4 +++ b/m4/cloexec.m4 @@ -1,4 +1,4 @@ -# serial 4 +#serial 5 dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,4 @@ AC_DEFUN([gl_CLOEXEC], [ AC_LIBSOURCES([cloexec.c, cloexec.h]) AC_LIBOBJ([cloexec]) - - dnl Prerequisites of lib/cloexec.c. - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/dup2.m4 b/m4/dup2.m4 index 31af8044d6..bf8524e146 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,4 +1,4 @@ -#serial 3 +#serial 4 dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,12 +7,4 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_DUP2], [ AC_REPLACE_FUNCS(dup2) - if test $ac_cv_func_dup2 = no; then - gl_PREREQ_DUP2 - fi -]) - -# Prerequisites of lib/dup2.c. -AC_DEFUN([gl_PREREQ_DUP2], [ - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4 index 2b7bbd9f36..6bd971d4b0 100644 --- a/m4/fileblocks.m4 +++ b/m4/fileblocks.m4 @@ -1,5 +1,5 @@ -# fileblocks.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# fileblocks.m4 serial 3 +dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,5 +15,5 @@ AC_DEFUN([gl_FILEBLOCKS], # Prerequisites of lib/fileblocks.c. AC_DEFUN([gl_PREREQ_FILEBLOCKS], [ - AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(sys/param.h) ]) diff --git a/m4/free.m4 b/m4/free.m4 index cb7b1c666d..566734b775 100644 --- a/m4/free.m4 +++ b/m4/free.m4 @@ -16,7 +16,6 @@ AC_DEFUN([gl_FUNC_FREE], [ - AC_CHECK_HEADERS_ONCE(unistd.h) AC_CACHE_CHECK([whether free (NULL) is known to work], [gl_cv_func_free], [AC_COMPILE_IFELSE( diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index d25c17ef66..c225e48a3e 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,8 +1,8 @@ -#serial 7 +#serial 8 # See if we need to emulate a missing ftruncate function using fcntl or chsize. -# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +18,5 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], # Prerequisites of lib/ftruncate.c. AC_DEFUN([gl_PREREQ_FTRUNCATE], [ - AC_CHECK_HEADERS_ONCE(unistd.h) AC_CHECK_FUNCS(chsize) ]) diff --git a/m4/fts.m4 b/m4/fts.m4 index 7eccac8b57..61457e3ced 100644 --- a/m4/fts.m4 +++ b/m4/fts.m4 @@ -1,4 +1,4 @@ -#serial 5 +#serial 6 dnl Copyright (C) 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 93b3091b60..35d0b53bd3 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -11,7 +11,6 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], [ AC_LIBSOURCES([getcwd.c, getcwd.h]) - AC_CHECK_HEADERS_ONCE(unistd.h) AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result], [gl_cv_func_getcwd_null], [AC_TRY_RUN( diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 79c699162e..6b98782c4b 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,4 +1,4 @@ -# getopt.m4 serial 9 +# getopt.m4 serial 11 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,63 +10,71 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_GETOPT_SUBSTITUTE], [ - GETOPT_H=getopt.h AC_LIBOBJ([getopt]) AC_LIBOBJ([getopt1]) + gl_GETOPT_SUBSTITUTE_HEADER + gl_PREREQ_GETOPT +]) + +AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], +[ + GETOPT_H=getopt.h AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], [Define to rpl_ if the getopt replacement functions and variables should be used.]) AC_SUBST([GETOPT_H]) ]) -AC_DEFUN([gl_GETOPT], +AC_DEFUN([gl_GETOPT_CHECK_HEADERS], [ - gl_PREREQ_GETOPT - if test -z "$GETOPT_H"; then - GETOPT_H= AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h]) - if test -z "$GETOPT_H"; then - AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h]) - fi + fi - dnl BSD getopt_long uses an incompatible method to reset option processing, - dnl and (as of 2004-10-15) mishandles optional option-arguments. - if test -z "$GETOPT_H"; then - AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include ]) - fi + if test -z "$GETOPT_H"; then + AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h]) + fi + + dnl BSD getopt_long uses an incompatible method to reset option processing, + dnl and (as of 2004-10-15) mishandles optional option-arguments. + if test -z "$GETOPT_H"; then + AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include ]) + fi - dnl Solaris 10 getopt doesn't handle `+' as a leading character in an - dnl option string (as of 2005-05-05). - if test -z "$GETOPT_H"; then - AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt], + dnl Solaris 10 getopt doesn't handle `+' as a leading character in an + dnl option string (as of 2005-05-05). + if test -z "$GETOPT_H"; then + AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt], [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([#include ], + [AC_LANG_PROGRAM([#include ], [[ char *myargv[3]; myargv[0] = "conftest"; myargv[1] = "-+"; myargv[2] = 0; return getopt (2, myargv, "+a") != '?'; - ]])], - [gl_cv_func_gnu_getopt=yes], - [gl_cv_func_gnu_getopt=no], - [dnl cross compiling - pessimistically guess based on decls - dnl Solaris 10 getopt doesn't handle `+' as a leading character in an - dnl option string (as of 2005-05-05). - AC_CHECK_DECL([getopt_clip], + ]])], + [gl_cv_func_gnu_getopt=yes], + [gl_cv_func_gnu_getopt=no], + [dnl cross compiling - pessimistically guess based on decls + dnl Solaris 10 getopt doesn't handle `+' as a leading character in an + dnl option string (as of 2005-05-05). + AC_CHECK_DECL([getopt_clip], [gl_cv_func_gnu_getopt=no], [gl_cv_func_gnu_getopt=yes], [#include ])])]) - if test "$gl_cv_func_gnu_getopt" = "no"; then - GETOPT_H=getopt.h - fi - fi - - if test -n "$GETOPT_H"; then - gl_GETOPT_SUBSTITUTE + if test "$gl_cv_func_gnu_getopt" = "no"; then + GETOPT_H=getopt.h fi fi ]) +AC_DEFUN([gl_GETOPT_IFELSE], +[ + AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) + AS_IF([test -n "$GETOPT_H"], [$1], [$2]) +]) + +AC_DEFUN([gl_GETOPT], [gl_GETOPT_IFELSE([gl_GETOPT_SUBSTITUTE])]) + # Prerequisites of lib/getopt*. AC_DEFUN([gl_PREREQ_GETOPT], [:]) diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 12d6889058..6d84890e7b 100644 --- a/m4/getpagesize.m4 +++ b/m4/getpagesize.m4 @@ -1,4 +1,4 @@ -# getpagesize.m4 serial 4 +# getpagesize.m4 serial 5 dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ AC_DEFUN([gl_GETPAGESIZE], AC_LIBSOURCES([getpagesize.h]) dnl Prerequisites of lib/getpagesize.h. - AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(sys/param.h) AC_CHECK_HEADERS(OS.h) AC_CHECK_FUNCS(getpagesize) ]) diff --git a/m4/getpass.m4 b/m4/getpass.m4 index 3816253fd1..3d7d33bbb7 100644 --- a/m4/getpass.m4 +++ b/m4/getpass.m4 @@ -35,7 +35,7 @@ AC_DEFUN([gl_FUNC_GETPASS_GNU], # Prerequisites of lib/getpass.c. AC_DEFUN([gl_PREREQ_GETPASS], [ - AC_CHECK_HEADERS_ONCE(stdio_ext.h) + AC_CHECK_HEADERS_ONCE(stdio_ext.h termios.h) + AC_CHECK_FUNCS_ONCE(__fsetlocking tcgetattr tcsetattr) AC_CHECK_DECLS_ONCE([fflush_unlocked flockfile fputs_unlocked funlockfile putc_unlocked]) - : ]) diff --git a/m4/getugroups.m4 b/m4/getugroups.m4 index be865303d4..0369b07b3d 100644 --- a/m4/getugroups.m4 +++ b/m4/getugroups.m4 @@ -1,4 +1,4 @@ -# getugroups.m4 serial 4 +# getugroups.m4 serial 5 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,6 +10,5 @@ AC_DEFUN([gl_GETUGROUPS], AC_LIBOBJ([getugroups]) dnl Prerequisites of lib/getugroups.c. - AC_CHECK_HEADERS_ONCE(unistd.h) AC_TYPE_GETGROUPS ]) diff --git a/m4/group-member.m4 b/m4/group-member.m4 index d5e96c8746..ab4a920eda 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,4 +1,4 @@ -#serial 8 +#serial 9 # Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -25,6 +25,5 @@ AC_DEFUN([gl_FUNC_GROUP_MEMBER], # Prerequisites of lib/group-member.c. AC_DEFUN([gl_PREREQ_GROUP_MEMBER], [ - AC_CHECK_HEADERS_ONCE(unistd.h) AC_REQUIRE([AC_FUNC_GETGROUPS]) ]) diff --git a/m4/idcache.m4 b/m4/idcache.m4 index d0ae832ea8..804ce42a10 100644 --- a/m4/idcache.m4 +++ b/m4/idcache.m4 @@ -1,4 +1,4 @@ -# idcache.m4 serial 4 +# idcache.m4 serial 5 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,4 @@ AC_DEFUN([gl_IDCACHE], [ AC_LIBSOURCES([idcache.c]) AC_LIBOBJ([idcache]) - - dnl Prerequisites of lib/idcache.c. - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index ea0b0c4ea6..244a77911d 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 6 (gettext-0.14.3) +# lib-link.m4 serial 7 (gettext-0.15) dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -126,6 +126,7 @@ dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl By default, look in $includedir and $libdir. @@ -148,7 +149,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ]) else additional_includedir="$withval/include" - additional_libdir="$withval/lib" + additional_libdir="$withval/$acl_libdirstem" fi fi ]) @@ -248,7 +249,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -334,8 +335,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Assume the include files are nearby. additional_includedir= case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` additional_includedir="$basedir/include" ;; esac @@ -396,9 +397,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 0d895ca630..a8684e17e3 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,4 +1,4 @@ -# lib-prefix.m4 serial 4 (gettext-0.14.2) +# lib-prefix.m4 serial 5 (gettext-0.15) dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,6 +24,7 @@ AC_DEFUN([AC_LIB_PREFIX], AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) dnl By default, look in $includedir and $libdir. use_additional=yes @@ -45,7 +46,7 @@ AC_DEFUN([AC_LIB_PREFIX], ]) else additional_includedir="$withval/include" - additional_libdir="$withval/lib" + additional_libdir="$withval/$acl_libdirstem" fi fi ]) @@ -87,7 +88,7 @@ AC_DEFUN([AC_LIB_PREFIX], dnl 2. if it's already present in $LDFLAGS, dnl 3. if it's /usr/local/lib and we are using GCC on Linux, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then haveit= for x in $LDFLAGS; do AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) @@ -97,7 +98,7 @@ AC_DEFUN([AC_LIB_PREFIX], fi done if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then if test -n "$GCC"; then case $host_os in linux*) haveit=yes;; @@ -151,3 +152,34 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" ]) + +dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing +dnl the basename of the libdir, either "lib" or "lib64". +AC_DEFUN([AC_LIB_PREPARE_MULTILIB], +[ + dnl There is no formal standard regarding lib and lib64. The current + dnl practice is that on a system supporting 32-bit and 64-bit instruction + dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit + dnl libraries go under $prefix/lib. We determine the compiler's default + dnl mode by looking at the compiler's library search path. If at least + dnl of its elements ends in /lib64 or points to a directory whose absolute + dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the + dnl default, namely "lib". + acl_libdirstem=lib + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi +]) diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index f67b48d544..735dad09f2 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 dnl Run a program to determine whether whether link(2) follows symlinks. dnl Set LINK_FOLLOWS_SYMLINKS accordingly. @@ -13,11 +13,6 @@ AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK], [whether link(2) dereferences a symlink specified with a trailing slash], jm_ac_cv_func_link_follows_symlink, [ - dnl poor-man's AC_REQUIRE: FIXME: repair this once autoconf-3 provides - dnl the appropriate framework. - test -z "$ac_cv_header_unistd_h" \ - && AC_CHECK_HEADERS(unistd.h) - # Create a regular file. echo > conftest.file AC_TRY_RUN( diff --git a/m4/mkdir-p.m4 b/m4/mkdir-p.m4 index a92e66a381..2b72c49448 100644 --- a/m4/mkdir-p.m4 +++ b/m4/mkdir-p.m4 @@ -1,4 +1,4 @@ -# mkdir-p.m4 serial 8 +# mkdir-p.m4 serial 9 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,5 @@ AC_DEFUN([gl_MKDIR_PARENTS], dnl Prerequisites of lib/mkdir-p.c. AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_CHECK_HEADERS_ONCE(unistd.h) AC_REQUIRE([gl_AFS]) ]) diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index fb6cfcdf7b..0919788841 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,4 +1,4 @@ -#serial 11 +#serial 12 # Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -65,7 +65,7 @@ AC_DEFUN([gl_PREREQ_MKSTEMP], # Prerequisites of lib/tempname.c. AC_DEFUN([gl_PREREQ_TEMPNAME], [ - AC_CHECK_HEADERS_ONCE(sys/time.h stdint.h unistd.h) + AC_CHECK_HEADERS_ONCE(sys/time.h) AC_CHECK_FUNCS(__secure_getenv gettimeofday) AC_CHECK_DECLS_ONCE(getenv) AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 554ad25c9b..07be5ccc0e 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,8 +14,8 @@ dnl From Jim Meyering. # -------------- AC_DEFUN([AC_FUNC_MKTIME], [AC_REQUIRE([AC_HEADER_TIME])dnl -AC_CHECK_HEADERS(stdlib.h sys/time.h unistd.h) -AC_CHECK_FUNCS(alarm) +AC_CHECK_HEADERS_ONCE(sys/time.h) +AC_CHECK_FUNCS_ONCE(alarm) AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, [AC_RUN_IFELSE([AC_LANG_SOURCE( [[/* Test program from Paul Eggert and Tony Leneis. */ @@ -30,10 +30,7 @@ AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, # endif #endif -#if HAVE_STDLIB_H -# include -#endif - +#include #include #if !HAVE_ALARM diff --git a/m4/mountlist.m4 b/m4/mountlist.m4 index db06f8f187..b2a2e12f89 100644 --- a/m4/mountlist.m4 +++ b/m4/mountlist.m4 @@ -1,4 +1,4 @@ -#serial 7 +#serial 8 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,6 @@ AC_DEFUN([gl_MOUNTLIST], AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], [ dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h. - AC_CHECK_HEADERS_ONCE(unistd.h) AC_CHECK_HEADERS(sys/mntent.h) gl_FSTYPENAME ]) diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 3d64ca906f..2d6c90b47b 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,4 +1,4 @@ -#serial 13 +#serial 14 dnl From Jim Meyering. dnl Check for the nanosleep function. @@ -67,6 +67,5 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], # Prerequisites of lib/nanosleep.c. AC_DEFUN([gl_PREREQ_NANOSLEEP], [ - AC_CHECK_HEADERS_ONCE(unistd.h) AC_CHECK_FUNCS_ONCE(siginterrupt) ]) diff --git a/m4/onceonly_2_57.m4 b/m4/onceonly_2_57.m4 index 9fc510e06e..14d3c0b2a4 100644 --- a/m4/onceonly_2_57.m4 +++ b/m4/onceonly_2_57.m4 @@ -1,5 +1,5 @@ # onceonly_2_57.m4 serial 3 -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -27,7 +27,7 @@ dnl thus reducing the size of 'configure'. Works with autoconf-2.57. The dnl size reduction is ca. 9%. dnl Autoconf version 2.57 or newer is recommended. -AC_PREREQ(2.54) +AC_PREREQ(2.57) # AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of # AC_CHECK_HEADERS(HEADER1 HEADER2 ...). diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index ccf4a77c2e..26c1659354 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,4 +1,4 @@ -# pathmax.m4 serial 4 +# pathmax.m4 serial 5 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,5 +9,5 @@ AC_DEFUN([gl_PATHMAX], AC_LIBSOURCES([pathmax.h]) dnl Prerequisites of lib/pathmax.h. - AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(sys/param.h) ]) diff --git a/m4/physmem.m4 b/m4/physmem.m4 index 900b29b2be..18250ddecc 100644 --- a/m4/physmem.m4 +++ b/m4/physmem.m4 @@ -1,4 +1,4 @@ -# physmem.m4 serial 4 +# physmem.m4 serial 5 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,7 +30,6 @@ AC_DEFUN([gl_PHYSMEM], AC_LIBOBJ([physmem]) # Prerequisites of lib/physmem.c. - AC_CHECK_HEADERS_ONCE(unistd.h) AC_CHECK_HEADERS([sys/pstat.h sys/sysmp.h sys/sysinfo.h \ machine/hal_sysinfo.h sys/table.h sys/param.h sys/sysctl.h \ sys/systemcfg.h],,, [AC_INCLUDES_DEFAULT]) diff --git a/m4/posixver.m4 b/m4/posixver.m4 index 369ba3fd67..838441a49f 100644 --- a/m4/posixver.m4 +++ b/m4/posixver.m4 @@ -1,4 +1,4 @@ -# posixver.m4 serial 6 +# posixver.m4 serial 7 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,6 @@ AC_DEFUN([gl_POSIXVER], AC_LIBSOURCES([posixver.c, posixver.h]) AC_LIBOBJ([posixver]) - AC_CHECK_HEADERS_ONCE(unistd.h) AC_REQUIRE([gl_DEFAULT_POSIX2_VERSION]) ]) diff --git a/m4/putenv.m4 b/m4/putenv.m4 index 90ec17064c..c913e27e6a 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ -# putenv.m4 serial 9 -dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +# putenv.m4 serial 10 +dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -39,11 +39,5 @@ AC_DEFUN([gl_FUNC_PUTENV], AC_LIBOBJ(putenv) AC_DEFINE(putenv, rpl_putenv, [Define to rpl_putenv if the replacement function should be used.]) - gl_PREREQ_PUTENV fi ]) - -# Prerequisites of lib/putenv.c. -AC_DEFUN([gl_PREREQ_PUTENV], [ - AC_CHECK_HEADERS_ONCE(unistd.h) -]) diff --git a/m4/safe-read.m4 b/m4/safe-read.m4 index ac8ecafac4..e1f306417e 100644 --- a/m4/safe-read.m4 +++ b/m4/safe-read.m4 @@ -1,4 +1,4 @@ -# safe-read.m4 serial 3 +# safe-read.m4 serial 4 dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,5 +16,4 @@ AC_DEFUN([gl_SAFE_READ], AC_DEFUN([gl_PREREQ_SAFE_READ], [ AC_REQUIRE([gt_TYPE_SSIZE_T]) - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/same.m4 b/m4/same.m4 index 30cdfd2ff9..cd7c161747 100644 --- a/m4/same.m4 +++ b/m4/same.m4 @@ -1,4 +1,4 @@ -# same.m4 serial 5 +# same.m4 serial 6 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,5 @@ AC_DEFUN([gl_SAME], dnl Prerequisites of lib/same.c. AC_REQUIRE([AC_SYS_LONG_FILE_NAMES]) - AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CHECK_FUNCS_ONCE([pathconf]) ]) diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4 index 7acdfeb853..eec27890f5 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,5 +10,4 @@ AC_DEFUN([gl_SAVE_CWD], AC_LIBOBJ([save-cwd]) dnl Prerequisites for lib/save-cwd.c. AC_CHECK_FUNCS_ONCE(fchdir) - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/stdio-safer.m4 b/m4/stdio-safer.m4 index a24e1e4305..cb60acb1ee 100644 --- a/m4/stdio-safer.m4 +++ b/m4/stdio-safer.m4 @@ -1,4 +1,4 @@ -#serial 4 +#serial 5 dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,4 @@ AC_DEFUN([gl_STDIO_SAFER], [ AC_LIBSOURCES([fopen-safer.c, stdio-safer.h, stdio--.h]) AC_LIBOBJ([fopen-safer]) - - dnl Prerequisites of lib/fopen-safer.c. - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/strndup.m4 b/m4/strndup.m4 index 5794504568..66cedb4334 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,4 +1,4 @@ -# strndup.m4 serial 4 +# strndup.m4 serial 5 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,6 +18,4 @@ AC_DEFUN([gl_FUNC_STRNDUP], ]) # Prerequisites of lib/strndup.c. -AC_DEFUN([gl_PREREQ_STRNDUP], [ - AC_CHECK_DECLS(strnlen) -]) +AC_DEFUN([gl_PREREQ_STRNDUP], [:]) diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index e6af315cb6..67964c8d7d 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,11 +1,13 @@ -# strnlen.m4 serial 4 -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +# strnlen.m4 serial 5 +dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRNLEN], [ + AC_LIBSOURCES([strnlen.c, strnlen.h]) + dnl Persuade glibc to declare strnlen(). AC_REQUIRE([AC_GNU_SOURCE]) @@ -22,4 +24,6 @@ AC_DEFUN([gl_FUNC_STRNLEN], ]) # Prerequisites of lib/strnlen.c. -AC_DEFUN([gl_PREREQ_STRNLEN], [:]) +AC_DEFUN([gl_PREREQ_STRNLEN], [ + AC_CHECK_DECLS_ONCE(strnlen) +]) diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4 index c819c92ebf..6fbe4c6fb0 100644 --- a/m4/unistd-safer.m4 +++ b/m4/unistd-safer.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,17 +10,4 @@ AC_DEFUN([gl_UNISTD_SAFER], AC_LIBOBJ([dup-safer]) AC_LIBOBJ([fd-safer]) AC_LIBOBJ([pipe-safer]) - - gl_PREREQ_DUP_SAFER - gl_PREREQ_FD_SAFER -]) - -# Prerequisites of lib/dup-safer.c. -AC_DEFUN([gl_PREREQ_DUP_SAFER], [ - AC_CHECK_HEADERS_ONCE(unistd.h) -]) - -# Prerequisites of lib/fd-safer.c. -AC_DEFUN([gl_PREREQ_FD_SAFER], [ - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 5e22e5dc59..fd5ee7c9df 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,4 +1,4 @@ -#serial 2 +#serial 3 # Copyright (C) 2005 Free Software Foundation, Inc. # @@ -11,7 +11,7 @@ AC_DEFUN([gl_UNLINKDIR], [ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_HEADERS_ONCE(priv.h unistd.h) + AC_CHECK_HEADERS_ONCE(priv.h) AC_LIBSOURCES([unlinkdir.c, unlinkdir.h]) AC_LIBOBJ([unlinkdir]) diff --git a/m4/userspec.m4 b/m4/userspec.m4 index 00ec209f52..92a22d6059 100644 --- a/m4/userspec.m4 +++ b/m4/userspec.m4 @@ -1,4 +1,4 @@ -#serial 7 +#serial 8 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,5 +10,5 @@ AC_DEFUN([gl_USERSPEC], AC_LIBOBJ([userspec]) dnl Prerequisites of lib/userspec.c. - AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(sys/param.h) ]) diff --git a/m4/xreadlink.m4 b/m4/xreadlink.m4 index 9e32786e11..c59b4a7349 100644 --- a/m4/xreadlink.m4 +++ b/m4/xreadlink.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,5 +11,4 @@ AC_DEFUN([gl_XREADLINK], dnl Prerequisites of lib/xreadlink.c. AC_REQUIRE([gt_TYPE_SSIZE_T]) - AC_CHECK_HEADERS_ONCE(unistd.h) ]) diff --git a/m4/xstrtod.m4 b/m4/xstrtod.m4 index 7b2c7b0d68..9307bd391c 100644 --- a/m4/xstrtod.m4 +++ b/m4/xstrtod.m4 @@ -1,5 +1,5 @@ #serial 4 -dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -- 2.47.3