mirror/patch
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/patch.git synced 2026-01-26 16:09:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: update gnulib submodule to latest

Browse Source 
* bootstrap, bootstrap.conf: Update.
* configure.ac: Remove obsolete AC_PROG_CC_STDC macro (AC_PROG_CC is
already present). Remove obsolescent AC_HEADER_STDC macro.
* m4/xattr.m4: Replace obsolete AC_HELP_STRING by AS_HELP_STRING.
* m4/setmode.m4: Replace obsolete AC_TRY_LINK by AC_LINK_IFELSE.
* Makefile.am (EXTRA_DIST): Add missing m4/gnulib-cache.m4.
* lib/Makefile.am: Regenerate.
This commit is contained in:
Andreas Gruenbacher 2024-08-23 21:35:51 +02:00
parent f144b35425
commit 68cb5293f7
9 changed files with 4210 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -23,6 +23,7 @@ dist_man1_MANS = patch.man
EXTRA_DIST = \
ChangeLog-2011 \
cfg.mk \
m4/gnulib-cache.m4 \
m4/mkdir.m4 \
m4/setmode.m4 \
bootstrap \

272
bootstrap
View File

@ -3,7 +3,7 @@
# Bootstrap this package from checked-out sources.
scriptversion=2023-12-10.18; # UTC
scriptversion=2024-07-04.10; # UTC
# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
@ -37,7 +37,7 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
scriptlibversion=2023-12-10.18; # UTC
scriptlibversion=2024-07-21.12; # UTC
# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
@ -478,10 +478,9 @@ find_tool ()
# --------------------- Preparing GNULIB_SRCDIR for use. ---------------------
# This is part of autopull.sh, but bootstrap needs it too, for self-upgrading.
# cleanup_gnulib fails, removing the directory $gnulib_path first.
cleanup_gnulib() {
status=$?
# XXX It's a bad idea to erase the submodule directory if it contains local
# modifications.
rm -fr "$gnulib_path"
exit $status
}
@ -499,54 +498,61 @@ prepare_GNULIB_SRCDIR ()
test -f "$GNULIB_SRCDIR/gnulib-tool" \
|| die "Error: --gnulib-srcdir or \$GNULIB_SRCDIR is specified," \
"but does not contain gnulib-tool"
elif $use_git; then
if test -n "$GNULIB_REVISION" && $use_git; then
# The 'git checkout "$GNULIB_REVISION"' command succeeds if the
# GNULIB_REVISION is a commit hash that exists locally, or if it is
# branch name that can be fetched from origin. It fails, however,
# if the GNULIB_REVISION is a commit hash that only exists in
# origin. In this case, we need a 'git fetch' and then retry
# 'git checkout "$GNULIB_REVISION"'.
(cd "$GNULIB_SRCDIR" \
&& { git checkout "$GNULIB_REVISION" 2>/dev/null \
|| { git fetch origin && git checkout "$GNULIB_REVISION"; }
}
) || exit $?
fi
else
if ! $use_git; then
die "Error: --no-git is specified," \
"but neither --gnulib-srcdir nor \$GNULIB_SRCDIR is specified"
fi
if git submodule -h | grep -- --reference > /dev/null; then
:
else
die "git version is too old, git >= 1.6.4 is required"
fi
gnulib_path=$(git_modules_config submodule.gnulib.path)
test -z "$gnulib_path" && gnulib_path=gnulib
# Get gnulib files. Populate $gnulib_path, possibly updating a
# submodule, for use in the rest of the script.
if test -n "$GNULIB_REFDIR" && test -d "$GNULIB_REFDIR"/.git \
&& git_modules_config submodule.gnulib.url >/dev/null; then
# Use GNULIB_REFDIR as a reference.
echo "$0: getting gnulib files..."
if git submodule -h|grep -- --reference > /dev/null; then
# Prefer the one-liner available in git 1.6.4 or newer.
git submodule update --init --reference "$GNULIB_REFDIR" \
"$gnulib_path" || exit $?
if test -n "$gnulib_path"; then
# A submodule 'gnulib' is configured.
# Get gnulib files. Populate $gnulib_path, updating the submodule.
if test -n "$GNULIB_REFDIR" && test -d "$GNULIB_REFDIR"/.git; then
# Use GNULIB_REFDIR as a reference.
echo "$0: getting gnulib files..."
git submodule update --init --reference "$GNULIB_REFDIR" "$gnulib_path"\
|| exit $?
else
# This fallback allows at least git 1.5.5.
if test -f "$gnulib_path"/gnulib-tool; then
# Since file already exists, assume submodule init already complete.
# GNULIB_REFDIR is not set or not usable. Ignore it.
if git_modules_config submodule.gnulib.url >/dev/null; then
echo "$0: getting gnulib files..."
git submodule init -- "$gnulib_path" || exit $?
git submodule update -- "$gnulib_path" || exit $?
else
# Older git can't clone into an empty directory.
rmdir "$gnulib_path" 2>/dev/null
git clone --reference "$GNULIB_REFDIR" \
"$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
&& git submodule init -- "$gnulib_path" \
&& git submodule update -- "$gnulib_path" \
|| exit $?
die "Error: submodule 'gnulib' has no configured url"
fi
fi
else
# GNULIB_REFDIR is not set or not usable. Ignore it.
if git_modules_config submodule.gnulib.url >/dev/null; then
gnulib_path='gnulib'
if test ! -d "$gnulib_path"; then
# The subdirectory 'gnulib' does not yet exist. Clone into it.
echo "$0: getting gnulib files..."
git submodule init -- "$gnulib_path" || exit $?
git submodule update -- "$gnulib_path" || exit $?
elif [ ! -d "$gnulib_path" ]; then
echo "$0: getting gnulib files..."
trap cleanup_gnulib HUP INT PIPE TERM
gnulib_url=${GNULIB_URL:-$default_gnulib_url}
shallow=
if test -z "$GNULIB_REVISION"; then
if git clone -h 2>&1 | grep -- --depth > /dev/null; then
shallow='--depth 2'
fi
git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
git clone $shallow "$gnulib_url" "$gnulib_path" \
|| cleanup_gnulib
else
if git fetch -h 2>&1 | grep -- --depth > /dev/null; then
@ -562,30 +568,43 @@ prepare_GNULIB_SRCDIR ()
# is without fetching all commits. So fall back to fetching all
# commits.
git -C "$gnulib_path" init
git -C "$gnulib_path" remote add origin \
${GNULIB_URL:-$default_gnulib_url}
git -C "$gnulib_path" remote add origin "$gnulib_url"
git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \
|| git -C "$gnulib_path" fetch origin \
|| cleanup_gnulib
git -C "$gnulib_path" reset --hard FETCH_HEAD
(cd "$gnulib_path" && git checkout "$GNULIB_REVISION") \
|| cleanup_gnulib
fi
trap - HUP INT PIPE TERM
else
# The subdirectory 'gnulib' already exists.
if test -n "$GNULIB_REVISION"; then
if test -d "$gnulib_path/.git"; then
# The 'git checkout "$GNULIB_REVISION"' command succeeds if the
# GNULIB_REVISION is a commit hash that exists locally, or if it is
# branch name that can be fetched from origin. It fails, however,
# if the GNULIB_REVISION is a commit hash that only exists in
# origin. In this case, we need a 'git fetch' and then retry
# 'git checkout "$GNULIB_REVISION"'.
(cd "$gnulib_path" \
&& { git checkout "$GNULIB_REVISION" 2>/dev/null \
|| { git fetch origin && git checkout "$GNULIB_REVISION"; }
}
) || exit $?
else
die "Error: GNULIB_REVISION is specified in bootstrap.conf," \
"but '$gnulib_path' contains no git history"
fi
fi
fi
fi
GNULIB_SRCDIR=$gnulib_path
# Verify that the submodule contains a gnulib checkout.
# Verify that $gnulib_path contains a gnulib checkout.
test -f "$gnulib_path/gnulib-tool" \
|| die "Error: $gnulib_path is supposed to contain a gnulib checkout," \
|| die "Error: '$gnulib_path' is supposed to contain a gnulib checkout," \
"but does not contain gnulib-tool"
GNULIB_SRCDIR=$gnulib_path
fi
# XXX Should this be done if $use_git is false?
if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
&& ! git_modules_config submodule.gnulib.url >/dev/null; then
(cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
fi
# $GNULIB_SRCDIR now points to the version of gnulib to use, and
# we no longer need to use git or $gnulib_path below here.
}
@ -647,7 +666,8 @@ fi
autopull_usage() {
cat <<EOF
Usage: $me [OPTION]...
Bootstrap this package from the checked-out sources.
Bootstrap this package from the checked-out sources, phase 1:
Pull files from the network.
Optional environment variables:
GNULIB_SRCDIR Specifies the local directory where gnulib
@ -664,18 +684,19 @@ Optional environment variables:
which is Gnulib's upstream repository.
Options:
--bootstrap-sync if this bootstrap script is not identical to
--bootstrap-sync If this bootstrap script is not identical to
the version in the local gnulib sources,
update this script, and then restart it with
/bin/sh or the shell \$CONFIG_SHELL
--no-bootstrap-sync do not check whether bootstrap is out of sync
--force attempt to bootstrap even if the sources seem
not to have been checked out
--no-git do not use git to update gnulib. Requires that
\$GNULIB_SRCDIR or the --gnulib-srcdir option
points to a gnulib repository with the correct
revision
--skip-po do not download po files
/bin/sh or the shell \$CONFIG_SHELL.
--no-bootstrap-sync Do not check whether bootstrap is out of sync.
--force Attempt to bootstrap even if the sources seem
not to have been checked out.
--no-git Do not use git to update gnulib. Requires that
\$GNULIB_SRCDIR points to a gnulib repository
with the correct revision.
--skip-po Do not download *.po files.
EOF
bootstrap_print_option_usage_hook
cat <<EOF
@ -687,17 +708,16 @@ are honored.
Gnulib sources can be fetched in various ways:
* If the environment variable GNULIB_SRCDIR is set (either as an
environment variable or via the --gnulib-srcdir option), then sources
are fetched from that local directory. If it is a git repository and
the configuration variable GNULIB_REVISION is set in bootstrap.conf,
then that revision is checked out.
* If the environment variable GNULIB_SRCDIR is set, then sources are
fetched from that local directory. If it is a git repository and the
configuration variable GNULIB_REVISION is set in bootstrap.conf, then
that revision is checked out.
* Otherwise, if this package is in a git repository with a 'gnulib'
submodule configured, then that submodule is initialized and updated
and sources are fetched from there. If GNULIB_REFDIR is set (either
as an environment variable or via the --gnulib-refdir option) and is
a git repository, then it is used as a reference.
and sources are fetched from there. If the environment variable
GNULIB_REFDIR is set and is a git repository, then it is used as a
reference.
* Otherwise, if the 'gnulib' directory does not exist, Gnulib sources
are cloned into that directory using git from \$GNULIB_URL, defaulting
@ -890,7 +910,8 @@ update_po_files() {
autogen_usage() {
cat <<EOF
Usage: $me [OPTION]...
Bootstrap this package from the checked-out sources.
Bootstrap this package from the checked-out sources, phase 2:
Generate files from local files (no network access).
Optional environment variables:
GNULIB_SRCDIR Specifies the local directory where gnulib
@ -899,9 +920,9 @@ Optional environment variables:
you want to use these sources.
Options:
--copy copy files instead of creating symbolic links
--force attempt to bootstrap even if the sources seem
not to have been checked out
--copy Copy files instead of creating symbolic links.
--force Attempt to bootstrap even if the sources seem
not to have been checked out.
EOF
bootstrap_print_option_usage_hook
cat <<EOF
@ -1234,6 +1255,20 @@ autogen()
$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
|| die "gnulib-tool failed"
if test $with_gettext = yes && test ! -f $m4_base/gettext.m4; then
# The gnulib-tool invocation has removed $m4_base/gettext.m4, that the
# AUTOPOINT invocation had installed. This can occur when the gnulib
# module 'gettext' was previously present but is now not present any more.
# Repeat the AUTOPOINT invocation and the gnulib-tool invocation.
echo "$0: $AUTOPOINT --force"
$AUTOPOINT --force || return
echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
|| die "gnulib-tool failed"
fi
for file in $gnulib_files; do
symlink_to_dir "$GNULIB_SRCDIR" $file \
|| die "failed to symlink $file"
@ -1331,7 +1366,7 @@ autogen()
# ----------------------------------------------------------------------------
# Local Variables:
# eval: (add-hook 'before-save-hook 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptlibversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
@ -1347,44 +1382,55 @@ Optional environment variables:
GNULIB_SRCDIR Specifies the local directory where gnulib
sources reside. Use this if you already
have gnulib sources on your machine, and
do not want to waste your bandwidth downloading
them again.
GNULIB_URL URL of the gnulib repository. The default is
$default_gnulib_url,
which is Gnulib's upstream repository.
Options:
--pull Do phase 1: pull files from network
--gen Do phase 2: generate from local files.
(The default is to do both phases.)
--gnulib-srcdir=DIRNAME specify the local directory where gnulib
sources reside. Use this if you already
have gnulib sources on your machine, and
you want to use these sources. Defaults
to \$GNULIB_SRCDIR
--gnulib-refdir=DIRNAME specify the local directory where a gnulib
you want to use these sources.
GNULIB_REFDIR Specifies the local directory where a gnulib
repository (with a .git subdirectory) resides.
Use this if you already have gnulib sources
and history on your machine, and do not want
to waste your bandwidth downloading them again.
Defaults to \$GNULIB_REFDIR
Only used for phase 1 (--pull).
GNULIB_URL URL of the gnulib repository. The default is
$default_gnulib_url,
which is Gnulib's upstream repository.
Only used for phase 1 (--pull).
--bootstrap-sync if this bootstrap script is not identical to
Options:
--pull Do phase 1: Pull files from the network.
--gen Do phase 2: Generate files from local files
(no network access).
(The default is to do both phases.)
--gnulib-srcdir=DIRNAME Specifies the local directory where gnulib
sources reside. Use this if you already
have gnulib sources on your machine, and
you want to use these sources. Defaults
to \$GNULIB_SRCDIR.
--gnulib-refdir=DIRNAME Specifies the local directory where a gnulib
repository (with a .git subdirectory) resides.
Use this if you already have gnulib sources
and history on your machine, and do not want
to waste your bandwidth downloading them again.
Defaults to \$GNULIB_REFDIR.
Only used for phase 1 (--pull).
--bootstrap-sync If this bootstrap script is not identical to
the version in the local gnulib sources,
update this script, and then restart it with
/bin/sh or the shell \$CONFIG_SHELL
--no-bootstrap-sync do not check whether bootstrap is out of sync
/bin/sh or the shell \$CONFIG_SHELL.
--no-bootstrap-sync Do not check whether bootstrap is out of sync.
--copy copy files instead of creating symbolic links
--force attempt to bootstrap even if the sources seem
not to have been checked out
--no-git do not use git to update gnulib. Requires that
--copy Copy files instead of creating symbolic links.
Only used for phase 2 (--gen).
--force Attempt to bootstrap even if the sources seem
not to have been checked out.
--no-git Do not use git to update gnulib. Requires that
\$GNULIB_SRCDIR or the --gnulib-srcdir option
points to a gnulib repository with the correct
revision
--skip-po do not download po files
revision.
Only used for phase 1 (--pull).
--skip-po Do not download *.po files.
Only used for phase 1 (--pull).
EOF
bootstrap_print_option_usage_hook
cat <<EOF
@ -1396,11 +1442,11 @@ are honored.
Gnulib sources can be fetched in various ways:
* If the environment variable GNULIB_SRCDIR is set (either as an
environment variable or via the --gnulib-srcdir option), then sources
are fetched from that local directory. If it is a git repository and
the configuration variable GNULIB_REVISION is set in bootstrap.conf,
then that revision is checked out.
* If GNULIB_SRCDIR is set (either as an environment variable or via the
--gnulib-srcdir option), then sources are fetched from that local
directory. If it is a git repository and the configuration variable
GNULIB_REVISION is set in bootstrap.conf, then that revision is
checked out.
* Otherwise, if this package is in a git repository with a 'gnulib'
submodule configured, then that submodule is initialized and updated
@ -1521,16 +1567,16 @@ if $pull && { $use_git || test -z "$SKIP_PO"; }; then
fi
if $gen; then
autogen \
`if $copy; then echo ' --copy'; fi` \
`if test -z "$checkout_only_file"; then echo ' --force'; fi` \
|| die "could not generate auxiliary files"
autogen \
`if $copy; then echo ' --copy'; fi` \
`if test -z "$checkout_only_file"; then echo ' --force'; fi` \
|| die "could not generate auxiliary files"
fi
# ----------------------------------------------------------------------------
# Local Variables:
# eval: (add-hook 'before-save-hook 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"

26
bootstrap.conf
View File

@ -1,10 +1,10 @@
# Bootstrap configuration.
# Bootstrap configuration. -*- sh -*-
# Copyright (C) 2006-2007, 2009-2018 Free Software Foundation, Inc.
# Copyright (C) 2006-2024 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
# the Free Software Foundation; either version 3 of the License, or
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
@ -13,7 +13,7 @@
# 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, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# gnulib modules used by this package.
@ -80,8 +80,6 @@ xlist
xmemdup0
"
gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
# # Additional xgettext options to use. Use "\\\newline" to break lines.
# XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
# --from-code=UTF-8\\\
@ -89,20 +87,20 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
# --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
# --flag=wrapf:1:c-format\\\
# '
#
#
# # If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
# # appears in configure.ac, exclude some unnecessary files.
# # Without grep's -E option (not portable enough, pre-configure),
# # the following test is ugly. Also, this depends on the existence
# # of configure.ac, not the obsolescent-named configure.in. But if
# # you're using this infrastructure, you should care about such things.
#
#
# gettext_external=0
# grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
# gettext_external=1
# grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
# grep '^[ ]*AM_GNU_GETTEXT(\[external]' configure.ac > /dev/null &&
# gettext_external=1
#
#
# if test $gettext_external = 1; then
# # Gettext supplies these files, but we don't need them since
# # we don't have an intl subdirectory.
@ -120,5 +118,13 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
# '
# fi
# Build prerequisites
buildreq="\
autoconf 2.59
automake 1.9.6
git 1.5.5
tar -
"
# Automake requires that ChangeLog exist.
touch ChangeLog || exit 1

2
configure.ac
View File

@ -39,10 +39,8 @@ AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS([config.h:config.hin])
AC_PROG_CC
AC_PROG_CC_STDC
gl_EARLY
gl_USE_SYSTEM_EXTENSIONS
AC_HEADER_STDC
gl_INIT
AM_PROG_AR

2
gnulib

@ -1 +1 @@
Subproject commit a235aed6a25e52eb99e1ef71c070a258dd88a3e9
Subproject commit 38b5fabdfcf0ddd516fdd9105ccb1b2ac38cb62c

4030
lib/Makefile.am
View File

File diff suppressed because it is too large Load Diff

33
m4/.gitignore vendored
View File

@ -14,12 +14,10 @@
/environ.m4
/errno_h.m4
/error.m4
/exponentd.m4
/extensions.m4
/fcntl-o.m4
/fcntl.m4
/fcntl_h.m4
/float_h.m4
/getdtablesize.m4
/getopt.m4
/gettime.m4
@ -30,8 +28,6 @@
/gnulib-tool.m4
/hash.m4
/include_next.m4
/intmax_t.m4
/inttypes_h.m4
/largefile.m4
/localcharset.m4
/locale-fr.m4
@ -41,7 +37,6 @@
/malloc.m4
/malloca.m4
/manywarnings.m4
/math_h.m4
/mbrtowc.m4
/mbsinit.m4
/mbstate_t.m4
@ -55,7 +50,6 @@
/nocrash.m4
/opendir.m4
/pathmax.m4
/printf.m4
/quote.m4
/quotearg.m4
/raise.m4
@ -70,10 +64,8 @@
/ssize_t.m4
/stat-time.m4
/stat.m4
/stdarg.m4
/stddef_h.m4
/stdint.m4
/stdint_h.m4
/stdio_h.m4
/stdlib_h.m4
/strerror.m4
@ -88,18 +80,13 @@
/tm_gmtoff.m4
/unistd-safer.m4
/unistd_h.m4
/vasnprintf.m4
/vasprintf.m4
/warn-on-use.m4
/warnings.m4
/wchar_h.m4
/wchar_t.m4
/wctype_h.m4
/wint_t.m4
/write.m4
/xalloc.m4
/xsize.m4
/xvasprintf.m4
00gnulib.m4
alloca.m4
argmatch.m4
@ -120,7 +107,6 @@ extensions.m4
fcntl-o.m4
fcntl.m4
fcntl_h.m4
float_h.m4
fseek.m4
fseeko.m4
ftell.m4
@ -136,8 +122,6 @@ gnulib-comp.m4
gnulib-tool.m4
hash.m4
include_next.m4
intmax_t.m4
inttypes_h.m4
localcharset.m4
locale-fr.m4
locale-ja.m4
@ -157,7 +141,6 @@ mmap-anon.m4
multiarch.m4
onceonly.m4
pathmax.m4
printf.m4
quote.m4
quotearg.m4
readlink.m4
@ -169,10 +152,8 @@ size_max.m4
ssize_t.m4
stat-time.m4
stat.m4
stdarg.m4
stddef_h.m4
stdint.m4
stdint_h.m4
stdio_h.m4
stdlib_h.m4
strerror.m4
@ -186,18 +167,13 @@ timespec.m4
tm_gmtoff.m4
unistd-safer.m4
unistd_h.m4
vasnprintf.m4
vasprintf.m4
warn-on-use.m4
warnings.m4
wchar_h.m4
wchar_t.m4
wctype_h.m4
wint_t.m4
write.m4
xalloc.m4
xsize.m4
xvasprintf.m4
/close.m4
/off_t.m4
/sys_types_h.m4
@ -290,7 +266,6 @@ xvasprintf.m4
/free.m4
/getcwd-abort-bug.m4
/getcwd-path-max.m4
/getpagesize.m4
/getrandom.m4
/intl-thread-locale.m4
/lcmessage.m4
@ -311,3 +286,11 @@ xvasprintf.m4
/uchar_h.m4
/unictype_h.m4
/vararrays.m4
/c32rtomb.m4
/extensions-aix.m4
/off64_t.m4
/once.m4
/pthread-once.m4
/pthread-spin.m4
/pthread_h.m4
/sys_cdefs_h.m4

8
m4/setmode.m4
View File

@ -21,15 +21,15 @@ AC_DEFUN([AC_FUNC_SETMODE_DOS],
[AC_CHECK_HEADERS([fcntl.h unistd.h])
AC_CACHE_CHECK([for DOS-style setmode],
[ac_cv_func_setmode_dos],
[AC_TRY_LINK(
[#include <io.h>
[AC_LINK_IFELSE([AC_LANG_PROGRAM(
[[#include <io.h>
#if HAVE_FCNTL_H
# include <fcntl.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif],
[int ret = setmode && setmode (1, O_BINARY);],
#endif]],
[int ret = setmode && setmode (1, O_BINARY);])],
[ac_cv_func_setmode_dos=yes],
[ac_cv_func_setmode_dos=no])])
if test $ac_cv_func_setmode_dos = yes; then

2
m4/xattr.m4
View File

@ -12,7 +12,7 @@
AC_DEFUN([gl_FUNC_XATTR],
[
AC_ARG_ENABLE([xattr],
AC_HELP_STRING([--disable-xattr],
AS_HELP_STRING([--disable-xattr],
[do not support extended attributes]),
[use_xattr=$enableval], [use_xattr=yes])