[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gsasl branch, master, updated. gsasl-1-8-0-9-gf7d306f
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gsasl branch, master, updated. gsasl-1-8-0-9-gf7d306f |
|
Date: |
Mon, 10 Sep 2012 08:40:31 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".
http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=f7d306f34b1d465ee951ab75c66e3d3e2f7b55b4
The branch, master has been updated
via f7d306f34b1d465ee951ab75c66e3d3e2f7b55b4 (commit)
via 94407fca2f9daa7648ef00ec5b4f991f1f567249 (commit)
via f422e422e86c9ead4f01b8d9eb9922a9718300eb (commit)
via a4cdf0205c400455441b3a6e7691730066ff09ed (commit)
via 1214681a15cadaa6ced90edcd16b67a2670c25e8 (commit)
via f29d7231b0ad875da6ed855194e7c3a6f598292c (commit)
from 9cf41c808c3522d8decf26171a841e62b56aeb15 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f7d306f34b1d465ee951ab75c66e3d3e2f7b55b4
Author: Simon Josefsson <address@hidden>
Date: Mon Sep 10 10:40:16 2012 +0200
GSSAPI client: Use GSASL_AUTHZID for authorization identity. Accept
missing property.
commit 94407fca2f9daa7648ef00ec5b4f991f1f567249
Author: Simon Josefsson <address@hidden>
Date: Mon Sep 10 10:23:29 2012 +0200
Sync with TP.
commit f422e422e86c9ead4f01b8d9eb9922a9718300eb
Author: Simon Josefsson <address@hidden>
Date: Thu Sep 6 11:48:23 2012 +0200
Update gnulib files.
commit a4cdf0205c400455441b3a6e7691730066ff09ed
Author: Simon Josefsson <address@hidden>
Date: Wed Aug 29 10:31:52 2012 +0200
Doc fixes for all mechanism. Clarify authid vs authzid in GSSAPI.
commit 1214681a15cadaa6ced90edcd16b67a2670c25e8
Author: Simon Josefsson <address@hidden>
Date: Fri Aug 3 13:06:27 2012 +0200
Update gnulib files.
commit f29d7231b0ad875da6ed855194e7c3a6f598292c
Author: Simon Josefsson <address@hidden>
Date: Fri Aug 3 13:01:52 2012 +0200
Sync with TP.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 14 +
doc/gsasl.texi | 282 +++++++-----
gl/Makefile.am | 2 +-
gl/alloca.in.h | 7 +
gl/config.charset | 2 +-
gl/errno.in.h | 48 ++-
gl/fseeko.c | 6 +-
gl/fstat.c | 2 +
gl/getpass.h | 2 +-
gl/gettext.h | 76 ---
gl/localcharset.c | 2 +-
gl/m4/errno_h.m4 | 11 +-
gl/m4/extensions.m4 | 4 +-
gl/m4/fdopen.m4 | 6 +-
gl/m4/getopt.m4 | 291 +++++++------
gl/m4/gnulib-cache.m4 | 2 +-
gl/m4/gnulib-common.m4 | 4 +-
gl/m4/gnulib-comp.m4 | 885 ++++++++++++++++++------------------
gl/m4/intlmacosx.m4 | 12 +-
gl/m4/largefile.m4 | 2 +-
gl/m4/locale-fr.m4 | 10 +-
gl/m4/locale-ja.m4 | 6 +-
gl/m4/locale-tr.m4 | 6 +-
gl/m4/locale-zh.m4 | 6 +-
gl/m4/locale_h.m4 | 4 +-
gl/m4/lock.m4 | 4 +-
gl/m4/manywarnings.m4 | 156 ++++---
gl/m4/mmap-anon.m4 | 12 +-
gl/m4/multiarch.m4 | 4 +-
gl/m4/nocrash.m4 | 4 +-
gl/m4/poll.m4 | 10 +-
gl/m4/printf.m4 | 29 +-
gl/m4/stdio_h.m4 | 4 +-
gl/m4/sys_time_h.m4 | 8 +-
gl/m4/threadlib.m4 | 54 ++--
gl/m4/time_h.m4 | 4 +-
gl/override/lib/gettext.h.diff | 285 ++++++++-----
gl/poll.c | 2 +-
gl/printf-parse.c | 2 +-
gl/select.c | 61 ++-
gl/signal.in.h | 12 +-
gl/stdbool.in.h | 51 ++-
gl/stdint.in.h | 2 +-
gl/stdio-impl.h | 4 +-
gl/stdlib.in.h | 4 +-
gl/strerror-override.c | 16 +-
gl/strerror-override.h | 5 +-
gl/sys_select.in.h | 4 +-
gl/unistd.in.h | 2 +-
gl/vasnprintf.c | 2 +-
gl/verify.h | 6 +-
gltests/init.sh | 5 +-
gltests/locale.in.h | 2 +-
gltests/localename.c | 64 ++--
gltests/stat.c | 1 +
gltests/test-alloca-opt.c | 2 +-
gltests/test-errno.c | 2 +
gltests/test-localename.c | 2 +-
gltests/test-malloca.c | 2 +-
gltests/test-time.c | 2 +-
lib/build-aux/gendocs.sh | 35 +-
lib/build-aux/gnupload | 28 +-
lib/gl/Makefile.am | 2 +-
lib/gl/alloca.in.h | 7 +
lib/gl/base64.h | 8 +
lib/gl/errno.in.h | 48 ++-
lib/gl/gettext.h | 76 ---
lib/gl/m4/errno_h.m4 | 11 +-
lib/gl/m4/extensions.m4 | 4 +-
lib/gl/m4/fdopen.m4 | 6 +-
lib/gl/m4/gettext.m4 | 4 +-
lib/gl/m4/gnulib-cache.m4 | 2 +-
lib/gl/m4/gnulib-common.m4 | 4 +-
lib/gl/m4/gnulib-comp.m4 | 310 +++++++-------
lib/gl/m4/intdiv0.m4 | 4 +-
lib/gl/m4/intlmacosx.m4 | 12 +-
lib/gl/m4/lock.m4 | 4 +-
lib/gl/m4/mmap-anon.m4 | 12 +-
lib/gl/m4/multiarch.m4 | 4 +-
lib/gl/m4/printf.m4 | 29 +-
lib/gl/m4/stdio_h.m4 | 4 +-
lib/gl/m4/strndup.m4 | 4 +-
lib/gl/m4/threadlib.m4 | 54 ++--
lib/gl/m4/visibility.m4 | 4 +-
lib/gl/override/lib/gettext.h.diff | 285 ++++++++-----
lib/gl/printf-parse.c | 2 +-
lib/gl/stdbool.in.h | 51 ++-
lib/gl/stdint.in.h | 2 +-
lib/gl/stdlib.in.h | 4 +-
lib/gl/unistd.in.h | 2 +-
lib/gl/vasnprintf.c | 2 +-
lib/gl/verify.h | 6 +-
lib/gltests/init.sh | 5 +-
lib/gltests/test-alloca-opt.c | 2 +-
lib/gltests/test-errno.c | 2 +
lib/gssapi/client.c | 8 +-
lib/maint.mk | 150 +++++--
lib/po/LINGUAS | 1 +
lib/po/de.po.in | 377 ++++++++++++----
maint.mk | 150 +++++--
po/LINGUAS | 1 +
po/{pl.po.in => hr.po.in} | 114 +++---
po/sk.po.in | 139 ++++---
tests/gssapi.c | 4 +-
104 files changed, 2592 insertions(+), 1912 deletions(-)
copy po/{pl.po.in => hr.po.in} (58%)
diff --git a/NEWS b/NEWS
index b1b9898..2909679 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,20 @@ SASL. That include the manual, the command line tool, and
self tests.
* Version 1.8.1 (unreleased) [stable]
+** GSSAPI client: Now retrieves GSASL_AUTHZID for authorization identity.
+** GSSAPI client: Can now transmit an empty/missing authorization identity.
+Before the GSSAPI client retrieved GSASL_AUTHID (authentication
+identity) and used that as the authorization identity. For backwards
+compatibility, the code now first tries GSASL_AUTHZID and then
+GSASL_AUTHID when discovering the authorization identity. If you
+don't want any authorization identity (and thus let the server fall
+back on the identity implied from the Kerberos layer) then return
+GSASL_NO_CALLBACK on both. The backwards compatibility code will be
+removed after the year 2012 so please update code to use GSASL_AUTHZID
+instead of GSASL_AUTHID. Reported by Amon Ott.
+
+** i18n: Updated translations.
+
* Version 1.8.0 (released 2012-05-28) [stable]
** This is a new major stable release. Brief changes compared to 1.6.x:
diff --git a/doc/gsasl.texi b/doc/gsasl.texi
index 923359a..9a32f78 100644
--- a/doc/gsasl.texi
+++ b/doc/gsasl.texi
@@ -523,8 +523,8 @@ want to limit the size of the library.
Disable or enable individual mechanisms (@pxref{Mechanisms}).
@item --without-stringprep
-Disable internationalized string processing. Note that this will
-result in a SASL library that is only compatible with RFC 2222.
+Disable internationalized string processing. Note that this will result
+in a SASL library that is compatible with RFC 2222 but not RFC 4422.
@end table
@@ -1709,16 +1709,18 @@ entirely dependent on callbacks.
@node EXTERNAL
@section The EXTERNAL mechanism
-The EXTERNAL mechanism is used to authenticate a user to a server
-based on out-of-band authentication. EXTERNAL is typically used over
-TLS authenticated channels. Note that in the server, you need to make
-sure that TLS actually authenticated the client successfully. It is
-normally not sufficient to use TLS, since it also supports anonymous
-modes.
+The EXTERNAL mechanism is used to authenticate a user to a server based
+on out-of-band authentication. EXTERNAL is typically used over TLS
+authenticated channels. Note that in the server, you need to make sure
+that TLS actually authenticated the client successfully and that the
+negotiated ciphersuite and other parameters are acceptable. It is
+generally not sufficient that TLS is used, since TLS supports anonymous
+and other variants that generally provide less assurance than you
+normally want.
In the client, this mechanism is always enabled, and it will send the
@code{GSASL_AUTHZID} property as the authorization name to the server,
-if the property is set. If the property is not set, the empty
+if the property is set. If the property is not set, an empty
authorization name is sent. You need not implement a callback.
In the server, this mechanism will request the
@@ -1727,14 +1729,17 @@ client is authenticated and authorized to log in. Your
callback can
retrieve the @code{GSASL_AUTHZID} property to inspect the requested
authorization name from the client.
+The EXTERNAL mechanism was initially specified in the core SASL
+framework RFC 2222 and later revised in RFC 4422.
+
@node ANONYMOUS
@section The ANONYMOUS mechanism
-The ANONYMOUS mechanism is used to ``authenticate'' clients to
-anonymous services; or rather, just indicate that the client wishes to
-use the service anonymously. The client sends a token, usually her
-email address, which serve the purpose of some trace information
-suitable for log files. The token is not permitted to be empty.
+The ANONYMOUS mechanism is used to ``authenticate'' clients to anonymous
+services; or rather, just indicate that the client wishes to use the
+service anonymously. The client sends a token, usually her email
+address, which serve the purpose of some trace information suitable for
+logging. The token cannot be empty.
In the client, this mechanism is always enabled, and will send the
@code{GSASL_ANONYMOUS_TOKEN} property as the trace information to the
@@ -1743,22 +1748,26 @@ server.
In the server, this mechanism will invoke the
@code{GSASL_VALIDATE_ANONYMOUS} callback to decide whether the client
should be permitted to log in. Your callback can retrieve the
address@hidden property to, for example, save it in a
address@hidden property to, for example, record it in a
log file. The token is normally not used to decide whether the client
should be permitted to log in or not.
+The ANONYMOUS mechanism was initially specified in RFC 2245 and later
+revised in RFC 4505.
+
@node PLAIN
@section The PLAIN mechanism
The PLAIN mechanism uses username and password to authenticate users.
Two user names are relevant. The first, the authentication identity,
indicates the credential holder, i.e., whom the provided password
-belongs to. The second, the authorization identity, is typically
-empty, to indicate that the user requests to log on to the server as
-herself. However, if the authorization identity is not empty, the
-server should decide whether the authenticated user may log on as the
-authorization identity. Normally, only ``super-user'' accounts such
-as @samp{admin} or similar should be allowed this.
+belongs to. The second, the authorization identity, is typically empty
+to indicate that the user requests to log on to the server as herself
+(i.e., the authentication identity). If the authorization identity is
+not empty, the server should decide whether the authenticated user may
+log on as the authorization identity. This is typically used for
+super-user accounts like @samp{admin} to take on the role of a regular
+user.
In the client, this mechanism is always enabled, and require the
@code{GSASL_AUTHID} and @code{GSASL_PASSWORD} properties. If set,
@@ -1773,20 +1782,23 @@ the client should be accepted or not. The callback may
inspect the
@code{GSASL_AUTHID}, @code{GSASL_AUTHZID}, and @code{GSASL_PASSWORD}
properties. These property values will be normalized.
-If the first approach fails (because, e.g., your callback returns
address@hidden to signal that it does not implement
address@hidden) the mechanism will continue to query the
-application for a password, via the @code{GSASL_PASSWORD} property.
-Your callback may use the @code{GSASL_AUTHID} and @code{GSASL_AUTHZID}
-properties to select the proper password. The password is then
-normalized and compared to the client credential.
+If the first approach fails (because there is no callback or your
+callback returns @samp{GSASL_NO_CALLBACK} to signal that it does not
+implement @code{GSASL_VALIDATE_SIMPLE}) the mechanism will continue to
+query the application for a password, via the @code{GSASL_PASSWORD}
+property. Your callback may use the @code{GSASL_AUTHID} and
address@hidden properties to select the proper password. The
+password is then normalized and compared to the client credential.
Which approach to use? If your database stores hashed passwords, you
have no option, but must use the first approach. If passwords in your
-user database are stored in prepared (SASLprep) form, the
-first approach will be faster. If you do not have prepared passwords
-available, you can use the second approach to make sure the password
-is prepared properly before comparison.
+user database are stored in prepared (SASLprep) form, the first approach
+will be faster. If you do not have prepared passwords available, you
+can use the second approach to make sure the password is prepared
+properly before comparison.
+
+The PLAIN mechanism was initially specified in RFC 2595 and later
+revised in RFC 4616.
@node LOGIN
@section The LOGIN mechanism
@@ -1806,17 +1818,19 @@ interpretation of a hypothetical LOGIN specification.
@section The CRAM-MD5 mechanism
@cindex CRAM-MD5
-The CRAM-MD5 is a widely used, but officially deprecated (apparently
-in favor of DIGEST-MD5), challenge-response mechanism that transfers
-hashed passwords instead of clear text passwords. For insecure
-channels (e.g., when TLS is not used), it is safer than
-PLAIN. The CRAM-MD5 mechanism does not support authorization
-identities; making the relationship between CRAM-MD5 and DIGEST-MD5
-similar to the relationship between LOGIN and PLAIN.
+CRAM-MD5 is a widely used challenge-response mechanism that transfers
+hashed passwords instead of clear text passwords. It is official
+deprecated, initially in favor of first DIGEST-MD5 but today
+SCRAM-SHA-1. For insecure channels (e.g., when TLS is not used), it is
+has better properties than PLAIN since the unhashed password is not
+leaked. The CRAM-MD5 mechanism does not support authorization
+identities; that make the relationship between CRAM-MD5 and
+DIGEST-MD5/SCRAM-SHA-1 similar to the relationship between LOGIN and
+PLAIN.
The disadvantage with hashed passwords is that the server cannot use
normal authentication infrastructures such as PAM, because the server
-must have access to the correct password in order to validate an
+must have access to the unhashed password in order to validate every
authentication attempt.
In the client, this mechanism is always enabled, and it requires the
@@ -1824,28 +1838,32 @@ In the client, this mechanism is always enabled, and it
requires the
In the server, the mechanism will require the @code{GSASL_PASSWORD}
callback property, which may use the @code{GSASL_AUTHID} property to
-determine which users' password should be used. The
address@hidden will be in normalized form. The server will then
-normalize the returned password, and compare the client response with
-the computed correct response, and accept the user accordingly.
+determine which users' password should be used. The @code{GSASL_AUTHID}
+will be in normalized form. The server will then normalize the
+password, and compare the client response with the computed correct
+response, and accept the user accordingly.
@xref{Use of SASLprep in CRAM-MD5}, for a clarification on the
interpretation of the CRAM-MD5 specification that this implementation
rely on.
+The CRAM-MD5 mechanism was initially specified in RFC 2095 but quickly
+revised in RFC 2195. Note that both were published before the core SASL
+framework, which explains its lack of authorization identity.
+
@node DIGEST-MD5
@section The DIGEST-MD5 mechanism
@cindex DIGEST-MD5
-The DIGEST-MD5 mechanism is based on repeated hashing using MD5, which
-after the MD5 break may be argued to be weaker than HMAC-MD5, but
-supports more features. For example, authorization identities and
-data integrity and privacy protection are supported. Like CRAM-MD5,
-only a hashed password is transferred. Consequently, DIGEST-MD5 needs
-access to the correct password (although it may be hashed, another
-improvement compared to CRAM-MD5) to verify the client response.
-Alas, this makes it impossible to use, e.g., PAM on the
-server side.
+The DIGEST-MD5 mechanism is based on repeated hashing using MD5. After
+the MD5 break may be argued to be weaker than HMAC-MD5 that CRAM-MD5
+builds on, but DIGEST-MD5 supports other features. For example,
+authorization identities and data integrity and privacy protection are
+supported. Like CRAM-MD5, only a hashed password is transferred.
+Consequently, DIGEST-MD5 needs access to the correct password to verify
+the client response -- however the server can store the password in
+hashed form, another improvement compared to CRAM-MD5 . Alas, this
+makes it impossible to use, e.g., PAM on the server side.
In the client, this mechanism is always enabled, and it requires the
@code{GSASL_AUTHID}, @code{GSASL_PASSWORD}, @code{GSASL_SERVICE}, and
@@ -1855,12 +1873,12 @@ In the client, this mechanism is always enabled, and it
requires the
In the server, the mechanism will first request the
@code{GSASL_DIGEST_MD5_HASHED_PASSWORD} callback property to get the
user's hashed password. If the callback doesn't supply a hashed
-password, the @code{GSASL_PASSWORD} callback property will be
-requested. Both callbacks may use the @code{GSASL_AUTHID},
address@hidden and @code{GSASL_REALM} properties to determine
-which users' password should be used. The server will then compare
-the client response with a computed correct response, and accept the
-user accordingly.
+password (i.e., it returns @samp{GSASL_NO_CALLBACK}), the
address@hidden callback property will be requested. Both
+callbacks may use the @code{GSASL_AUTHID}, @code{GSASL_AUTHZID} and
address@hidden properties to determine which users' password should
+be used. The server will then compare the client response with a
+computed correct response, and accept the user accordingly.
The server uses the @code{GSASL_QOPS} callback to get the set of
quality of protection values to use. By default, it advertises
@@ -1874,18 +1892,26 @@ values offered by the server (which may be inspected
through the
@code{GSASL_QOPS} property). If the client does not return a value,
@code{qop-auth} is used by default.
+The security layers of DIGEST-MD5 are rarely used in practice due to
+interoperability and security reasons. You are recommended to use TLS
+instead.
+
+The DIGEST-MD5 mechanism is specified in RFC 2831. RFC 6331 labels
+DIGEST-MD5 as historic and it contains a good exposition of the
+disadvantages with DIGEST-MD5.
+
@node SCRAM-SHA-1
@section The SCRAM-SHA-1 mechanism
@cindex SCRAM
The SCRAM-SHA-1 mechanism is designed to provide (almost) the same
-capabilities as CRAM-MD5 and DIGEST-MD5 but use modern cryptographic
-techniques such as HMAC-SHA-1 hashing and PKCS#5 PBKDF2 key
-derivation. SCRAM-SHA-1 supports authorization identities. Like
+capabilities that CRAM-MD5 and DIGEST-MD5 provides but use modern
+cryptographic techniques such as HMAC-SHA-1 hashing and PKCS#5 PBKDF2
+key derivation. SCRAM-SHA-1 supports authorization identities. Like
CRAM-MD5 and DIGEST-MD5, only a hashed password is transferred.
-Consequently, SCRAM-SHA-1 needs access to the correct password to
-verify the client response. Channel bindings are supported through
-the SCRAM-SHA-1-PLUS mechanism.
+Consequently, SCRAM-SHA-1 needs access to the correct password to verify
+the client response. Channel bindings are supported through the
+SCRAM-SHA-1-PLUS mechanism.
In the client, the non-PLUS mechanism is always enabled, and it
requires the @code{GSASL_AUTHID} property, and either
@@ -1926,6 +1952,8 @@ does not support channel bindings.
The SCRAM-SHA-1-PLUS mechanism will never complete authentication
successfully if channel bindings are not confirmed.
+The SCRAM-SHA-1 mechanism is specified in RFC 5802.
+
@node NTLM
@section The NTLM mechanism
@cindex NTLM
@@ -1968,30 +1996,43 @@ If the callbacks is invoked again, after having returned
@code{GSASL_PIN} property, in addition to the other properties, to
find out the client selected PIN code.
+The SCRAM-SHA-1 mechanism is specified in RFC 2808.
+
@node GSSAPI
@section The GSSAPI mechanism
@cindex GSSAPI
-The GSSAPI mechanism allows you to authenticate using Kerberos V5.
-The mechanism was originally designed to allow for any GSS-API
-mechanism to be used, but problems with the protocol made it
-unpractical and it is today restricted for use with Kerberos V5. See
-the GS2 mechanism (@pxref{GS2-KRB5}) for a general solution.
+The GSSAPI mechanism allows you to authenticate using Kerberos V5. The
+mechanism was originally designed to allow for any GSS-API mechanism to
+be used, but problems with the protocol made it unpractical and it is
+today restricted for use with Kerberos V5. See the GS2 mechanism
+(@pxref{GS2-KRB5}) for a general solution. However, GSSAPI continues to
+be widely used in Kerberos V5 environments.
In the client, the mechanism is enabled only if the user has acquired
credentials (i.e., a ticket granting ticket), and it requires the
address@hidden, @code{GSASL_SERVICE}, and @code{GSASL_HOSTNAME}
-properties.
address@hidden, @code{GSASL_SERVICE}, and @code{GSASL_HOSTNAME}
+properties. (For historical reasons, if the @code{GSASL_AUTHZID}
+property is not specified, this mechanism checks for the
address@hidden property and if present will use that as the
+authorization identity -- this behaviour will be removed after the year
+2012 so you should update your code to use only @code{GSASL_AUTHZID}.)
In the server, the mechanism requires the @code{GSASL_SERVICE} and
@code{GSASL_HOSTNAME} properties, and it will invoke the
address@hidden callback property in order to validate
-the user. The callback may inspect the @code{GSASL_AUTHZID} and
address@hidden callback property in order to validate the
+user. The callback may inspect the @code{GSASL_AUTHZID} and
@code{GSASL_GSSAPI_DISPLAY_NAME} properties to decide whether to
authorize the user. Note that authentication is performed by the
-GSS-API library.
+GSS-API library and that @code{GSASL_AUTHID} is not used by the server
+mechanism, its role is played by @code{GSASL_GSSAPI_DISPLAY_NAME}.
+
+This implementation does not support security layers. You are
+recommended to use TLS instead.
-XXX: explain more about quality of service, maximum buffer size, etc.
+The GSSAPI mechanism was specified as part of the initial core SASL
+framework, in RFC 2222, but later revised in RFC 4752 to only apply to
+Kerberos V5.
@node GS2-KRB5
@section The GS2-KRB5 mechanism
@@ -2000,40 +2041,42 @@ XXX: explain more about quality of service, maximum
buffer size, etc.
GS2 is a protocol bridge between GSS-API and SASL, and allows every
GSS-API mechanism that supports mutual authentication and channel
-bindings to be used as a SASL mechanism. Currently we support the
-GS2-KRB5 mechanism, for Kerberos V5 authentication, however our GS2
+bindings to be used as a SASL mechanism. Currently GS2-KRB5 is
+supported, for Kerberos V5 authentication, however our GS2
implementation is flexible enough to easily support other GSS-API
mechanism if any gains popularity.
In the client, the mechanism is enabled only if the user has acquired
credentials (i.e., a ticket granting ticket), and it requires the
address@hidden, @code{GSASL_SERVICE}, and @code{GSASL_HOSTNAME}
address@hidden, @code{GSASL_SERVICE}, and @code{GSASL_HOSTNAME}
properties.
In the server, the mechanism requires the @code{GSASL_SERVICE} and
@code{GSASL_HOSTNAME} properties, and it will invoke the
address@hidden callback property in order to validate
-the user. The callback may inspect the @code{GSASL_AUTHZID} and
address@hidden callback property in order to validate the
+user. The callback may inspect the @code{GSASL_AUTHZID} and
@code{GSASL_GSSAPI_DISPLAY_NAME} properties to decide whether to
authorize the user. Note that authentication is performed by the
-GSS-API library.
+GSS-API library and that @code{GSASL_AUTHID} is not used by the server
+mechanism, its role is played by @code{GSASL_GSSAPI_DISPLAY_NAME}.
@cindex GS2-KRB5-PLUS
-The GS2 framework supports a variant of each mechanism, called the
-PLUS variant, which can also bind the authentication to a secure
-channel through channel bindings. Currently this is not supported by
-GNU SASL.
+The GS2 framework supports a variant of each mechanism, called the PLUS
+variant, which can also bind the authentication to a secure channel
+through channel bindings. Currently this is not supported by GNU SASL.
+
+The GS2 mechanism family was specified in RFC 5801.
@node SAML20
@section The SAML20 mechanism
@cindex SAML
The SAML20 mechanism makes it possible to use SAML in SASL, in a way
-that offloads the authentication exchange to an external browser. The
-protocol implemented is as specified in RFC 6595.
+that offloads the authentication exchange to an external web browser.
-The mechanism makes use of the following properties: GSASL_AUTHZID,
address@hidden, @code{GSASL_SAML20_REDIRECT_URL},
+The mechanism makes use of the following properties:
address@hidden, @code{GSASL_SAML20_IDP_IDENTIFIER},
address@hidden,
@code{GSASL_SAML20_AUTHENTICATE_IN_BROWSER} and
@code{GSASL_VALIDATE_SAML20}.
@@ -2056,44 +2099,44 @@ authentication attempt was successful.
Note that SAML itself is not implemented by the GNU SASL library. On
the client side, no SAML knowledge is needed, it is only required on the
-server side. The client only needs to be able to start a browser
-accessing the redirect URL. The server side is expected to call a SAML
-library of your choice to generate the AuthRequest and to implement an
-AssertionConsumerService to validate the AuthResponse. There is a
+server side. The client only needs to be able to start a web browser to
+access the redirect URL. The server side is expected to call a SAML
+library to generate the AuthRequest and to implement an
+AssertionConsumerService (ACS) to validate the AuthResponse. There is a
complete proof-of-concept example of a SMTP server with SAML 2.0 support
-distributed with GNU SASL in the examples/saml20/ sub-directory. It
-uses the Lasso SAML implementation (@url{http://lasso.entrouvert.org/}).
-The example may be used as inspiration for your own server
+distributed with GNU SASL in the @code{examples/saml20/} sub-directory.
+The example uses the Lasso SAML implementation
+(@url{http://lasso.entrouvert.org/}) and require a web server for the
+ACS side. The example may be used as inspiration for your own server
implementation. The @code{gsasl} command line client supports SAML20 as
a client.
+The SAML20 mechanism is specified in RFC 6595.
+
@node OPENID20
@section The OPENID20 mechanism
@cindex OpenID
The OPENID20 mechanism makes it possible to use OpenID in SASL, in a way
-that offloads the authentication exchange to an external browser. The
-protocol implemented is as specified in RFC 6616.
+that offloads the authentication exchange to an external web browser.
-The mechanism makes use of the following properties:
address@hidden (for the OpenID User-Supplied Identifier),
address@hidden, @code{GSASL_OPENID20_REDIRECT_URL},
address@hidden,
+The mechanism makes use of the following properties: @code{GSASL_AUTHID}
+(for the OpenID User-Supplied Identifier), @code{GSASL_AUTHZID},
address@hidden, @code{GSASL_OPENID20_OUTCOME_DATA},
@code{GSASL_OPENID20_AUTHENTICATE_IN_BROWSER}, and
@code{GSASL_VALIDATE_OPENID20}.
In the client, the mechanism is enabled by default. The
@code{GSASL_AUTHID} property is required and should contain the
User-Supplied OpenID Identifier (for example
address@hidden://josefsson.org}). If set, @code{GSASL_AUTHZID} will be
-used by the client. The client will be invoked with the
address@hidden://josefsson.org}). If set, @code{GSASL_AUTHZID} will be used
+by the client. The client will be invoked with the
@code{GSASL_OPENID20_AUTHENTICATE_IN_BROWSER} callback to perform the
OpenID authentication in a web browser. The callback can retrieve the
@code{GSASL_OPENID20_REDIRECT_URL} property to find out the URL to
-redirect the user to. After authentication, the client can retrieve
-the @code{GSASL_OPENID20_OUTCOME_DATA} property with the OpenID Simple
-Registry (SREG) attributes sent by the server (they are not always
-sent).
+redirect the user to. After authentication, the client can retrieve the
address@hidden property with the OpenID Simple
+Registry (SREG) attributes sent by the server (if any).
In the server, the mechanism is enabled by default. The server will
request the @code{GSASL_OPENID20_REDIRECT_URL} property, and your
@@ -2114,15 +2157,18 @@ these to the client.
Note that OpenID itself is not implemented by the GNU SASL library. On
the client side, no OpenID knowledge is required, it is only required on
-the server side. The client only needs to be able to start a browser
-accessing the redirect URL. The server side is expected to use an
-OpenID library of your choice to generate the redirect URL and to
-implement the Service Provider to validate the response from the IdP.
-There is a complete proof-of-concept example with a SMTP server with
-OpenID 2.0 support distributed with GNU SASL in the examples/openid20/
-sub-directory. It uses the JanRain PHP5 OpenID implementation. The
-example may be used as inspiration for your own server implementation.
-The @code{gsasl} command line client supports OPENID20 as a client.
+the server side. The client only needs to be able to start a web
+browser to access the redirect URL. The server side is expected to use
+an OpenID library to generate the redirect URL and to implement the
+Service Provider (SP) to validate the response from the IdP. There is a
+complete proof-of-concept example with a SMTP server with OpenID 2.0
+support distributed with GNU SASL in the @code{examples/openid20/}
+sub-directory. It uses the JanRain PHP5 OpenID implementation and
+require a web server to implement the OpenID SP. The example may be
+used as inspiration for your own server implementation. The
address@hidden command line client supports OPENID20 as a client.
+
+The OPENID20 mechanism is specified in RFC 6616.
@node KERBEROS_V5
@section The KERBEROS_V5 mechanism
diff --git a/gl/Makefile.am b/gl/Makefile.am
index b00643e..14e88c2 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -409,7 +409,7 @@ libgl_la_SOURCES += gettext.h
distclean-local: clean-GNUmakefile
clean-GNUmakefile:
- test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || :
+ test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile
EXTRA_DIST += $(top_srcdir)/GNUmakefile
diff --git a/gl/alloca.in.h b/gl/alloca.in.h
index e94eb68..d20f4b8 100644
--- a/gl/alloca.in.h
+++ b/gl/alloca.in.h
@@ -44,6 +44,13 @@
# define alloca _alloca
# elif defined __DECC && defined __VMS
# define alloca __ALLOCA
+# elif defined __TANDEM && defined _TNS_E_TARGET
+# ifdef __cplusplus
+extern "C"
+# endif
+void *_alloca (unsigned short);
+# pragma intrinsic (_alloca)
+# define alloca _alloca
# else
# include <stddef.h>
# ifdef __cplusplus
diff --git a/gl/config.charset b/gl/config.charset
index 89b3017..0a3b343 100644
--- a/gl/config.charset
+++ b/gl/config.charset
@@ -29,7 +29,7 @@
# The current list of GNU canonical charset names is as follows.
#
# name MIME? used by which systems
-# (darwin = MacOS X, woe32 = native Windows)
+# (darwin = Mac OS X, woe32 = native
Windows)
#
# ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin
# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd
openbsd darwin cygwin
diff --git a/gl/errno.in.h b/gl/errno.in.h
index 2f42612..5e5af92 100644
--- a/gl/errno.in.h
+++ b/gl/errno.in.h
@@ -84,6 +84,16 @@
# define GNULIB_defined_ECANCELED 1
# endif
+# ifndef EOWNERDEAD
+# define EOWNERDEAD 133
+# define GNULIB_defined_EOWNERDEAD 1
+# endif
+
+# ifndef ENOTRECOVERABLE
+# define ENOTRECOVERABLE 127
+# define GNULIB_defined_ENOTRECOVERABLE 1
+# endif
+
# ifndef EINPROGRESS
# define EINPROGRESS 112
# define EALREADY 103
@@ -108,15 +118,17 @@
# define ELOOP 114
# define EHOSTUNREACH 110
# define EWOULDBLOCK 140
+# define GNULIB_defined_ESOCK 1
+# endif
+
+# ifndef ETXTBSY
# define ETXTBSY 139
# define ENODATA 120 /* not required by POSIX */
# define ENOSR 124 /* not required by POSIX */
# define ENOSTR 125 /* not required by POSIX */
-# define ENOTRECOVERABLE 127 /* not required by POSIX */
-# define EOWNERDEAD 133 /* not required by POSIX */
# define ETIME 137 /* not required by POSIX */
# define EOTHER 131 /* not required by POSIX */
-# define GNULIB_defined_ESOCK 1
+# define GNULIB_defined_ESTREAMS 1
# endif
/* These are intentionally the same values as the WSA* error numbers, defined
@@ -227,6 +239,36 @@
# define GNULIB_defined_ECANCELED 1
# endif
+/* On many platforms, the macros EOWNERDEAD and ENOTRECOVERABLE are not
+ defined. */
+
+# ifndef EOWNERDEAD
+# if defined __sun
+ /* Use the same values as defined for Solaris >= 8, for
+ interoperability. */
+# define EOWNERDEAD 58
+# define ENOTRECOVERABLE 59
+# elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+ /* We have a conflict here: pthreads-win32 defines these values
+ differently than MSVC 10. It's hairy to decide which one to use. */
+# if defined __MINGW32__ && !defined USE_WINDOWS_THREADS
+ /* Use the same values as defined by pthreads-win32, for
+ interoperability. */
+# define EOWNERDEAD 43
+# define ENOTRECOVERABLE 44
+# else
+ /* Use the same values as defined by MSVC 10, for
+ interoperability. */
+# define EOWNERDEAD 133
+# define ENOTRECOVERABLE 127
+# endif
+# else
+# define EOWNERDEAD 2013
+# define ENOTRECOVERABLE 2014
+# endif
+# define GNULIB_defined_EOWNERDEAD 1
+# define GNULIB_defined_ENOTRECOVERABLE 1
+# endif
#endif /* address@hidden@_ERRNO_H */
#endif /* address@hidden@_ERRNO_H */
diff --git a/gl/fseeko.c b/gl/fseeko.c
index c372a5c..7364f7f 100644
--- a/gl/fseeko.c
+++ b/gl/fseeko.c
@@ -51,7 +51,7 @@ fseeko (FILE *fp, off_t offset, int whence)
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
# if defined __SL64 && defined __SCLE /* Cygwin */
if ((fp->_flags & __SL64) == 0)
{
@@ -109,7 +109,7 @@ fseeko (FILE *fp, off_t offset, int whence)
off_t pos = lseek (fileno (fp), offset, whence);
if (pos == -1)
{
-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
fp_->_flags &= ~__SOFF;
#endif
return -1;
@@ -118,7 +118,7 @@ fseeko (FILE *fp, off_t offset, int whence)
#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
# if defined __CYGWIN__
/* fp_->_offset is typed as an integer. */
fp_->_offset = pos;
diff --git a/gl/fstat.c b/gl/fstat.c
index ac2b1ef..6d5f5c2 100644
--- a/gl/fstat.c
+++ b/gl/fstat.c
@@ -24,7 +24,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#if _GL_WINDOWS_64_BIT_ST_SIZE
+# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
# define stat _stati64
+# undef fstat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
# define fstat _fstati64
#endif
#undef __need_system_sys_stat_h
diff --git a/gl/getpass.h b/gl/getpass.h
index 4eabf9d..afe6d2d 100644
--- a/gl/getpass.h
+++ b/gl/getpass.h
@@ -21,7 +21,7 @@
/* Get getpass declaration, if available. */
# include <unistd.h>
-# if defined HAVE_DECL_GETPASS && !HAVE_DECL_GETPASS
+# if !HAVE_DECL_GETPASS
/* Read a password of arbitrary length from /dev/tty or stdin. */
char *getpass (const char *prompt);
diff --git a/gl/gettext.h b/gl/gettext.h
index 9a573aa..3108e4a 100644
--- a/gl/gettext.h
+++ b/gl/gettext.h
@@ -107,80 +107,4 @@
initializer for static 'char[]' or 'const char[]' variables. */
#define gettext_noop(String) String
-/* The separator between msgctxt and msgid in a .mo file. */
-#define GETTEXT_CONTEXT_GLUE "\004"
-
-/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
- MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
- short and rarely need to change.
- The letter 'p' stands for 'particular' or 'special'. */
-#ifdef DEFAULT_TEXT_DOMAIN
-# define pgettext(Msgctxt, Msgid) \
- pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, LC_MESSAGES)
-#else
-# define pgettext(Msgctxt, Msgid) \
- pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#endif
-#define dpgettext(Domainname, Msgctxt, Msgid) \
- pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
LC_MESSAGES)
-#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
- pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
Category)
-#ifdef DEFAULT_TEXT_DOMAIN
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, MsgidPlural, N, LC_MESSAGES)
-#else
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
-#endif
-#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
-#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
- npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, Category)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-pgettext_aux (const char *domain,
- const char *msg_ctxt_id, const char *msgid,
- int category)
-{
- const char *translation = dcgettext (domain, msg_ctxt_id, category);
- if (translation == msg_ctxt_id)
- return msgid;
- else
- return translation;
-}
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-npgettext_aux (const char *domain,
- const char *msg_ctxt_id, const char *msgid,
- const char *msgid_plural, unsigned long int n,
- int category)
-{
- const char *translation =
- dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
- if (translation == msg_ctxt_id || translation == msgid_plural)
- return (n == 1 ? msgid : msgid_plural);
- else
- return translation;
-}
-
-/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID
- can be arbitrary expressions. But for string literals these macros are
- less efficient than those above. */
-
-#include <string.h>
-
#endif /* _LIBGETTEXT_H */
diff --git a/gl/localcharset.c b/gl/localcharset.c
index 113205d..b5ee2d6 100644
--- a/gl/localcharset.c
+++ b/gl/localcharset.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
-# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
+# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
#endif
#if defined _WIN32 || defined __WIN32__
diff --git a/gl/m4/errno_h.m4 b/gl/m4/errno_h.m4
index 4f0bb83..1e76ba2 100644
--- a/gl/m4/errno_h.m4
+++ b/gl/m4/errno_h.m4
@@ -1,4 +1,4 @@
-# errno_h.m4 serial 10
+# errno_h.m4 serial 11
dnl Copyright (C) 2004, 2006, 2008-2012 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,9 @@ AC_DEFUN_ONCE([gl_HEADER_ERRNO_H],
AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
AC_EGREP_CPP([booboo],[
#include <errno.h>
+#if !defined ETXTBSY
+booboo
+#endif
#if !defined ENOMSG
booboo
#endif
@@ -49,6 +52,12 @@ booboo
#if !defined ECANCELED
booboo
#endif
+#if !defined EOWNERDEAD
+booboo
+#endif
+#if !defined ENOTRECOVERABLE
+booboo
+#endif
],
[gl_cv_header_errno_h_complete=no],
[gl_cv_header_errno_h_complete=yes])
diff --git a/gl/m4/extensions.m4 b/gl/m4/extensions.m4
index 0bfaef6..6d17d8a 100644
--- a/gl/m4/extensions.m4
+++ b/gl/m4/extensions.m4
@@ -1,4 +1,4 @@
-# serial 11 -*- Autoconf -*-
+# serial 12 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -67,7 +67,7 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-/* Enable general extensions on MacOS X. */
+/* Enable general extensions on Mac OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
diff --git a/gl/m4/fdopen.m4 b/gl/m4/fdopen.m4
index 9ca9d2a..14f1554 100644
--- a/gl/m4/fdopen.m4
+++ b/gl/m4/fdopen.m4
@@ -1,4 +1,4 @@
-# fdopen.m4 serial 2
+# fdopen.m4 serial 3
dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -25,10 +25,8 @@ main (void)
FILE *fp;
errno = 0;
fp = fdopen (-1, "r");
- if (fp != NULL)
+ if (fp == NULL && errno == 0)
return 1;
- if (errno == 0)
- return 2;
return 0;
}]])],
[gl_cv_func_fdopen_works=yes],
diff --git a/gl/m4/getopt.m4 b/gl/m4/getopt.m4
index 2aea895..f6902b5 100644
--- a/gl/m4/getopt.m4
+++ b/gl/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 39
+# getopt.m4 serial 44
dnl Copyright (C) 2002-2006, 2008-2012 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,18 +9,17 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX],
[
m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX])
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+ AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
dnl Other modules can request the gnulib implementation of the getopt
dnl functions unconditionally, by defining gl_REPLACE_GETOPT_ALWAYS.
dnl argp.m4 does this.
m4_ifdef([gl_REPLACE_GETOPT_ALWAYS], [
- gl_GETOPT_IFELSE([], [])
REPLACE_GETOPT=1
], [
REPLACE_GETOPT=0
- gl_GETOPT_IFELSE([
+ if test -n "$gl_replace_getopt"; then
REPLACE_GETOPT=1
- ],
- [])
+ fi
])
if test $REPLACE_GETOPT = 1; then
dnl Arrange for getopt.h to be created.
@@ -38,13 +37,6 @@ AC_DEFUN([gl_FUNC_GETOPT_GNU],
AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
])
-# emacs' configure.in uses this.
-AC_DEFUN([gl_GETOPT_IFELSE],
-[
- AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
- AS_IF([test -n "$gl_replace_getopt"], [$1], [$2])
-])
-
# Determine whether to replace the entire getopt facility.
AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
[
@@ -74,11 +66,6 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes])
fi
- dnl mingw's getopt (in libmingwex.a) does weird things when the options
- dnl strings starts with '+' and it's not the first call. Some internal state
- dnl is left over from earlier calls, and neither setting optind = 0 nor
- dnl setting optreset = 1 get rid of this internal state.
- dnl POSIX is silent on optind vs. optreset, so we allow either behavior.
dnl POSIX 2008 does not specify leading '+' behavior, but see
dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on
dnl the next version of POSIX. For now, we only guarantee leading '+'
@@ -87,30 +74,16 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
AC_CACHE_CHECK([whether getopt is POSIX compatible],
[gl_cv_func_getopt_posix],
[
- dnl BSD getopt_long uses an incompatible method to reset option
- dnl processing. Existence of the optreset variable, in and of
- dnl itself, is not a reason to replace getopt, but knowledge
- dnl of the variable is needed to determine how to reset and
- dnl whether a reset reparses the environment. Solaris
- dnl supports neither optreset nor optind=0, but keeps no state
- dnl that needs a reset beyond setting optind=1; detect Solaris
- dnl by getopt_clip.
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <unistd.h>]],
- [[int *p = &optreset; return optreset;]])],
- [gl_optind_min=1],
- [AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <getopt.h>]],
- [[return !getopt_clip;]])],
- [gl_optind_min=1],
- [gl_optind_min=0])])
-
- dnl This test fails on mingw and succeeds on many other platforms.
- gl_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min"
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ dnl Merging these three different test programs into a single one
+ dnl would require a reset mechanism. On BSD systems, it can be done
+ dnl through 'optreset'; on some others (glibc), it can be done by
+ dnl setting 'optind' to 0; on others again (HP-UX, IRIX, OSF/1,
+ dnl Solaris 9, musl libc), there is no such mechanism.
+ if test $cross_compiling = no; then
+ dnl Sanity check. Succeeds everywhere (except on MSVC,
+ dnl which lacks <unistd.h> and getopt() entirely).
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
@@ -118,89 +91,107 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
int
main ()
{
- {
- static char program[] = "program";
- static char a[] = "-a";
- static char foo[] = "foo";
- static char bar[] = "bar";
- char *argv[] = { program, a, foo, bar, NULL };
- int c;
+ static char program[] = "program";
+ static char a[] = "-a";
+ static char foo[] = "foo";
+ static char bar[] = "bar";
+ char *argv[] = { program, a, foo, bar, NULL };
+ int c;
- optind = OPTIND_MIN;
- opterr = 0;
-
- c = getopt (4, argv, "ab");
- if (!(c == 'a'))
- return 1;
- c = getopt (4, argv, "ab");
- if (!(c == -1))
- return 2;
- if (!(optind == 2))
- return 3;
- }
- /* Some internal state exists at this point. */
- {
- static char program[] = "program";
- static char donald[] = "donald";
- static char p[] = "-p";
- static char billy[] = "billy";
- static char duck[] = "duck";
- static char a[] = "-a";
- static char bar[] = "bar";
- char *argv[] = { program, donald, p, billy, duck, a, bar, NULL };
- int c;
+ c = getopt (4, argv, "ab");
+ if (!(c == 'a'))
+ return 1;
+ c = getopt (4, argv, "ab");
+ if (!(c == -1))
+ return 2;
+ if (!(optind == 2))
+ return 3;
+ return 0;
+}
+]])],
+ [gl_cv_func_getopt_posix=maybe],
+ [gl_cv_func_getopt_posix=no])
+ if test $gl_cv_func_getopt_posix = maybe; then
+ dnl Sanity check with '+'. Succeeds everywhere (except on MSVC,
+ dnl which lacks <unistd.h> and getopt() entirely).
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
- optind = OPTIND_MIN;
- opterr = 0;
+int
+main ()
+{
+ static char program[] = "program";
+ static char donald[] = "donald";
+ static char p[] = "-p";
+ static char billy[] = "billy";
+ static char duck[] = "duck";
+ static char a[] = "-a";
+ static char bar[] = "bar";
+ char *argv[] = { program, donald, p, billy, duck, a, bar, NULL };
+ int c;
- c = getopt (7, argv, "+abp:q:");
- if (!(c == -1))
- return 4;
- if (!(strcmp (argv[0], "program") == 0))
- return 5;
- if (!(strcmp (argv[1], "donald") == 0))
- return 6;
- if (!(strcmp (argv[2], "-p") == 0))
- return 7;
- if (!(strcmp (argv[3], "billy") == 0))
- return 8;
- if (!(strcmp (argv[4], "duck") == 0))
- return 9;
- if (!(strcmp (argv[5], "-a") == 0))
- return 10;
- if (!(strcmp (argv[6], "bar") == 0))
- return 11;
- if (!(optind == 1))
- return 12;
- }
- /* Detect MacOS 10.5, AIX 7.1 bug. */
- {
- static char program[] = "program";
- static char ab[] = "-ab";
- char *argv[3] = { program, ab, NULL };
- optind = OPTIND_MIN;
- opterr = 0;
- if (getopt (2, argv, "ab:") != 'a')
- return 13;
- if (getopt (2, argv, "ab:") != '?')
- return 14;
- if (optopt != 'b')
- return 15;
- if (optind != 2)
- return 16;
- }
+ c = getopt (7, argv, "+abp:q:");
+ if (!(c == -1))
+ return 4;
+ if (!(strcmp (argv[0], "program") == 0))
+ return 5;
+ if (!(strcmp (argv[1], "donald") == 0))
+ return 6;
+ if (!(strcmp (argv[2], "-p") == 0))
+ return 7;
+ if (!(strcmp (argv[3], "billy") == 0))
+ return 8;
+ if (!(strcmp (argv[4], "duck") == 0))
+ return 9;
+ if (!(strcmp (argv[5], "-a") == 0))
+ return 10;
+ if (!(strcmp (argv[6], "bar") == 0))
+ return 11;
+ if (!(optind == 1))
+ return 12;
+ return 0;
+}
+]])],
+ [gl_cv_func_getopt_posix=maybe],
+ [gl_cv_func_getopt_posix=no])
+ fi
+ if test $gl_cv_func_getopt_posix = maybe; then
+ dnl Detect Mac OS X 10.5, AIX 7.1, mingw bug.
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+int
+main ()
+{
+ static char program[] = "program";
+ static char ab[] = "-ab";
+ char *argv[3] = { program, ab, NULL };
+ if (getopt (2, argv, "ab:") != 'a')
+ return 13;
+ if (getopt (2, argv, "ab:") != '?')
+ return 14;
+ if (optopt != 'b')
+ return 15;
+ if (optind != 2)
+ return 16;
return 0;
}
]])],
- [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no],
- [case "$host_os" in
- mingw*) gl_cv_func_getopt_posix="guessing no";;
- darwin* | aix*) gl_cv_func_getopt_posix="guessing no";;
- *) gl_cv_func_getopt_posix="guessing yes";;
- esac
- ])
- CPPFLAGS=$gl_save_CPPFLAGS
+ [gl_cv_func_getopt_posix=yes],
+ [gl_cv_func_getopt_posix=no])
+ fi
+ else
+ case "$host_os" in
+ darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
+ *) gl_cv_func_getopt_posix="guessing yes";;
+ esac
+ fi
])
case "$gl_cv_func_getopt_posix" in
*no) gl_replace_getopt=yes ;;
@@ -236,7 +227,7 @@ dnl is ambiguous with environment values that contain
newlines.
nocrash_init();
/* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
- and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
+ and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
OSF/1 5.1, Solaris 10. */
{
static char conftest[] = "conftest";
@@ -247,7 +238,7 @@ dnl is ambiguous with environment values that contain
newlines.
result |= 1;
}
/* This code succeeds on glibc 2.8, mingw,
- and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
+ and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */
{
static char program[] = "program";
@@ -276,7 +267,7 @@ dnl is ambiguous with environment values that contain
newlines.
if (getopt (3, argv, "-p") != 1)
result |= 16;
else if (getopt (3, argv, "-p") != 'p')
- result |= 32;
+ result |= 16;
}
/* This code fails on glibc 2.11. */
{
@@ -286,9 +277,9 @@ dnl is ambiguous with environment values that contain
newlines.
char *argv[] = { program, b, a, NULL };
optind = opterr = 0;
if (getopt (3, argv, "+:a:b") != 'b')
- result |= 64;
+ result |= 32;
else if (getopt (3, argv, "+:a:b") != ':')
- result |= 64;
+ result |= 32;
}
/* This code dumps core on glibc 2.14. */
{
@@ -298,18 +289,14 @@ dnl is ambiguous with environment values that contain
newlines.
char *argv[] = { program, w, dummy, NULL };
optind = opterr = 1;
if (getopt (3, argv, "W;") != 'W')
- result |= 128;
+ result |= 64;
}
return result;
]])],
[gl_cv_func_getopt_gnu=yes],
[gl_cv_func_getopt_gnu=no],
- [dnl Cross compiling. Guess based on host and declarations.
- case $host_os:$ac_cv_have_decl_optreset in
- *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;;
- *:yes) gl_cv_func_getopt_gnu=no;;
- *) gl_cv_func_getopt_gnu=yes;;
- esac
+ [dnl Cross compiling. Assume the worst, even on glibc platforms.
+ gl_cv_func_getopt_gnu="guessing no"
])
case $gl_had_POSIXLY_CORRECT in
exported) ;;
@@ -317,13 +304,54 @@ dnl is ambiguous with environment values that contain
newlines.
*) AS_UNSET([POSIXLY_CORRECT]) ;;
esac
])
- if test "$gl_cv_func_getopt_gnu" = "no"; then
+ if test "$gl_cv_func_getopt_gnu" != yes; then
gl_replace_getopt=yes
+ else
+ AC_CACHE_CHECK([for working GNU getopt_long function],
+ [gl_cv_func_getopt_long_gnu],
+ [AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <getopt.h>
+ #include <stddef.h>
+ #include <string.h>
+ ]],
+ [[static const struct option long_options[] =
+ {
+ { "xtremely-",no_argument, NULL, 1003 },
+ { "xtra", no_argument, NULL, 1001 },
+ { "xtreme", no_argument, NULL, 1002 },
+ { "xtremely", no_argument, NULL, 1003 },
+ { NULL, 0, NULL, 0 }
+ };
+ /* This code fails on OpenBSD 5.0. */
+ {
+ static char program[] = "program";
+ static char xtremel[] = "--xtremel";
+ char *argv[] = { program, xtremel, NULL };
+ int option_index;
+ optind = 1; opterr = 0;
+ if (getopt_long (2, argv, "", long_options, &option_index)
!= 1003)
+ return 1;
+ }
+ return 0;
+ ]])],
+ [gl_cv_func_getopt_long_gnu=yes],
+ [gl_cv_func_getopt_long_gnu=no],
+ [dnl Cross compiling. Guess no on OpenBSD, yes otherwise.
+ case "$host_os" in
+ openbsd*) gl_cv_func_getopt_long_gnu="guessing no";;
+ *) gl_cv_func_getopt_long_gnu="guessing yes";;
+ esac
+ ])
+ ])
+ case "$gl_cv_func_getopt_long_gnu" in
+ *yes) ;;
+ *) gl_replace_getopt=yes ;;
+ esac
fi
fi
])
-# emacs' configure.in uses this.
AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
[
GETOPT_H=getopt.h
@@ -334,7 +362,6 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
])
# Prerequisites of lib/getopt*.
-# emacs' configure.in uses this.
AC_DEFUN([gl_PREREQ_GETOPT],
[
AC_CHECK_DECLS_ONCE([getenv])
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 836d837..2205883 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -77,5 +77,5 @@ gl_MAKEFILE_NAME([])
gl_LIBTOOL
gl_MACRO_PREFIX([gl])
gl_PO_DOMAIN([])
-gl_WITNESS_C_DOMAIN([])
+gl_WITNESS_C_MACRO([])
gl_VC_FILES([false])
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index d62b767..15d2b2b 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 32
+# gnulib-common.m4 serial 33
dnl Copyright (C) 2007-2012 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,7 @@ AC_DEFUN([gl_COMMON_BODY], [
[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
- __APPLE__ && __MACH__ test for MacOS X.
+ __APPLE__ && __MACH__ test for Mac OS X.
__APPLE_CC__ tests for the Apple compiler and its version.
__STDC_VERSION__ tests for the C99 mode. */
#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined
__cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index fdb8645..137a212 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -317,293 +317,293 @@ changequote(,)dnl
LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
changequote([, ])dnl
AC_SUBST([LTALLOCA])
-gl_FUNC_ALLOCA
-gl_HEADER_ARPA_INET
-AC_PROG_MKDIR_P
-gl_FUNC_CLOSE
-if test $REPLACE_CLOSE = 1; then
- AC_LIBOBJ([close])
-fi
-gl_UNISTD_MODULE_INDICATOR([close])
-gl_CONFIGMAKE_PREP
-AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-if test "$ac_cv_header_winsock2_h" = yes; then
- AC_LIBOBJ([connect])
-fi
-gl_SYS_SOCKET_MODULE_INDICATOR([connect])
-gl_HEADER_ERRNO_H
-gl_ERROR
-if test $ac_cv_lib_error_at_line = no; then
- AC_LIBOBJ([error])
- gl_PREREQ_ERROR
-fi
-m4_ifdef([AM_XGETTEXT_OPTION],
- [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
- AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
-gl_FLOAT_H
-if test $REPLACE_FLOAT_LDBL = 1; then
- AC_LIBOBJ([float])
-fi
-if test $REPLACE_ITOLD = 1; then
- AC_LIBOBJ([itold])
-fi
-gl_FUNC_FSEEK
-if test $REPLACE_FSEEK = 1; then
- AC_LIBOBJ([fseek])
-fi
-gl_STDIO_MODULE_INDICATOR([fseek])
-gl_FUNC_FSEEKO
-if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
- AC_LIBOBJ([fseeko])
- gl_PREREQ_FSEEKO
-fi
-gl_STDIO_MODULE_INDICATOR([fseeko])
-gl_FUNC_FSTAT
-if test $REPLACE_FSTAT = 1; then
- AC_LIBOBJ([fstat])
- gl_PREREQ_FSTAT
-fi
-gl_SYS_STAT_MODULE_INDICATOR([fstat])
-gl_GETADDRINFO
-if test $HAVE_GETADDRINFO = 0; then
- AC_LIBOBJ([getaddrinfo])
-fi
-if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then
- AC_LIBOBJ([gai_strerror])
-fi
-gl_NETDB_MODULE_INDICATOR([getaddrinfo])
-gl_FUNC_GETDELIM
-if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
- AC_LIBOBJ([getdelim])
- gl_PREREQ_GETDELIM
-fi
-gl_STDIO_MODULE_INDICATOR([getdelim])
-gl_FUNC_GETLINE
-if test $REPLACE_GETLINE = 1; then
- AC_LIBOBJ([getline])
- gl_PREREQ_GETLINE
-fi
-gl_STDIO_MODULE_INDICATOR([getline])
-gl_FUNC_GETOPT_GNU
-if test $REPLACE_GETOPT = 1; then
- AC_LIBOBJ([getopt])
- AC_LIBOBJ([getopt1])
- gl_PREREQ_GETOPT
- dnl Arrange for unistd.h to include getopt.h.
- GNULIB_GL_UNISTD_H_GETOPT=1
-fi
-AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
-gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
-gl_FUNC_GETOPT_POSIX
-if test $REPLACE_GETOPT = 1; then
- AC_LIBOBJ([getopt])
- AC_LIBOBJ([getopt1])
- gl_PREREQ_GETOPT
- dnl Arrange for unistd.h to include getopt.h.
- GNULIB_GL_UNISTD_H_GETOPT=1
-fi
-AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
-gl_FUNC_GETPASS_GNU
-if test $REPLACE_GETPASS = 1; then
- AC_LIBOBJ([getpass])
- gl_PREREQ_GETPASS
-fi
-AC_SUBST([LIBINTL])
-AC_SUBST([LTLIBINTL])
-# Autoconf 2.61a.99 and earlier don't support linking a file only
-# in VPATH builds. But since GNUmakefile is for maintainer use
-# only, it does not matter if we skip the link with older autoconf.
-# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
-# builds, so use a shell variable to bypass this.
-GNUmakefile=GNUmakefile
-m4_if(m4_version_compare([2.61a.100],
- m4_defn([m4_PACKAGE_VERSION])), [1], [],
- [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
- [GNUmakefile=$GNUmakefile])])
-gl_HOSTENT
-AM_ICONV
-m4_ifdef([gl_ICONV_MODULE_INDICATOR],
- [gl_ICONV_MODULE_INDICATOR([iconv])])
-gl_ICONV_H
-gl_FUNC_ICONV_OPEN
-if test $REPLACE_ICONV_OPEN = 1; then
- AC_LIBOBJ([iconv_open])
-fi
-if test $REPLACE_ICONV = 1; then
- AC_LIBOBJ([iconv])
- AC_LIBOBJ([iconv_close])
-fi
-gl_FUNC_INET_NTOP
-if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then
- AC_LIBOBJ([inet_ntop])
- gl_PREREQ_INET_NTOP
-fi
-gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
-gl_INLINE
-AC_REQUIRE([gl_LARGEFILE])
-gl_LOCALCHARSET
-LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
-AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
-gl_FUNC_LSEEK
-if test $REPLACE_LSEEK = 1; then
- AC_LIBOBJ([lseek])
-fi
-gl_UNISTD_MODULE_INDICATOR([lseek])
-AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
- [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
-gl_FUNC_MBRTOWC
-if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
- AC_LIBOBJ([mbrtowc])
- gl_PREREQ_MBRTOWC
-fi
-gl_WCHAR_MODULE_INDICATOR([mbrtowc])
-gl_FUNC_MBSINIT
-if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
- AC_LIBOBJ([mbsinit])
- gl_PREREQ_MBSINIT
-fi
-gl_WCHAR_MODULE_INDICATOR([mbsinit])
-gl_FUNC_MEMCHR
-if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
- AC_LIBOBJ([memchr])
- gl_PREREQ_MEMCHR
-fi
-gl_STRING_MODULE_INDICATOR([memchr])
-gl_MSVC_INVAL
-if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
- AC_LIBOBJ([msvc-inval])
-fi
-gl_MSVC_NOTHROW
-if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
- AC_LIBOBJ([msvc-nothrow])
-fi
-gl_MULTIARCH
-gl_HEADER_NETDB
-gl_HEADER_NETINET_IN
-AC_PROG_MKDIR_P
-AC_PATH_PROG([PMCCABE], [pmccabe], [false])
-gl_FUNC_POLL
-if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
- AC_LIBOBJ([poll])
- gl_PREREQ_POLL
-fi
-gl_POLL_MODULE_INDICATOR([poll])
-gl_POLL_H
-AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
-AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
-gl_QUOTE
-gl_QUOTEARG
-gl_FUNC_READLINE
-if test "$gl_cv_lib_readline" = no; then
- AC_LIBOBJ([readline])
- gl_PREREQ_READLINE
-fi
-gl_FUNC_REALLOC_POSIX
-if test $REPLACE_REALLOC = 1; then
- AC_LIBOBJ([realloc])
-fi
-gl_STDLIB_MODULE_INDICATOR([realloc-posix])
-AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-if test "$ac_cv_header_winsock2_h" = yes; then
- AC_LIBOBJ([recv])
-fi
-gl_SYS_SOCKET_MODULE_INDICATOR([recv])
-gl_FUNC_SELECT
-if test $REPLACE_SELECT = 1; then
- AC_LIBOBJ([select])
-fi
-gl_SYS_SELECT_MODULE_INDICATOR([select])
-gl_SERVENT
-AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-if test "$ac_cv_header_winsock2_h" = yes; then
- AC_LIBOBJ([shutdown])
-fi
-gl_SYS_SOCKET_MODULE_INDICATOR([shutdown])
-gl_SIGNAL_H
-gl_SIZE_MAX
-gl_FUNC_SNPRINTF
-gl_STDIO_MODULE_INDICATOR([snprintf])
-gl_MODULE_INDICATOR([snprintf])
-AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-if test "$ac_cv_header_winsock2_h" = yes; then
- AC_LIBOBJ([socket])
-fi
-# When this module is used, sockets may actually occur as file descriptors,
-# hence it is worth warning if the modules 'close' and 'ioctl' are not used.
-m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
-m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
-AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2])
-if test "$ac_cv_header_winsock2_h" = yes; then
- UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
- SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
-fi
-gl_SYS_SOCKET_MODULE_INDICATOR([socket])
-gl_SOCKETLIB
-gl_SOCKETS
-gl_TYPE_SOCKLEN_T
-gt_TYPE_SSIZE_T
-gl_STDALIGN_H
-gl_STDARG_H
-AM_STDBOOL_H
-gl_STDDEF_H
-gl_STDINT_H
-gl_STDIO_H
-gl_STDLIB_H
-gl_FUNC_STRERROR
-if test $REPLACE_STRERROR = 1; then
- AC_LIBOBJ([strerror])
-fi
-gl_MODULE_INDICATOR([strerror])
-gl_STRING_MODULE_INDICATOR([strerror])
-AC_REQUIRE([gl_HEADER_ERRNO_H])
-AC_REQUIRE([gl_FUNC_STRERROR_0])
-if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
- AC_LIBOBJ([strerror-override])
- gl_PREREQ_SYS_H_WINSOCK2
-fi
-if test $gl_cond_libtool = false; then
- gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
- gl_libdeps="$gl_libdeps $LIBICONV"
-fi
-gl_HEADER_STRING_H
-gl_FUNC_STRTOK_R
-if test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1; then
- AC_LIBOBJ([strtok_r])
- gl_PREREQ_STRTOK_R
-fi
-gl_STRING_MODULE_INDICATOR([strtok_r])
-gl_HEADER_SYS_SELECT
-AC_PROG_MKDIR_P
-gl_HEADER_SYS_SOCKET
-AC_PROG_MKDIR_P
-gl_HEADER_SYS_STAT_H
-AC_PROG_MKDIR_P
-gl_HEADER_SYS_TIME_H
-AC_PROG_MKDIR_P
-gl_SYS_TYPES_H
-AC_PROG_MKDIR_P
-gl_HEADER_SYS_UIO
-AC_PROG_MKDIR_P
-gl_HEADER_TIME_H
-gl_UNISTD_H
-gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h])
-gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
-gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
-gl_MODULE_INDICATOR([unistr/u8-uctomb])
-gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
-gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
-gl_VALGRIND_TESTS
-gl_FUNC_VASNPRINTF
-gl_FUNC_VASPRINTF
-gl_STDIO_MODULE_INDICATOR([vasprintf])
-m4_ifdef([AM_XGETTEXT_OPTION],
- [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
- AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
-gl_VERSION_ETC
-gl_WCHAR_H
-gl_WCTYPE_H
-gl_XALLOC
-gl_XSIZE
+ gl_FUNC_ALLOCA
+ gl_HEADER_ARPA_INET
+ AC_PROG_MKDIR_P
+ gl_FUNC_CLOSE
+ if test $REPLACE_CLOSE = 1; then
+ AC_LIBOBJ([close])
+ fi
+ gl_UNISTD_MODULE_INDICATOR([close])
+ gl_CONFIGMAKE_PREP
+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
+ if test "$ac_cv_header_winsock2_h" = yes; then
+ AC_LIBOBJ([connect])
+ fi
+ gl_SYS_SOCKET_MODULE_INDICATOR([connect])
+ gl_HEADER_ERRNO_H
+ gl_ERROR
+ if test $ac_cv_lib_error_at_line = no; then
+ AC_LIBOBJ([error])
+ gl_PREREQ_ERROR
+ fi
+ m4_ifdef([AM_XGETTEXT_OPTION],
+ [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
+ AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+ gl_FLOAT_H
+ if test $REPLACE_FLOAT_LDBL = 1; then
+ AC_LIBOBJ([float])
+ fi
+ if test $REPLACE_ITOLD = 1; then
+ AC_LIBOBJ([itold])
+ fi
+ gl_FUNC_FSEEK
+ if test $REPLACE_FSEEK = 1; then
+ AC_LIBOBJ([fseek])
+ fi
+ gl_STDIO_MODULE_INDICATOR([fseek])
+ gl_FUNC_FSEEKO
+ if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
+ AC_LIBOBJ([fseeko])
+ gl_PREREQ_FSEEKO
+ fi
+ gl_STDIO_MODULE_INDICATOR([fseeko])
+ gl_FUNC_FSTAT
+ if test $REPLACE_FSTAT = 1; then
+ AC_LIBOBJ([fstat])
+ gl_PREREQ_FSTAT
+ fi
+ gl_SYS_STAT_MODULE_INDICATOR([fstat])
+ gl_GETADDRINFO
+ if test $HAVE_GETADDRINFO = 0; then
+ AC_LIBOBJ([getaddrinfo])
+ fi
+ if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then
+ AC_LIBOBJ([gai_strerror])
+ fi
+ gl_NETDB_MODULE_INDICATOR([getaddrinfo])
+ gl_FUNC_GETDELIM
+ if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
+ AC_LIBOBJ([getdelim])
+ gl_PREREQ_GETDELIM
+ fi
+ gl_STDIO_MODULE_INDICATOR([getdelim])
+ gl_FUNC_GETLINE
+ if test $REPLACE_GETLINE = 1; then
+ AC_LIBOBJ([getline])
+ gl_PREREQ_GETLINE
+ fi
+ gl_STDIO_MODULE_INDICATOR([getline])
+ gl_FUNC_GETOPT_GNU
+ if test $REPLACE_GETOPT = 1; then
+ AC_LIBOBJ([getopt])
+ AC_LIBOBJ([getopt1])
+ gl_PREREQ_GETOPT
+ dnl Arrange for unistd.h to include getopt.h.
+ GNULIB_GL_UNISTD_H_GETOPT=1
+ fi
+ AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
+ gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
+ gl_FUNC_GETOPT_POSIX
+ if test $REPLACE_GETOPT = 1; then
+ AC_LIBOBJ([getopt])
+ AC_LIBOBJ([getopt1])
+ gl_PREREQ_GETOPT
+ dnl Arrange for unistd.h to include getopt.h.
+ GNULIB_GL_UNISTD_H_GETOPT=1
+ fi
+ AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
+ gl_FUNC_GETPASS_GNU
+ if test $REPLACE_GETPASS = 1; then
+ AC_LIBOBJ([getpass])
+ gl_PREREQ_GETPASS
+ fi
+ AC_SUBST([LIBINTL])
+ AC_SUBST([LTLIBINTL])
+ # Autoconf 2.61a.99 and earlier don't support linking a file only
+ # in VPATH builds. But since GNUmakefile is for maintainer use
+ # only, it does not matter if we skip the link with older autoconf.
+ # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
+ # builds, so use a shell variable to bypass this.
+ GNUmakefile=GNUmakefile
+ m4_if(m4_version_compare([2.61a.100],
+ m4_defn([m4_PACKAGE_VERSION])), [1], [],
+ [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
+ [GNUmakefile=$GNUmakefile])])
+ gl_HOSTENT
+ AM_ICONV
+ m4_ifdef([gl_ICONV_MODULE_INDICATOR],
+ [gl_ICONV_MODULE_INDICATOR([iconv])])
+ gl_ICONV_H
+ gl_FUNC_ICONV_OPEN
+ if test $REPLACE_ICONV_OPEN = 1; then
+ AC_LIBOBJ([iconv_open])
+ fi
+ if test $REPLACE_ICONV = 1; then
+ AC_LIBOBJ([iconv])
+ AC_LIBOBJ([iconv_close])
+ fi
+ gl_FUNC_INET_NTOP
+ if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then
+ AC_LIBOBJ([inet_ntop])
+ gl_PREREQ_INET_NTOP
+ fi
+ gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
+ gl_INLINE
+ AC_REQUIRE([gl_LARGEFILE])
+ gl_LOCALCHARSET
+
LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+ AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+ gl_FUNC_LSEEK
+ if test $REPLACE_LSEEK = 1; then
+ AC_LIBOBJ([lseek])
+ fi
+ gl_UNISTD_MODULE_INDICATOR([lseek])
+ AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
+ [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
+ gl_FUNC_MBRTOWC
+ if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+ AC_LIBOBJ([mbrtowc])
+ gl_PREREQ_MBRTOWC
+ fi
+ gl_WCHAR_MODULE_INDICATOR([mbrtowc])
+ gl_FUNC_MBSINIT
+ if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+ AC_LIBOBJ([mbsinit])
+ gl_PREREQ_MBSINIT
+ fi
+ gl_WCHAR_MODULE_INDICATOR([mbsinit])
+ gl_FUNC_MEMCHR
+ if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+ AC_LIBOBJ([memchr])
+ gl_PREREQ_MEMCHR
+ fi
+ gl_STRING_MODULE_INDICATOR([memchr])
+ gl_MSVC_INVAL
+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+ AC_LIBOBJ([msvc-inval])
+ fi
+ gl_MSVC_NOTHROW
+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+ AC_LIBOBJ([msvc-nothrow])
+ fi
+ gl_MULTIARCH
+ gl_HEADER_NETDB
+ gl_HEADER_NETINET_IN
+ AC_PROG_MKDIR_P
+ AC_PATH_PROG([PMCCABE], [pmccabe], [false])
+ gl_FUNC_POLL
+ if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
+ AC_LIBOBJ([poll])
+ gl_PREREQ_POLL
+ fi
+ gl_POLL_MODULE_INDICATOR([poll])
+ gl_POLL_H
+ AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
+ AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+ gl_QUOTE
+ gl_QUOTEARG
+ gl_FUNC_READLINE
+ if test "$gl_cv_lib_readline" = no; then
+ AC_LIBOBJ([readline])
+ gl_PREREQ_READLINE
+ fi
+ gl_FUNC_REALLOC_POSIX
+ if test $REPLACE_REALLOC = 1; then
+ AC_LIBOBJ([realloc])
+ fi
+ gl_STDLIB_MODULE_INDICATOR([realloc-posix])
+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
+ if test "$ac_cv_header_winsock2_h" = yes; then
+ AC_LIBOBJ([recv])
+ fi
+ gl_SYS_SOCKET_MODULE_INDICATOR([recv])
+ gl_FUNC_SELECT
+ if test $REPLACE_SELECT = 1; then
+ AC_LIBOBJ([select])
+ fi
+ gl_SYS_SELECT_MODULE_INDICATOR([select])
+ gl_SERVENT
+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
+ if test "$ac_cv_header_winsock2_h" = yes; then
+ AC_LIBOBJ([shutdown])
+ fi
+ gl_SYS_SOCKET_MODULE_INDICATOR([shutdown])
+ gl_SIGNAL_H
+ gl_SIZE_MAX
+ gl_FUNC_SNPRINTF
+ gl_STDIO_MODULE_INDICATOR([snprintf])
+ gl_MODULE_INDICATOR([snprintf])
+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
+ if test "$ac_cv_header_winsock2_h" = yes; then
+ AC_LIBOBJ([socket])
+ fi
+ # When this module is used, sockets may actually occur as file descriptors,
+ # hence it is worth warning if the modules 'close' and 'ioctl' are not used.
+ m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
+ m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
+ AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2])
+ if test "$ac_cv_header_winsock2_h" = yes; then
+ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
+ SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
+ fi
+ gl_SYS_SOCKET_MODULE_INDICATOR([socket])
+ gl_SOCKETLIB
+ gl_SOCKETS
+ gl_TYPE_SOCKLEN_T
+ gt_TYPE_SSIZE_T
+ gl_STDALIGN_H
+ gl_STDARG_H
+ AM_STDBOOL_H
+ gl_STDDEF_H
+ gl_STDINT_H
+ gl_STDIO_H
+ gl_STDLIB_H
+ gl_FUNC_STRERROR
+ if test $REPLACE_STRERROR = 1; then
+ AC_LIBOBJ([strerror])
+ fi
+ gl_MODULE_INDICATOR([strerror])
+ gl_STRING_MODULE_INDICATOR([strerror])
+ AC_REQUIRE([gl_HEADER_ERRNO_H])
+ AC_REQUIRE([gl_FUNC_STRERROR_0])
+ if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
+ AC_LIBOBJ([strerror-override])
+ gl_PREREQ_SYS_H_WINSOCK2
+ fi
+ if test $gl_cond_libtool = false; then
+ gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
+ gl_libdeps="$gl_libdeps $LIBICONV"
+ fi
+ gl_HEADER_STRING_H
+ gl_FUNC_STRTOK_R
+ if test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1; then
+ AC_LIBOBJ([strtok_r])
+ gl_PREREQ_STRTOK_R
+ fi
+ gl_STRING_MODULE_INDICATOR([strtok_r])
+ gl_HEADER_SYS_SELECT
+ AC_PROG_MKDIR_P
+ gl_HEADER_SYS_SOCKET
+ AC_PROG_MKDIR_P
+ gl_HEADER_SYS_STAT_H
+ AC_PROG_MKDIR_P
+ gl_HEADER_SYS_TIME_H
+ AC_PROG_MKDIR_P
+ gl_SYS_TYPES_H
+ AC_PROG_MKDIR_P
+ gl_HEADER_SYS_UIO
+ AC_PROG_MKDIR_P
+ gl_HEADER_TIME_H
+ gl_UNISTD_H
+ gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h])
+ gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
+ gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
+ gl_MODULE_INDICATOR([unistr/u8-uctomb])
+ gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
+ gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+ gl_VALGRIND_TESTS
+ gl_FUNC_VASNPRINTF
+ gl_FUNC_VASPRINTF
+ gl_STDIO_MODULE_INDICATOR([vasprintf])
+ m4_ifdef([AM_XGETTEXT_OPTION],
+ [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
+ AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
+ gl_VERSION_ETC
+ gl_WCHAR_H
+ gl_WCTYPE_H
+ gl_XALLOC
+ gl_XSIZE
# End of code from modules
m4_ifval(gl_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -650,162 +650,161 @@ changequote([, ])dnl
AC_SUBST([gltests_WITNESS])
gl_module_indicator_condition=$gltests_WITNESS
m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
-AC_REQUIRE([AC_C_INLINE])
-gl_FUNC_BTOWC
-if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
- AC_LIBOBJ([btowc])
- gl_PREREQ_BTOWC
-fi
-gl_WCHAR_MODULE_INDICATOR([btowc])
-gt_LOCALE_FR
-gt_LOCALE_FR_UTF8
-gt_LOCALE_FR
-gt_LOCALE_TR_UTF8
-gl_FUNC_DUP2
-if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
- AC_LIBOBJ([dup2])
- gl_PREREQ_DUP2
-fi
-gl_UNISTD_MODULE_INDICATOR([dup2])
-gl_ENVIRON
-gl_UNISTD_MODULE_INDICATOR([environ])
-gl_FCNTL_H
-gl_FUNC_FDOPEN
-if test $REPLACE_FDOPEN = 1; then
- AC_LIBOBJ([fdopen])
- gl_PREREQ_FDOPEN
-fi
-gl_STDIO_MODULE_INDICATOR([fdopen])
-gl_FUNC_UNGETC_WORKS
-gl_FUNC_UNGETC_WORKS
-gl_FUNC_GETCWD_LGPL
-if test $REPLACE_GETCWD = 1; then
- AC_LIBOBJ([getcwd-lgpl])
-fi
-gl_UNISTD_MODULE_INDICATOR([getcwd])
-gl_FUNC_GETPAGESIZE
-if test $REPLACE_GETPAGESIZE = 1; then
- AC_LIBOBJ([getpagesize])
-fi
-gl_UNISTD_MODULE_INDICATOR([getpagesize])
-AC_REQUIRE([AC_C_INLINE])
-AC_C_BIGENDIAN
-gl_FUNC_INET_PTON
-if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_NTOP = 1; then
- AC_LIBOBJ([inet_pton])
- gl_PREREQ_INET_PTON
-fi
-gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
-AC_C_BIGENDIAN
-gl_INTTYPES_H
-gl_INTTYPES_INCOMPLETE
-gl_LOCALE_H
-AC_CHECK_FUNCS_ONCE([newlocale])
-gl_LOCALENAME
-AC_CHECK_FUNCS_ONCE([newlocale])
-gl_LOCK
-gl_FUNC_LSTAT
-if test $REPLACE_LSTAT = 1; then
- AC_LIBOBJ([lstat])
- gl_PREREQ_LSTAT
-fi
-gl_SYS_STAT_MODULE_INDICATOR([lstat])
-gl_FUNC_MALLOC_POSIX
-if test $REPLACE_MALLOC = 1; then
- AC_LIBOBJ([malloc])
-fi
-gl_STDLIB_MODULE_INDICATOR([malloc-posix])
-gl_MALLOCA
-gt_LOCALE_FR
-gt_LOCALE_FR_UTF8
-gt_LOCALE_JA
-gt_LOCALE_ZH_CN
-gt_LOCALE_FR_UTF8
-gl_FUNC_MBTOWC
-if test $REPLACE_MBTOWC = 1; then
- AC_LIBOBJ([mbtowc])
- gl_PREREQ_MBTOWC
-fi
-gl_STDLIB_MODULE_INDICATOR([mbtowc])
-dnl Check for prerequisites for memory fence checks.
-gl_FUNC_MMAP_ANON
-AC_CHECK_HEADERS_ONCE([sys/mman.h])
-AC_CHECK_FUNCS_ONCE([mprotect])
-gl_FUNC_OPEN
-if test $REPLACE_OPEN = 1; then
- AC_LIBOBJ([open])
- gl_PREREQ_OPEN
-fi
-gl_FCNTL_MODULE_INDICATOR([open])
-gl_PATHMAX
-gl_FUNC_PUTENV
-if test $REPLACE_PUTENV = 1; then
- AC_LIBOBJ([putenv])
-fi
-gl_STDLIB_MODULE_INDICATOR([putenv])
-gl_FUNC_SETENV
-if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
- AC_LIBOBJ([setenv])
-fi
-gl_STDLIB_MODULE_INDICATOR([setenv])
-gl_FUNC_SETLOCALE
-if test $REPLACE_SETLOCALE = 1; then
- AC_LIBOBJ([setlocale])
- gl_PREREQ_SETLOCALE
-fi
-gl_LOCALE_MODULE_INDICATOR([setlocale])
-gt_LOCALE_FR
-gt_LOCALE_FR_UTF8
-gt_LOCALE_JA
-gt_LOCALE_ZH_CN
-gl_FUNC_STAT
-if test $REPLACE_STAT = 1; then
- AC_LIBOBJ([stat])
- gl_PREREQ_STAT
-fi
-gl_SYS_STAT_MODULE_INDICATOR([stat])
-gt_TYPE_WCHAR_T
-gt_TYPE_WINT_T
-gl_FUNC_SYMLINK
-if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
- AC_LIBOBJ([symlink])
-fi
-gl_UNISTD_MODULE_INDICATOR([symlink])
-AC_CHECK_FUNCS_ONCE([shutdown])
-gl_THREAD
-gl_THREADLIB
-gl_FUNC_UNSETENV
-if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then
- AC_LIBOBJ([unsetenv])
- gl_PREREQ_UNSETENV
-fi
-gl_STDLIB_MODULE_INDICATOR([unsetenv])
-gl_VALGRIND_TESTS
-abs_aux_dir=`cd "$ac_aux_dir"; pwd`
-AC_SUBST([abs_aux_dir])
-gl_FUNC_WCRTOMB
-if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
- AC_LIBOBJ([wcrtomb])
- gl_PREREQ_WCRTOMB
-fi
-gl_WCHAR_MODULE_INDICATOR([wcrtomb])
-gt_LOCALE_FR
-gt_LOCALE_FR_UTF8
-gt_LOCALE_JA
-gt_LOCALE_ZH_CN
-gl_FUNC_WCTOB
-if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
- AC_LIBOBJ([wctob])
- gl_PREREQ_WCTOB
-fi
-gl_WCHAR_MODULE_INDICATOR([wctob])
-gl_FUNC_WCTOMB
-if test $REPLACE_WCTOMB = 1; then
- AC_LIBOBJ([wctomb])
- gl_PREREQ_WCTOMB
-fi
-gl_STDLIB_MODULE_INDICATOR([wctomb])
-gl_YIELD
+ AC_REQUIRE([AC_C_INLINE])
+ gl_FUNC_BTOWC
+ if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+ AC_LIBOBJ([btowc])
+ gl_PREREQ_BTOWC
+ fi
+ gl_WCHAR_MODULE_INDICATOR([btowc])
+ gt_LOCALE_FR
+ gt_LOCALE_FR_UTF8
+ gt_LOCALE_FR
+ gt_LOCALE_TR_UTF8
+ gl_FUNC_DUP2
+ if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
+ AC_LIBOBJ([dup2])
+ gl_PREREQ_DUP2
+ fi
+ gl_UNISTD_MODULE_INDICATOR([dup2])
+ gl_ENVIRON
+ gl_UNISTD_MODULE_INDICATOR([environ])
+ gl_FCNTL_H
+ gl_FUNC_FDOPEN
+ if test $REPLACE_FDOPEN = 1; then
+ AC_LIBOBJ([fdopen])
+ gl_PREREQ_FDOPEN
+ fi
+ gl_STDIO_MODULE_INDICATOR([fdopen])
+ gl_FUNC_UNGETC_WORKS
+ gl_FUNC_UNGETC_WORKS
+ gl_FUNC_GETCWD_LGPL
+ if test $REPLACE_GETCWD = 1; then
+ AC_LIBOBJ([getcwd-lgpl])
+ fi
+ gl_UNISTD_MODULE_INDICATOR([getcwd])
+ gl_FUNC_GETPAGESIZE
+ if test $REPLACE_GETPAGESIZE = 1; then
+ AC_LIBOBJ([getpagesize])
+ fi
+ gl_UNISTD_MODULE_INDICATOR([getpagesize])
+ AC_C_BIGENDIAN
+ gl_FUNC_INET_PTON
+ if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_NTOP = 1; then
+ AC_LIBOBJ([inet_pton])
+ gl_PREREQ_INET_PTON
+ fi
+ gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
+ AC_C_BIGENDIAN
+ gl_INTTYPES_H
+ gl_INTTYPES_INCOMPLETE
+ gl_LOCALE_H
+ AC_CHECK_FUNCS_ONCE([newlocale])
+ gl_LOCALENAME
+ AC_CHECK_FUNCS_ONCE([newlocale])
+ gl_LOCK
+ gl_FUNC_LSTAT
+ if test $REPLACE_LSTAT = 1; then
+ AC_LIBOBJ([lstat])
+ gl_PREREQ_LSTAT
+ fi
+ gl_SYS_STAT_MODULE_INDICATOR([lstat])
+ gl_FUNC_MALLOC_POSIX
+ if test $REPLACE_MALLOC = 1; then
+ AC_LIBOBJ([malloc])
+ fi
+ gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+ gl_MALLOCA
+ gt_LOCALE_FR
+ gt_LOCALE_FR_UTF8
+ gt_LOCALE_JA
+ gt_LOCALE_ZH_CN
+ gt_LOCALE_FR_UTF8
+ gl_FUNC_MBTOWC
+ if test $REPLACE_MBTOWC = 1; then
+ AC_LIBOBJ([mbtowc])
+ gl_PREREQ_MBTOWC
+ fi
+ gl_STDLIB_MODULE_INDICATOR([mbtowc])
+ dnl Check for prerequisites for memory fence checks.
+ gl_FUNC_MMAP_ANON
+ AC_CHECK_HEADERS_ONCE([sys/mman.h])
+ AC_CHECK_FUNCS_ONCE([mprotect])
+ gl_FUNC_OPEN
+ if test $REPLACE_OPEN = 1; then
+ AC_LIBOBJ([open])
+ gl_PREREQ_OPEN
+ fi
+ gl_FCNTL_MODULE_INDICATOR([open])
+ gl_PATHMAX
+ gl_FUNC_PUTENV
+ if test $REPLACE_PUTENV = 1; then
+ AC_LIBOBJ([putenv])
+ fi
+ gl_STDLIB_MODULE_INDICATOR([putenv])
+ gl_FUNC_SETENV
+ if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
+ AC_LIBOBJ([setenv])
+ fi
+ gl_STDLIB_MODULE_INDICATOR([setenv])
+ gl_FUNC_SETLOCALE
+ if test $REPLACE_SETLOCALE = 1; then
+ AC_LIBOBJ([setlocale])
+ gl_PREREQ_SETLOCALE
+ fi
+ gl_LOCALE_MODULE_INDICATOR([setlocale])
+ gt_LOCALE_FR
+ gt_LOCALE_FR_UTF8
+ gt_LOCALE_JA
+ gt_LOCALE_ZH_CN
+ gl_FUNC_STAT
+ if test $REPLACE_STAT = 1; then
+ AC_LIBOBJ([stat])
+ gl_PREREQ_STAT
+ fi
+ gl_SYS_STAT_MODULE_INDICATOR([stat])
+ gt_TYPE_WCHAR_T
+ gt_TYPE_WINT_T
+ gl_FUNC_SYMLINK
+ if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
+ AC_LIBOBJ([symlink])
+ fi
+ gl_UNISTD_MODULE_INDICATOR([symlink])
+ AC_CHECK_FUNCS_ONCE([shutdown])
+ gl_THREAD
+ gl_THREADLIB
+ gl_FUNC_UNSETENV
+ if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then
+ AC_LIBOBJ([unsetenv])
+ gl_PREREQ_UNSETENV
+ fi
+ gl_STDLIB_MODULE_INDICATOR([unsetenv])
+ gl_VALGRIND_TESTS
+ abs_aux_dir=`cd "$ac_aux_dir"; pwd`
+ AC_SUBST([abs_aux_dir])
+ gl_FUNC_WCRTOMB
+ if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+ AC_LIBOBJ([wcrtomb])
+ gl_PREREQ_WCRTOMB
+ fi
+ gl_WCHAR_MODULE_INDICATOR([wcrtomb])
+ gt_LOCALE_FR
+ gt_LOCALE_FR_UTF8
+ gt_LOCALE_JA
+ gt_LOCALE_ZH_CN
+ gl_FUNC_WCTOB
+ if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
+ AC_LIBOBJ([wctob])
+ gl_PREREQ_WCTOB
+ fi
+ gl_WCHAR_MODULE_INDICATOR([wctob])
+ gl_FUNC_WCTOMB
+ if test $REPLACE_WCTOMB = 1; then
+ AC_LIBOBJ([wctomb])
+ gl_PREREQ_WCTOMB
+ fi
+ gl_STDLIB_MODULE_INDICATOR([wctomb])
+ gl_YIELD
m4_popdef([gl_MODULE_INDICATOR_CONDITION])
m4_ifval(gltests_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
diff --git a/gl/m4/intlmacosx.m4 b/gl/m4/intlmacosx.m4
index dc2ddfe..d4da190 100644
--- a/gl/m4/intlmacosx.m4
+++ b/gl/m4/intlmacosx.m4
@@ -1,4 +1,4 @@
-# intlmacosx.m4 serial 4 (gettext-0.18.2)
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
dnl Copyright (C) 2004-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,11 +13,11 @@ dnl by the GNU Library General Public License, and the rest
of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
-dnl Checks for special options needed on MacOS X.
+dnl Checks for special options needed on Mac OS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
[
- dnl Check for API introduced in MacOS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.2.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
@@ -31,9 +31,9 @@ AC_DEFUN([gt_INTL_MACOSX],
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
fi
- dnl Check for API introduced in MacOS X 10.3.
+ dnl Check for API introduced in Mac OS X 10.3.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -46,7 +46,7 @@ AC_DEFUN([gt_INTL_MACOSX],
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in
the CoreFoundation framework.])
fi
INTL_MACOSX_LIBS=
if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test
$gt_cv_func_CFLocaleCopyCurrent = yes; then
diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
index a159f4a..a88850a 100644
--- a/gl/m4/largefile.m4
+++ b/gl/m4/largefile.m4
@@ -136,7 +136,7 @@ AC_DEFUN([gl_LARGEFILE],
*)
dnl Nothing to do on gnulib's side.
dnl A 64-bit off_t is
- dnl - already the default on MacOS X, FreeBSD, NetBSD, OpenBSD, IRIX,
+ dnl - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
dnl OSF/1, Cygwin,
dnl - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
dnl glibc, HP-UX, Solaris,
diff --git a/gl/m4/locale-fr.m4 b/gl/m4/locale-fr.m4
index 04d801f..71b6847 100644
--- a/gl/m4/locale-fr.m4
+++ b/gl/m4/locale-fr.m4
@@ -1,4 +1,4 @@
-# locale-fr.m4 serial 16
+# locale-fr.m4 serial 17
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -37,7 +37,7 @@ int main () {
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -92,7 +92,7 @@ changequote([,])dnl
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the usual locale name.
@@ -165,7 +165,7 @@ int main () {
if (setlocale (LC_ALL, "") == NULL) return 1;
# endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -220,7 +220,7 @@ changequote([,])dnl
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the usual locale name.
diff --git a/gl/m4/locale-ja.m4 b/gl/m4/locale-ja.m4
index 201ac4e..5ba0e43 100644
--- a/gl/m4/locale-ja.m4
+++ b/gl/m4/locale-ja.m4
@@ -1,4 +1,4 @@
-# locale-ja.m4 serial 11
+# locale-ja.m4 serial 12
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -39,7 +39,7 @@ int main ()
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -91,7 +91,7 @@ changequote([,])dnl
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the AIX locale name.
diff --git a/gl/m4/locale-tr.m4 b/gl/m4/locale-tr.m4
index 26b2ba2..5f3bf80 100644
--- a/gl/m4/locale-tr.m4
+++ b/gl/m4/locale-tr.m4
@@ -1,4 +1,4 @@
-# locale-tr.m4 serial 9
+# locale-tr.m4 serial 10
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -42,7 +42,7 @@ int main () {
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -95,7 +95,7 @@ changequote([,])dnl
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the usual locale name.
diff --git a/gl/m4/locale-zh.m4 b/gl/m4/locale-zh.m4
index 0cf5ada..e5502b2 100644
--- a/gl/m4/locale-zh.m4
+++ b/gl/m4/locale-zh.m4
@@ -1,4 +1,4 @@
-# locale-zh.m4 serial 11
+# locale-zh.m4 serial 12
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -40,7 +40,7 @@ int main ()
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -101,7 +101,7 @@ changequote([,])dnl
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the locale name without encoding suffix.
diff --git a/gl/m4/locale_h.m4 b/gl/m4/locale_h.m4
index fb72e4e..c0f4d52 100644
--- a/gl/m4/locale_h.m4
+++ b/gl/m4/locale_h.m4
@@ -1,4 +1,4 @@
-# locale_h.m4 serial 18
+# locale_h.m4 serial 19
dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -42,7 +42,7 @@ AC_DEFUN([gl_LOCALE_H],
if test $ac_cv_header_xlocale_h = yes; then
HAVE_XLOCALE_H=1
dnl Check whether use of locale_t requires inclusion of <xlocale.h>,
- dnl e.g. on MacOS X 10.5. If <locale.h> does not define locale_t by
+ dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by
dnl itself, we assume that <xlocale.h> will do so.
AC_CACHE_CHECK([whether locale.h defines locale_t],
[gl_cv_header_locale_has_locale_t],
diff --git a/gl/m4/lock.m4 b/gl/m4/lock.m4
index c0a6206..19c6d45 100644
--- a/gl/m4/lock.m4
+++ b/gl/m4/lock.m4
@@ -1,4 +1,4 @@
-# lock.m4 serial 11 (gettext-0.18.2)
+# lock.m4 serial 12 (gettext-0.18.2)
dnl Copyright (C) 2005-2012 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,7 +10,7 @@ AC_DEFUN([gl_LOCK],
[
AC_REQUIRE([gl_THREADLIB])
if test "$gl_threads_api" = posix; then
- # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
+ # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
# pthread_rwlock_* functions.
AC_CHECK_TYPE([pthread_rwlock_t],
[AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
diff --git a/gl/m4/manywarnings.m4 b/gl/m4/manywarnings.m4
index fd0e372..2760efb 100644
--- a/gl/m4/manywarnings.m4
+++ b/gl/m4/manywarnings.m4
@@ -1,4 +1,4 @@
-# manywarnings.m4 serial 3
+# manywarnings.m4 serial 4
dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -81,96 +81,118 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
gl_manywarn_set=
for gl_manywarn_item in \
- -Wall \
-W \
- -Wformat-y2k \
- -Wformat-nonliteral \
- -Wformat-security \
- -Winit-self \
- -Wmissing-include-dirs \
- -Wswitch-default \
- -Wswitch-enum \
- -Wunused \
- -Wunknown-pragmas \
- -Wstrict-aliasing \
- -Wstrict-overflow \
- -Wsystem-headers \
- -Wfloat-equal \
- -Wtraditional \
- -Wtraditional-conversion \
- -Wdeclaration-after-statement \
- -Wundef \
- -Wshadow \
- -Wunsafe-loop-optimizations \
- -Wpointer-arith \
+ -Wabi \
+ -Waddress \
+ -Wall \
+ -Warray-bounds \
+ -Wattributes \
-Wbad-function-cast \
- -Wc++-compat \
- -Wcast-qual \
- -Wcast-align \
- -Wwrite-strings \
- -Wconversion \
- -Wsign-conversion \
- -Wlogical-op \
- -Waggregate-return \
- -Wstrict-prototypes \
- -Wold-style-definition \
- -Wmissing-prototypes \
- -Wmissing-declarations \
- -Wmissing-noreturn \
- -Wmissing-format-attribute \
- -Wpacked \
- -Wpadded \
- -Wredundant-decls \
- -Wnested-externs \
- -Wunreachable-code \
- -Winline \
- -Winvalid-pch \
- -Wlong-long \
- -Wvla \
- -Wvolatile-register-var \
- -Wdisabled-optimization \
- -Wstack-protector \
- -Woverlength-strings \
-Wbuiltin-macro-redefined \
- -Wmudflap \
- -Wpacked-bitfield-compat \
- -Wsync-nand \
- ; do
- gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
- done
- # The following are not documented in the manual but are included in
- # output from gcc --help=warnings.
- for gl_manywarn_item in \
- -Wattributes \
+ -Wcast-align \
+ -Wchar-subscripts \
+ -Wclobbered \
+ -Wcomment \
+ -Wcomments \
-Wcoverage-mismatch \
- -Wmultichar \
- -Wunused-macros \
- ; do
- gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
- done
- # More warnings from gcc 4.6.2 --help=warnings.
- for gl_manywarn_item in \
- -Wabi \
-Wcpp \
-Wdeprecated \
-Wdeprecated-declarations \
+ -Wdisabled-optimization \
-Wdiv-by-zero \
-Wdouble-promotion \
+ -Wempty-body \
-Wendif-labels \
+ -Wenum-compare \
-Wextra \
-Wformat-contains-nul \
-Wformat-extra-args \
+ -Wformat-nonliteral \
+ -Wformat-security \
+ -Wformat-y2k \
-Wformat-zero-length \
-Wformat=2 \
+ -Wfree-nonheap-object \
+ -Wignored-qualifiers \
+ -Wimplicit \
+ -Wimplicit-function-declaration \
+ -Wimplicit-int \
+ -Winit-self \
+ -Winline \
+ -Wint-to-pointer-cast \
+ -Winvalid-memory-model \
+ -Winvalid-pch \
+ -Wjump-misses-init \
+ -Wlogical-op \
+ -Wmain \
+ -Wmaybe-uninitialized \
+ -Wmissing-braces \
+ -Wmissing-declarations \
+ -Wmissing-field-initializers \
+ -Wmissing-format-attribute \
+ -Wmissing-include-dirs \
+ -Wmissing-noreturn \
+ -Wmissing-parameter-type \
+ -Wmissing-prototypes \
+ -Wmudflap \
-Wmultichar \
+ -Wnarrowing \
+ -Wnested-externs \
+ -Wnonnull \
-Wnormalized=nfc \
+ -Wold-style-declaration \
+ -Wold-style-definition \
-Woverflow \
+ -Woverlength-strings \
+ -Woverride-init \
+ -Wpacked \
+ -Wpacked-bitfield-compat \
+ -Wparentheses \
+ -Wpointer-arith \
+ -Wpointer-sign \
-Wpointer-to-int-cast \
-Wpragmas \
+ -Wreturn-type \
+ -Wsequence-point \
+ -Wshadow \
+ -Wsizeof-pointer-memaccess \
+ -Wstack-protector \
+ -Wstrict-aliasing \
+ -Wstrict-overflow \
+ -Wstrict-prototypes \
-Wsuggest-attribute=const \
+ -Wsuggest-attribute=format \
-Wsuggest-attribute=noreturn \
-Wsuggest-attribute=pure \
+ -Wswitch \
+ -Wswitch-default \
+ -Wsync-nand \
+ -Wsystem-headers \
-Wtrampolines \
+ -Wtrigraphs \
+ -Wtype-limits \
+ -Wuninitialized \
+ -Wunknown-pragmas \
+ -Wunreachable-code \
+ -Wunsafe-loop-optimizations \
+ -Wunused \
+ -Wunused-but-set-parameter \
+ -Wunused-but-set-variable \
+ -Wunused-function \
+ -Wunused-label \
+ -Wunused-local-typedefs \
+ -Wunused-macros \
+ -Wunused-parameter \
+ -Wunused-result \
+ -Wunused-value \
+ -Wunused-variable \
+ -Wvarargs \
+ -Wvariadic-macros \
+ -Wvector-operation-performance \
+ -Wvla \
+ -Wvolatile-register-var \
+ -Wwrite-strings \
+ \
; do
gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
done
diff --git a/gl/m4/mmap-anon.m4 b/gl/m4/mmap-anon.m4
index 4613cbe..748b17d 100644
--- a/gl/m4/mmap-anon.m4
+++ b/gl/m4/mmap-anon.m4
@@ -1,4 +1,4 @@
-# mmap-anon.m4 serial 9
+# mmap-anon.m4 serial 10
dnl Copyright (C) 2005, 2007, 2009-2012 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 @@ dnl with or without modifications, as long as this notice is
preserved.
# - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS
# and MAP_ANON exist and have the same value.
# - On HP-UX, only MAP_ANONYMOUS exists.
-# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
+# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
# - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be
# used.
@@ -27,18 +27,18 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
gl_have_mmap_anonymous=no
if test $gl_have_mmap = yes; then
AC_MSG_CHECKING([for MAP_ANONYMOUS])
- AC_EGREP_CPP([I cant identify this map], [
+ AC_EGREP_CPP([I cannot identify this map], [
#include <sys/mman.h>
#ifdef MAP_ANONYMOUS
- I cant identify this map
+ I cannot identify this map
#endif
],
[gl_have_mmap_anonymous=yes])
if test $gl_have_mmap_anonymous != yes; then
- AC_EGREP_CPP([I cant identify this map], [
+ AC_EGREP_CPP([I cannot identify this map], [
#include <sys/mman.h>
#ifdef MAP_ANON
- I cant identify this map
+ I cannot identify this map
#endif
],
[AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON],
diff --git a/gl/m4/multiarch.m4 b/gl/m4/multiarch.m4
index b424dce..0c288b8 100644
--- a/gl/m4/multiarch.m4
+++ b/gl/m4/multiarch.m4
@@ -1,4 +1,4 @@
-# multiarch.m4 serial 6
+# multiarch.m4 serial 7
dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is
preserved.
# Determine whether the compiler is or may be producing universal binaries.
#
-# On MacOS X 10.5 and later systems, the user can create libraries and
+# On Mac OS X 10.5 and later systems, the user can create libraries and
# executables that work on multiple system types--known as "fat" or
# "universal" binaries--by specifying multiple '-arch' options to the
# compiler but only a single '-arch' option to the preprocessor. Like
diff --git a/gl/m4/nocrash.m4 b/gl/m4/nocrash.m4
index 08ef825..c2638df 100644
--- a/gl/m4/nocrash.m4
+++ b/gl/m4/nocrash.m4
@@ -1,4 +1,4 @@
-# nocrash.m4 serial 3
+# nocrash.m4 serial 4
dnl Copyright (C) 2005, 2009-2012 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,7 +18,7 @@ dnl int main() { nocrash_init(); ... }
AC_DEFUN([GL_NOCRASH],[[
#include <stdlib.h>
#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on MacOS X. */
+/* Avoid a crash on Mac OS X. */
#include <mach/mach.h>
#include <mach/mach_error.h>
#include <mach/thread_status.h>
diff --git a/gl/m4/poll.m4 b/gl/m4/poll.m4
index 9993a36..fdfa1c2 100644
--- a/gl/m4/poll.m4
+++ b/gl/m4/poll.m4
@@ -1,4 +1,4 @@
-# poll.m4 serial 16
+# poll.m4 serial 17
dnl Copyright (c) 2003, 2005-2007, 2009-2012 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,7 +14,7 @@ AC_DEFUN([gl_FUNC_POLL],
else
AC_CHECK_FUNC([poll],
[# Check whether poll() works on special files (like /dev/null) and
- # and ttys (like /dev/tty). On MacOS X 10.4.0 and AIX 5.3, it doesn't.
+ # and ttys (like /dev/tty). On Mac OS X 10.4.0 and AIX 5.3, it doesn't.
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <fcntl.h>
#include <poll.h>
@@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_POLL],
struct pollfd ufd;
/* Try /dev/null for reading. */
ufd.fd = open ("/dev/null", O_RDONLY);
- /* If /dev/null does not exist, it's not MacOS X nor AIX. */
+ /* If /dev/null does not exist, it's not Mac OS X nor AIX. */
if (ufd.fd >= 0)
{
ufd.events = POLLIN;
@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_POLL],
}
/* Try /dev/null for writing. */
ufd.fd = open ("/dev/null", O_WRONLY);
- /* If /dev/null does not exist, it's not MacOS X nor AIX. */
+ /* If /dev/null does not exist, it's not Mac OS X nor AIX. */
if (ufd.fd >= 0)
{
ufd.events = POLLOUT;
@@ -48,7 +48,7 @@ AC_DEFUN([gl_FUNC_POLL],
[gl_cv_func_poll=yes],
[gl_cv_func_poll=no],
[# When cross-compiling, assume that poll() works everywhere except on
- # MacOS X or AIX, regardless of its version.
+ # Mac OS X or AIX, regardless of its version.
AC_EGREP_CPP([MacOSX], [
#if (defined(__APPLE__) && defined(__MACH__)) || defined(_AIX)
This is MacOSX or AIX
diff --git a/gl/m4/printf.m4 b/gl/m4/printf.m4
index d75aca0..751e896 100644
--- a/gl/m4/printf.m4
+++ b/gl/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 48
+# printf.m4 serial 50
dnl Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";;
darwin*) gl_cv_func_printf_sizes_c99="guessing yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -222,7 +222,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 6.
freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";;
darwin*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on HP-UX >= 11.
@@ -507,14 +507,14 @@ int main ()
if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0
|| buf[0] == '0')
result |= 8;
- /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug. */
+ /* This catches a Mac OS X 10.3.9 (Darwin 7.9) bug. */
if (sprintf (buf, "%.1a", 1.999) < 0
|| (strcmp (buf, "0x1.0p+1") != 0
&& strcmp (buf, "0x2.0p+0") != 0
&& strcmp (buf, "0x4.0p-1") != 0
&& strcmp (buf, "0x8.0p-2") != 0))
result |= 16;
- /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a
+ /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a
glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */
if (sprintf (buf, "%.1La", 1.999L) < 0
|| (strcmp (buf, "0x1.0p+1") != 0
@@ -590,7 +590,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 6.
freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";;
darwin*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on Solaris >= 2.10.
@@ -1028,8 +1028,9 @@ int main()
changequote([,])dnl
])])
if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
- (./conftest
+ (./conftest 2>&AS_MESSAGE_LOG_FD
result=$?
+ _AS_ECHO_LOG([\$? = $result])
if test $result != 0 && test $result != 77; then result=1; fi
exit $result
) >/dev/null 2>/dev/null
@@ -1043,7 +1044,7 @@ changequote([,])dnl
fi
rm -fr conftest*
else
- dnl A universal build on Apple MacOS X platforms.
+ dnl A universal build on Apple Mac OS X platforms.
dnl The result would be 'no' in 32-bit mode and 'yes' in 64-bit mode.
dnl But we need a configuration result that is valid in both modes.
gl_cv_func_printf_enomem="guessing no"
@@ -1137,7 +1138,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_truncation_c99="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing
no";;
darwin*) gl_cv_func_snprintf_truncation_c99="guessing
yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -1236,7 +1237,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";;
darwin*) gl_cv_func_snprintf_retval_c99="guessing
yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -1317,7 +1318,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_directive_n="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing
no";;
darwin*) gl_cv_func_snprintf_directive_n="guessing
yes";;
# Guess yes on Solaris >= 2.6.
@@ -1459,7 +1460,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_vsnprintf_zerosize_c99="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing
no";;
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing
yes";;
# Guess yes on Cygwin.
@@ -1539,8 +1540,8 @@ dnl 1 2 3 4 5 6 7
8 9 10 11 12 13 14 15
dnl glibc 2.5 . . . . . . . . . . . . . .
. . . . . .
dnl glibc 2.3.6 . . . . # . . . . . . . . .
. . . . . .
dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . #
. . . . . .
-dnl MacOS X 10.5.8 . . . # # . . . . . . # . .
. . . . . .
-dnl MacOS X 10.3.9 . . . . # . . . . . . # . #
. . . . . .
+dnl Mac OS X 10.5.8 . . . # # . . . . . . # . .
. . . . . .
+dnl Mac OS X 10.3.9 . . . . # . . . . . . # . #
. . . . . .
dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . #
. . . . . .
dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ?
. . . . . .
dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . #
. . . . . .
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index b03393b..5298dd6 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 41
+# stdio_h.m4 serial 42
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,9 @@ AC_DEFUN([gl_STDIO_H],
dnl No need to create extra modules for these functions. Everyone who uses
dnl <stdio.h> likely needs them.
GNULIB_FSCANF=1
+ gl_MODULE_INDICATOR([fscanf])
GNULIB_SCANF=1
+ gl_MODULE_INDICATOR([scanf])
GNULIB_FGETC=1
GNULIB_GETC=1
GNULIB_GETCHAR=1
diff --git a/gl/m4/sys_time_h.m4 b/gl/m4/sys_time_h.m4
index 26eaf8e..c4a30cd 100644
--- a/gl/m4/sys_time_h.m4
+++ b/gl/m4/sys_time_h.m4
@@ -52,7 +52,9 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
dnl (in <sys/time.h> and <winsock2.h> for mingw64, in <winsock2.h> only
dnl for MSVC) with a tv_sec field of type 'long' (32-bit!), which is
dnl smaller than the 'time_t' type mandated by POSIX.
- AC_CACHE_CHECK([for correct struct timeval.tv_sec member],
+ dnl On OpenBSD 5.1 amd64, tv_sec is 64 bits and time_t 32 bits, but
+ dnl that is good enough.
+ AC_CACHE_CHECK([for wide-enough struct timeval.tv_sec member],
[gl_cv_sys_struct_timeval_tv_sec],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
@@ -65,7 +67,9 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
#endif
]],
[[static struct timeval x;
- typedef int verify_tv_sec_type[sizeof (x.tv_sec) == sizeof
(time_t) ? 1 : -1];
+ typedef int verify_tv_sec_type[
+ sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
+ ];
]])],
[gl_cv_sys_struct_timeval_tv_sec=yes],
[gl_cv_sys_struct_timeval_tv_sec=no])
diff --git a/gl/m4/threadlib.m4 b/gl/m4/threadlib.m4
index 9cedb67..cb93391 100644
--- a/gl/m4/threadlib.m4
+++ b/gl/m4/threadlib.m4
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 9 (gettext-0.18.2)
+# threadlib.m4 serial 10 (gettext-0.18.2)
dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -319,50 +319,50 @@ AC_DEFUN([gl_DISABLE_THREADS], [
dnl Survey of platforms:
dnl
-dnl Platform Available Compiler Supports test-lock
-dnl flavours option weak result
-dnl --------------- --------- --------- -------- ---------
-dnl Linux 2.4/glibc posix -lpthread Y OK
+dnl Platform Available Compiler Supports test-lock
+dnl flavours option weak result
+dnl --------------- --------- --------- -------- ---------
+dnl Linux 2.4/glibc posix -lpthread Y OK
dnl
-dnl GNU Hurd/glibc posix
+dnl GNU Hurd/glibc posix
dnl
-dnl FreeBSD 5.3 posix -lc_r Y
-dnl posix -lkse ? Y
-dnl posix -lpthread ? Y
-dnl posix -lthr Y
+dnl FreeBSD 5.3 posix -lc_r Y
+dnl posix -lkse ? Y
+dnl posix -lpthread ? Y
+dnl posix -lthr Y
dnl
-dnl FreeBSD 5.2 posix -lc_r Y
-dnl posix -lkse Y
-dnl posix -lthr Y
+dnl FreeBSD 5.2 posix -lc_r Y
+dnl posix -lkse Y
+dnl posix -lthr Y
dnl
-dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
+dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
dnl
-dnl NetBSD 1.6 --
+dnl NetBSD 1.6 --
dnl
-dnl OpenBSD 3.4 posix -lpthread Y OK
+dnl OpenBSD 3.4 posix -lpthread Y OK
dnl
-dnl MacOS X 10.[123] posix -lpthread Y OK
+dnl Mac OS X 10.[123] posix -lpthread Y OK
dnl
-dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9:
OK
-dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9:
OK
+dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9:
OK
+dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9:
OK
dnl
-dnl HP-UX 11 posix -lpthread N (cc) OK
+dnl HP-UX 11 posix -lpthread N (cc) OK
dnl Y (gcc)
dnl
-dnl IRIX 6.5 posix -lpthread Y 0.5
+dnl IRIX 6.5 posix -lpthread Y 0.5
dnl
-dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
+dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
dnl
-dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
+dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
dnl -lpthread (gcc) Y
dnl
-dnl Cygwin posix -lpthread Y OK
+dnl Cygwin posix -lpthread Y OK
dnl
-dnl Any of the above pth -lpth 0.0
+dnl Any of the above pth -lpth 0.0
dnl
-dnl Mingw windows N OK
+dnl Mingw windows N OK
dnl
-dnl BeOS 5 --
+dnl BeOS 5 --
dnl
dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
dnl turned off:
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index b88da76..6415bfb 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -2,7 +2,7 @@
# Copyright (C) 2000-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc.
-# serial 6
+# serial 7
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -25,7 +25,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY],
AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
])
-dnl Define HAVE_STRUCT_TIMESPEC if 'struct timespec' is declared
+dnl Check whether 'struct timespec' is declared
dnl in time.h, sys/time.h, or pthread.h.
AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
diff --git a/gl/override/lib/gettext.h.diff b/gl/override/lib/gettext.h.diff
index f575362..d4c27c8 100644
--- a/gl/override/lib/gettext.h.diff
+++ b/gl/override/lib/gettext.h.diff
@@ -1,106 +1,179 @@
---- gl/gettext.h.orig 2012-02-07 10:01:26.854383205 +0100
-+++ gl/gettext.h 2012-02-07 10:01:39.923793105 +0100
-@@ -184,103 +184,4 @@
-
- #include <string.h>
-
--#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
-- (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
-- /* || __STDC_VERSION__ >= 199901L */ )
--
--#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
--#include <stdlib.h>
--#endif
--
--#define pgettext_expr(Msgctxt, Msgid) \
-- dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
--#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
-- dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
--
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static const char *
--dcpgettext_expr (const char *domain,
-- const char *msgctxt, const char *msgid,
-- int category)
--{
-- size_t msgctxt_len = strlen (msgctxt) + 1;
-- size_t msgid_len = strlen (msgid) + 1;
-- const char *translation;
--#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- char msg_ctxt_id[msgctxt_len + msgid_len];
--#else
-- char buf[1024];
-- char *msg_ctxt_id =
-- (msgctxt_len + msgid_len <= sizeof (buf)
-- ? buf
-- : (char *) malloc (msgctxt_len + msgid_len));
-- if (msg_ctxt_id != NULL)
--#endif
-- {
-- memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-- msg_ctxt_id[msgctxt_len - 1] = '\004';
-- memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-- translation = dcgettext (domain, msg_ctxt_id, category);
--#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- if (msg_ctxt_id != buf)
-- free (msg_ctxt_id);
--#endif
-- if (translation != msg_ctxt_id)
-- return translation;
-- }
-- return msgid;
--}
--
--#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
-- dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
--#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
-- dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
--
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static const char *
--dcnpgettext_expr (const char *domain,
-- const char *msgctxt, const char *msgid,
-- const char *msgid_plural, unsigned long int n,
-- int category)
--{
-- size_t msgctxt_len = strlen (msgctxt) + 1;
-- size_t msgid_len = strlen (msgid) + 1;
-- const char *translation;
--#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- char msg_ctxt_id[msgctxt_len + msgid_len];
--#else
-- char buf[1024];
-- char *msg_ctxt_id =
-- (msgctxt_len + msgid_len <= sizeof (buf)
-- ? buf
-- : (char *) malloc (msgctxt_len + msgid_len));
-- if (msg_ctxt_id != NULL)
--#endif
-- {
-- memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-- msg_ctxt_id[msgctxt_len - 1] = '\004';
-- memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-- translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n,
category);
--#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- if (msg_ctxt_id != buf)
-- free (msg_ctxt_id);
--#endif
-- if (!(translation == msg_ctxt_id || translation == msgid_plural))
-- return translation;
-- }
-- return (n == 1 ? msgid : msgid_plural);
--}
--
- #endif /* _LIBGETTEXT_H */
+110,287d109
+< /* The separator between msgctxt and msgid in a .mo file. */
+< #define GETTEXT_CONTEXT_GLUE "\004"
+<
+< /* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+< MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
+< short and rarely need to change.
+< The letter 'p' stands for 'particular' or 'special'. */
+< #ifdef DEFAULT_TEXT_DOMAIN
+< # define pgettext(Msgctxt, Msgid) \
+< pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, LC_MESSAGES)
+< #else
+< # define pgettext(Msgctxt, Msgid) \
+< pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
LC_MESSAGES)
+< #endif
+< #define dpgettext(Domainname, Msgctxt, Msgid) \
+< pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
LC_MESSAGES)
+< #define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+< pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
Category)
+< #ifdef DEFAULT_TEXT_DOMAIN
+< # define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+< npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, MsgidPlural, N, LC_MESSAGES)
+< #else
+< # define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+< npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
+< #endif
+< #define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+< npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
+< #define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+< npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, Category)
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< pgettext_aux (const char *domain,
+< const char *msg_ctxt_id, const char *msgid,
+< int category)
+< {
+< const char *translation = dcgettext (domain, msg_ctxt_id, category);
+< if (translation == msg_ctxt_id)
+< return msgid;
+< else
+< return translation;
+< }
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< npgettext_aux (const char *domain,
+< const char *msg_ctxt_id, const char *msgid,
+< const char *msgid_plural, unsigned long int n,
+< int category)
+< {
+< const char *translation =
+< dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+< if (translation == msg_ctxt_id || translation == msgid_plural)
+< return (n == 1 ? msgid : msgid_plural);
+< else
+< return translation;
+< }
+<
+< /* The same thing extended for non-constant arguments. Here MSGCTXT and
MSGID
+< can be arbitrary expressions. But for string literals these macros are
+< less efficient than those above. */
+<
+< #include <string.h>
+<
+< #if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
+< /* || __STDC_VERSION__ >= 199901L */ )
+< # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
+< #else
+< # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
+< #endif
+<
+< #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< #include <stdlib.h>
+< #endif
+<
+< #define pgettext_expr(Msgctxt, Msgid) \
+< dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+< #define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+< dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< dcpgettext_expr (const char *domain,
+< const char *msgctxt, const char *msgid,
+< int category)
+< {
+< size_t msgctxt_len = strlen (msgctxt) + 1;
+< size_t msgid_len = strlen (msgid) + 1;
+< const char *translation;
+< #if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< char msg_ctxt_id[msgctxt_len + msgid_len];
+< #else
+< char buf[1024];
+< char *msg_ctxt_id =
+< (msgctxt_len + msgid_len <= sizeof (buf)
+< ? buf
+< : (char *) malloc (msgctxt_len + msgid_len));
+< if (msg_ctxt_id != NULL)
+< #endif
+< {
+< memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+< msg_ctxt_id[msgctxt_len - 1] = '\004';
+< memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+< translation = dcgettext (domain, msg_ctxt_id, category);
+< #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< if (msg_ctxt_id != buf)
+< free (msg_ctxt_id);
+< #endif
+< if (translation != msg_ctxt_id)
+< return translation;
+< }
+< return msgid;
+< }
+<
+< #define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+< dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+< #define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+< dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< dcnpgettext_expr (const char *domain,
+< const char *msgctxt, const char *msgid,
+< const char *msgid_plural, unsigned long int n,
+< int category)
+< {
+< size_t msgctxt_len = strlen (msgctxt) + 1;
+< size_t msgid_len = strlen (msgid) + 1;
+< const char *translation;
+< #if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< char msg_ctxt_id[msgctxt_len + msgid_len];
+< #else
+< char buf[1024];
+< char *msg_ctxt_id =
+< (msgctxt_len + msgid_len <= sizeof (buf)
+< ? buf
+< : (char *) malloc (msgctxt_len + msgid_len));
+< if (msg_ctxt_id != NULL)
+< #endif
+< {
+< memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+< msg_ctxt_id[msgctxt_len - 1] = '\004';
+< memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+< translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n,
category);
+< #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< if (msg_ctxt_id != buf)
+< free (msg_ctxt_id);
+< #endif
+< if (!(translation == msg_ctxt_id || translation == msgid_plural))
+< return translation;
+< }
+< return (n == 1 ? msgid : msgid_plural);
+< }
+<
diff --git a/gl/poll.c b/gl/poll.c
index aeb7655..be3c03c 100644
--- a/gl/poll.c
+++ b/gl/poll.c
@@ -598,7 +598,7 @@ restart:
if (!rc && timeout == INFTIM)
{
- SwitchToThread();
+ SleepEx (1, TRUE);
goto restart;
}
diff --git a/gl/printf-parse.c b/gl/printf-parse.c
index 308a175..815fd43 100644
--- a/gl/printf-parse.c
+++ b/gl/printf-parse.c
@@ -401,7 +401,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d,
arguments *a)
cp++;
}
#if defined __APPLE__ && defined __MACH__
- /* On MacOS X 10.3, PRIdMAX is defined as "qd".
+ /* On Mac OS X 10.3, PRIdMAX is defined as "qd".
We cannot change it to "lld" because PRIdMAX must also
be understood by the system's printf routines. */
else if (*cp == 'q')
diff --git a/gl/select.c b/gl/select.c
index d1360f0..d6acb5c 100644
--- a/gl/select.c
+++ b/gl/select.c
@@ -385,6 +385,10 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set
*xfds,
}
}
+ /* Place a sentinel at the end of the array. */
+ handle_array[nhandles] = NULL;
+
+restart:
if (wait_timeout == 0 || nsock == 0)
rc = 0;
else
@@ -427,13 +431,44 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set
*xfds,
if (rc == 0 && nsock > 0)
rc = select (0, &handle_rfds, &handle_wfds, &handle_xfds, &tv0);
+ if (nhandles > 1)
+ {
+ /* Count results that are not counted in the return value of select. */
+ nhandles = 1;
+ for (i = 0; i < nfds; i++)
+ {
+ if ((anyfds_in[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) == 0)
+ continue;
+
+ h = (HANDLE) _get_osfhandle (i);
+ if (h == handle_array[nhandles])
+ {
+ /* Not a socket. */
+ nhandles++;
+ windows_poll_handle (h, i, &rbits, &wbits, &xbits);
+ if (rbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))
+ || wbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))
+ || xbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1))))
+ rc++;
+ }
+ }
+
+ if (rc == 0 && wait_timeout == INFINITE)
+ {
+ /* Sleep 1 millisecond to avoid busy wait and retry with the
+ original fd_sets. */
+ memcpy (&handle_rfds, rfds, sizeof (fd_set));
+ memcpy (&handle_wfds, wfds, sizeof (fd_set));
+ memcpy (&handle_xfds, xfds, sizeof (fd_set));
+ SleepEx (1, TRUE);
+ goto restart;
+ }
+ }
+
/* Now fill in the results. */
FD_ZERO (rfds);
FD_ZERO (wfds);
FD_ZERO (xfds);
-
- /* Place a sentinel at the end of the array. */
- handle_array[nhandles] = NULL;
nhandles = 1;
for (i = 0; i < nfds; i++)
{
@@ -443,8 +478,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set
*xfds,
h = (HANDLE) _get_osfhandle (i);
if (h != handle_array[nhandles])
{
- /* Perform handle->descriptor mapping. Don't update rc, as these
- results are counted in the return value of Winsock's select. */
+ /* Perform handle->descriptor mapping. */
WSAEventSelect ((SOCKET) h, NULL, 0);
if (FD_ISSET (h, &handle_rfds))
FD_SET (i, rfds);
@@ -457,22 +491,12 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set
*xfds,
{
/* Not a socket. */
nhandles++;
- windows_poll_handle (h, i, &rbits, &wbits, &xbits);
if (rbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1))))
- {
- rc++;
- FD_SET (i, rfds);
- }
+ FD_SET (i, rfds);
if (wbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1))))
- {
- rc++;
- FD_SET (i, wfds);
- }
+ FD_SET (i, wfds);
if (xbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1))))
- {
- rc++;
- FD_SET (i, xfds);
- }
+ FD_SET (i, xfds);
}
}
@@ -482,6 +506,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set
*xfds,
#else /* ! Native Windows. */
#include <sys/select.h>
+#include <stddef.h> /* NULL */
#undef select
diff --git a/gl/signal.in.h b/gl/signal.in.h
index e0f0554..8fb1ad1 100644
--- a/gl/signal.in.h
+++ b/gl/signal.in.h
@@ -55,7 +55,7 @@
#ifndef address@hidden@_SIGNAL_H
#define address@hidden@_SIGNAL_H
-/* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
+/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
pthread_sigmask in <pthread.h>, not in <signal.h>.
But avoid namespace pollution on glibc systems.*/
#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
@@ -197,7 +197,7 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1];
/* Test whether a given signal is contained in a signal set. */
# if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on MacOS X. */
+/* This function is defined as a macro on Mac OS X. */
# if defined __cplusplus && defined GNULIB_NAMESPACE
# undef sigismember
# endif
@@ -210,7 +210,7 @@ _GL_CXXALIASWARN (sigismember);
/* Initialize a signal set to the empty set. */
# if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on MacOS X. */
+/* This function is defined as a macro on Mac OS X. */
# if defined __cplusplus && defined GNULIB_NAMESPACE
# undef sigemptyset
# endif
@@ -222,7 +222,7 @@ _GL_CXXALIASWARN (sigemptyset);
/* Add a signal to a signal set. */
# if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on MacOS X. */
+/* This function is defined as a macro on Mac OS X. */
# if defined __cplusplus && defined GNULIB_NAMESPACE
# undef sigaddset
# endif
@@ -235,7 +235,7 @@ _GL_CXXALIASWARN (sigaddset);
/* Remove a signal from a signal set. */
# if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on MacOS X. */
+/* This function is defined as a macro on Mac OS X. */
# if defined __cplusplus && defined GNULIB_NAMESPACE
# undef sigdelset
# endif
@@ -248,7 +248,7 @@ _GL_CXXALIASWARN (sigdelset);
/* Fill a signal set with all possible signals. */
# if @HAVE_POSIX_SIGNALBLOCKING@
-/* This function is defined as a macro on MacOS X. */
+/* This function is defined as a macro on Mac OS X. */
# if defined __cplusplus && defined GNULIB_NAMESPACE
# undef sigfillset
# endif
diff --git a/gl/stdbool.in.h b/gl/stdbool.in.h
index ed1f9aa..1f8caee 100644
--- a/gl/stdbool.in.h
+++ b/gl/stdbool.in.h
@@ -66,24 +66,19 @@
# undef true
#endif
-/* For the sake of symbolic names in gdb, we define true and false as
- enum constants, not only as macros.
- It is tempting to write
- typedef enum { false = 0, true = 1 } _Bool;
- so that gdb prints values of type 'bool' symbolically. But if we do
- this, values of type '_Bool' may promote to 'int' or 'unsigned int'
- (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
- (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
- enum; this ensures that '_Bool' promotes to 'int'. */
-#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
+#ifdef __cplusplus
+# define _Bool bool
+# define bool bool
+#else
+# if defined __BEOS__ && !defined __HAIKU__
/* A compiler known to have 'bool'. */
/* If the compiler already has both 'bool' and '_Bool', we can assume they
are the same types. */
-# if address@hidden@
+# if address@hidden@
typedef bool _Bool;
-# endif
-#else
-# if !defined __GNUC__
+# endif
+# else
+# if !defined __GNUC__
/* If @HAVE__BOOL@:
Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
the built-in _Bool type is used. See
@@ -103,19 +98,35 @@ typedef bool _Bool;
"Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
The only benefit of the enum, debuggability, is not important
with these compilers. So use 'signed char' and no enum. */
-# define _Bool signed char
-# else
+# define _Bool signed char
+# else
/* With this compiler, trust the _Bool type if the compiler has it. */
-# if address@hidden@
+# if address@hidden@
+ /* For the sake of symbolic names in gdb, define true and false as
+ enum constants, not only as macros.
+ It is tempting to write
+ typedef enum { false = 0, true = 1 } _Bool;
+ so that gdb prints values of type 'bool' symbolically. But then
+ values of type '_Bool' might promote to 'int' or 'unsigned int'
+ (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+ (see ISO C 99 6.3.1.1.(2)). So add a negative value to the
+ enum; this ensures that '_Bool' promotes to 'int'. */
typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
+# endif
# endif
# endif
+# define bool _Bool
#endif
-#define bool _Bool
/* The other macros must be usable in preprocessor directives. */
-#define false 0
-#define true 1
+#ifdef __cplusplus
+# define false false
+# define true true
+#else
+# define false 0
+# define true 1
+#endif
+
#define __bool_true_false_are_defined 1
#endif /* _GL_STDBOOL_H */
diff --git a/gl/stdint.in.h b/gl/stdint.in.h
index 59c00d5..e2a0eb1 100644
--- a/gl/stdint.in.h
+++ b/gl/stdint.in.h
@@ -83,7 +83,7 @@
/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
AIX 5.2 <sys/types.h> isn't needed and causes troubles.
- MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+ Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
relies on the system <stdint.h> definitions, so include
<sys/types.h> after @address@hidden */
#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
diff --git a/gl/stdio-impl.h b/gl/stdio-impl.h
index 4935795..920b4d4 100644
--- a/gl/stdio-impl.h
+++ b/gl/stdio-impl.h
@@ -28,7 +28,7 @@
#include <errno.h> /* For detecting Plan9. */
-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
# if defined __DragonFly__ /* DragonFly */
/* See
<http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.
*/
@@ -66,7 +66,7 @@
/* More fields, not relevant here. */
};
# define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
-# else /* FreeBSD, NetBSD <= 1.5Z,
DragonFly, MacOS X, Cygwin */
+# else /* FreeBSD, NetBSD <= 1.5Z,
DragonFly, Mac OS X, Cygwin */
# define fp_ub fp_->_ub
# endif
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index b546133..1d67ec6 100644
--- a/gl/stdlib.in.h
+++ b/gl/stdlib.in.h
@@ -87,8 +87,8 @@ struct random_data
#endif
#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined
GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined
__WIN32__) && ! defined __CYGWIN__)
-/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */
-/* On MacOS X 10.5, only <unistd.h> declares mkstemps. */
+/* On Mac OS X 10.3, only <unistd.h> declares mkstemp. */
+/* On Mac OS X 10.5, only <unistd.h> declares mkstemps. */
/* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */
/* But avoid namespace pollution on glibc systems and native Windows. */
# include <unistd.h>
diff --git a/gl/strerror-override.c b/gl/strerror-override.c
index 9ca6523..9f55cfa 100644
--- a/gl/strerror-override.c
+++ b/gl/strerror-override.c
@@ -89,6 +89,8 @@ strerror_override (int errnum)
return "No route to host";
case EWOULDBLOCK:
return "Operation would block";
+#endif
+#if GNULIB_defined_ESTREAMS /* native Windows platforms with older <errno.h> */
case ETXTBSY:
return "Text file busy";
case ENODATA:
@@ -97,10 +99,6 @@ strerror_override (int errnum)
return "Out of streams resources";
case ENOSTR:
return "Device not a stream";
- case ENOTRECOVERABLE:
- return "State not recoverable";
- case EOWNERDEAD:
- return "Owner died";
case ETIME:
return "Timer expired";
case EOTHER:
@@ -283,6 +281,16 @@ strerror_override (int errnum)
return "Operation canceled";
#endif
+#if GNULIB_defined_EOWNERDEAD
+ case EOWNERDEAD:
+ return "Owner died";
+#endif
+
+#if GNULIB_defined_ENOTRECOVERABLE
+ case ENOTRECOVERABLE:
+ return "State not recoverable";
+#endif
+
default:
return NULL;
}
diff --git a/gl/strerror-override.h b/gl/strerror-override.h
index 09526ea..fe1fb2c 100644
--- a/gl/strerror-override.h
+++ b/gl/strerror-override.h
@@ -30,6 +30,7 @@
describing the error. Otherwise return NULL. */
# if REPLACE_STRERROR_0 \
|| GNULIB_defined_ESOCK \
+ || GNULIB_defined_ESTREAMS \
|| GNULIB_defined_EWINSOCK \
|| GNULIB_defined_ENOMSG \
|| GNULIB_defined_EIDRM \
@@ -43,7 +44,9 @@
|| GNULIB_defined_ECONNABORTED \
|| GNULIB_defined_ESTALE \
|| GNULIB_defined_EDQUOT \
- || GNULIB_defined_ECANCELED
+ || GNULIB_defined_ECANCELED \
+ || GNULIB_defined_EOWNERDEAD \
+ || GNULIB_defined_ENOTRECOVERABLE
extern const char *strerror_override (int errnum);
# else
# define strerror_override(ignored) NULL
diff --git a/gl/sys_select.in.h b/gl/sys_select.in.h
index 214d75d..ae8f90c 100644
--- a/gl/sys_select.in.h
+++ b/gl/sys_select.in.h
@@ -63,7 +63,7 @@
/* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
of 'struct timeval', and no definition of this type.
- Also, MacOS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
+ Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
in <sys/time.h>.
But avoid namespace pollution on glibc systems. */
# ifndef __GLIBC__
@@ -130,7 +130,7 @@
/* Re-define FD_ISSET to avoid a WSA call while we are not using
network sockets. */
-static inline int
+static int
rpl_fd_isset (SOCKET fd, fd_set * set)
{
u_int i;
diff --git a/gl/unistd.in.h b/gl/unistd.in.h
index 9115486..e904e51 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -1318,7 +1318,7 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
_GL_ARG_NONNULL ((1)));
# endif
-/* Need to cast, because on Solaris 11 2011-10, MacOS X 10.5, IRIX 6.5
+/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
and FreeBSD 6.4 the second parameter is int. On Solaris 11
2011-10, the first parameter is not const. */
_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
diff --git a/gl/vasnprintf.c b/gl/vasnprintf.c
index 0ebddf1..0261661 100644
--- a/gl/vasnprintf.c
+++ b/gl/vasnprintf.c
@@ -275,7 +275,7 @@ decimal_point_char (void)
{
const char *point;
/* Determine it in a multithread-safe way. We know nl_langinfo is
- multithread-safe on glibc systems and MacOS X systems, but is not required
+ multithread-safe on glibc systems and Mac OS X systems, but is not
required
to be multithread-safe by POSIX. sprintf(), however, is multithread-safe.
localeconv() is rarely multithread-safe. */
# if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined
__APPLE__ && defined __MACH__))
diff --git a/gl/verify.h b/gl/verify.h
index cef14ad..0c320b1 100644
--- a/gl/verify.h
+++ b/gl/verify.h
@@ -125,7 +125,7 @@
extern int (*dummy (void)) [sizeof (struct {...})];
* GCC warns about duplicate declarations of the dummy function if
- -Wredundant_decls is used. GCC 4.3 and later have a builtin
+ -Wredundant-decls is used. GCC 4.3 and later have a builtin
__COUNTER__ macro that can let us generate unique identifiers for
each dummy function, to suppress this warning.
@@ -133,6 +133,10 @@
which do not support _Static_assert, also do not warn about the
last declaration mentioned above.
+ * GCC warns if -Wnested-externs is enabled and verify() is used
+ within a function body; but inside a function, you can always
+ arrange to use verify_expr() instead.
+
* In C++, any struct definition inside sizeof is invalid.
Use a template type to work around the problem. */
diff --git a/gltests/init.sh b/gltests/init.sh
index f525a7c..5f6e638 100644
--- a/gltests/init.sh
+++ b/gltests/init.sh
@@ -411,8 +411,7 @@ path_prepend_ ()
case $path_dir_ in
'') fail_ "invalid path dir: '$1'";;
/*) abs_path_dir_=$path_dir_;;
- *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \
- || fail_ "invalid path dir: $path_dir_";;
+ *) abs_path_dir_=$initial_cwd_/$path_dir_;;
esac
case $abs_path_dir_ in
*:*) fail_ "invalid path dir: '$abs_path_dir_'";;
@@ -448,7 +447,7 @@ setup_ ()
pfx_=`testdir_prefix_`
test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
|| fail_ "failed to create temporary directory in $initial_cwd_"
- cd "$test_dir_"
+ cd "$test_dir_" || fail_ "failed to cd to temporary directory"
# As autoconf-generated configure scripts do, ensure that IFS
# is defined initially, so that saving and restoring $IFS works.
diff --git a/gltests/locale.in.h b/gltests/locale.in.h
index 7747902..4d3c543 100644
--- a/gltests/locale.in.h
+++ b/gltests/locale.in.h
@@ -30,7 +30,7 @@
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
-/* MacOS X 10.5 defines the locale_t type in <xlocale.h>. */
+/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>. */
#if @HAVE_XLOCALE_H@
# include <xlocale.h>
#endif
diff --git a/gltests/localename.c b/gltests/localename.c
index 869dbf2..e921e76 100644
--- a/gltests/localename.c
+++ b/gltests/localename.c
@@ -16,7 +16,7 @@
/* Written by Ulrich Drepper <address@hidden>, 1995. */
/* Native Windows code written by Tor Lillqvist <address@hidden>. */
-/* MacOS X code written by Bruno Haible <address@hidden>. */
+/* Mac OS X code written by Bruno Haible <address@hidden>. */
#include <config.h>
@@ -34,7 +34,7 @@
#include <string.h>
#if HAVE_USELOCALE
-/* MacOS X 10.5 defines the locale_t type in <xlocale.h>. */
+/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>. */
# if defined __APPLE__ && defined __MACH__
# include <xlocale.h>
# endif
@@ -1128,11 +1128,11 @@
#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-/* MacOS X 10.2 or newer */
+/* Mac OS X 10.2 or newer */
-/* Canonicalize a MacOS X locale name to a Unix locale name.
+/* Canonicalize a Mac OS X locale name to a Unix locale name.
NAME is a sufficiently large buffer.
- On input, it contains the MacOS X locale name.
+ On input, it contains the Mac OS X locale name.
On output, it contains the Unix locale name. */
# if !defined IN_LIBINTL
static
@@ -1145,9 +1145,9 @@ gl_locale_name_canonicalize (char *name)
http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
/* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
- ISO 3166) names. Prior to MacOS X 10.3, there is no API for doing this.
+ ISO 3166) names. Prior to Mac OS X 10.3, there is no API for doing this.
Therefore we do it ourselves, using a table based on the results of the
- MacOS X 10.3.8 function
+ Mac OS X 10.3.8 function
CFLocaleCreateCanonicalLocaleIdentifierFromString(). */
typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
legacy_entry;
@@ -1290,26 +1290,26 @@ gl_locale_name_canonicalize (char *name)
typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
langtag_entry;
static const langtag_entry langtag_table[] = {
- /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
+ /* Mac OS X has "az-Arab", "az-Cyrl", "az-Latn".
The default script for az on Unix is Latin. */
{ "az-Latn", "az" },
- /* MacOS X has "ga-dots". Does not yet exist on Unix. */
+ /* Mac OS X has "ga-dots". Does not yet exist on Unix. */
{ "ga-dots", "ga" },
- /* MacOS X has "kk-Cyrl". Does not yet exist on Unix. */
- /* MacOS X has "mn-Cyrl", "mn-Mong".
+ /* Mac OS X has "kk-Cyrl". Does not yet exist on Unix. */
+ /* Mac OS X has "mn-Cyrl", "mn-Mong".
The default script for mn on Unix is Cyrillic. */
{ "mn-Cyrl", "mn" },
- /* MacOS X has "ms-Arab", "ms-Latn".
+ /* Mac OS X has "ms-Arab", "ms-Latn".
The default script for ms on Unix is Latin. */
{ "ms-Latn", "ms" },
- /* MacOS X has "tg-Cyrl".
+ /* Mac OS X has "tg-Cyrl".
The default script for tg on Unix is Cyrillic. */
{ "tg-Cyrl", "tg" },
- /* MacOS X has "tk-Cyrl". Does not yet exist on Unix. */
- /* MacOS X has "tt-Cyrl".
+ /* Mac OS X has "tk-Cyrl". Does not yet exist on Unix. */
+ /* Mac OS X has "tt-Cyrl".
The default script for tt on Unix is Cyrillic. */
{ "tt-Cyrl", "tt" },
- /* MacOS X has "zh-Hans", "zh-Hant".
+ /* Mac OS X has "zh-Hans", "zh-Hant".
Country codes are used to distinguish these on Unix. */
{ "zh-Hans", "zh_CN" },
{ "zh-Hant", "zh_TW" }
@@ -2505,7 +2505,7 @@ gl_locale_name_from_win32_LCID (LCID lcid)
#endif
-#if HAVE_USELOCALE /* glibc or MacOS X */
+#if HAVE_USELOCALE /* glibc or Mac OS X */
/* Simple hash set of strings. We don't want to drag in lots of hash table
code here. */
@@ -2617,20 +2617,20 @@ gl_locale_name_thread_unsafe (int category, const char
*categoryname)
name = thread_locale->__names[category];
return name;
# endif
-# if defined __APPLE__ && defined __MACH__ /* MacOS X */
+# if defined __APPLE__ && defined __MACH__ /* Mac OS X */
/* The locale name is found deep in an undocumented data structure.
Since it's stored in a buffer of size 32 and newlocale() rejects
locale names of length > 31, we can assume that it is NUL terminated
in this buffer. But we need to make a copy of the locale name, of
indefinite extent. */
- struct _xlocale_part1_v0 /* used in MacOS X 10.5 */
+ struct _xlocale_part1_v0 /* used in Mac OS X 10.5 */
{
int32_t __refcount;
void (*__free_extra)(void *);
__darwin_mbstate_t __mbs[10];
int64_t __magic;
};
- struct _xlocale_part1_v1 /* used in MacOS X >= 10.6.0 */
+ struct _xlocale_part1_v1 /* used in Mac OS X >= 10.6.0 */
{
int32_t __refcount;
void (*__free_extra)(void *);
@@ -2702,18 +2702,18 @@ gl_locale_name_thread_unsafe (int category, const char
*categoryname)
struct _xlocale_part2 *tlp;
if (((struct _xlocale_part1_v0 *) thread_locale)->__magic
== 0x786C6F63616C6530LL)
- /* MacOS X 10.5 */
+ /* Mac OS X 10.5 */
tlp =
(struct _xlocale_part2 *)
&((struct _xlocale_part1_v0 *) thread_locale)->__magic;
else if (((struct _xlocale_part1_v1 *) thread_locale)->__magic
== 0x786C6F63616C6530LL)
- /* MacOS X >= 10.6.0 */
+ /* Mac OS X >= 10.6.0 */
tlp =
(struct _xlocale_part2 *)
&((struct _xlocale_part1_v1 *) thread_locale)->__magic;
else
- /* Unsupported version of MacOS X: The internals of 'struct _xlocale'
+ /* Unsupported version of Mac OS X: The internals of 'struct
_xlocale'
have changed again. */
return "";
switch (category)
@@ -2784,8 +2784,8 @@ gl_locale_name_posix (int category, const char
*categoryname)
/* On other systems we ignore what setlocale reports and instead look at the
environment variables directly. This is necessary
1. on systems which have a facility for customizing the default locale
- (MacOS X, native Windows, Cygwin) and where the system's setlocale()
- function ignores this default locale (MacOS X, Cygwin), in two cases:
+ (Mac OS X, native Windows, Cygwin) and where the system's setlocale()
+ function ignores this default locale (Mac OS X, Cygwin), in two
cases:
a. when the user missed to use the setlocale() override from libintl
(for example by not including <libintl.h>),
b. when setlocale supports only the "C" locale, such as on Cygwin
@@ -2820,7 +2820,7 @@ gl_locale_name_environ (int category, const char
*categoryname)
if (retval != NULL && retval[0] != '\0')
{
#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
- /* MacOS X 10.2 or newer.
+ /* Mac OS X 10.2 or newer.
Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0)
#endif
@@ -2847,10 +2847,10 @@ gl_locale_name_default (void)
locale, customizing it for each location. POSIX:2001 does not require
such a facility.
- The systems with such a facility are MacOS X and Windows: They provide a
+ The systems with such a facility are Mac OS X and Windows: They provide a
GUI that allows the user to choose a locale.
- - On MacOS X, by default, none of LC_* or LANG are set. Starting with
- MacOS X 10.4 or 10.5, LANG is set for processes launched by the
+ - On Mac OS X, by default, none of LC_* or LANG are set. Starting with
+ Mac OS X 10.4 or 10.5, LANG is set for processes launched by the
'Terminal' application (but sometimes to an incorrect value "UTF-8").
When no environment variable is set, setlocale (LC_ALL, "") uses the
"C" locale.
@@ -2880,7 +2880,7 @@ gl_locale_name_default (void)
codeset. */
# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
- /* MacOS X 10.2 or newer */
+ /* Mac OS X 10.2 or newer */
{
/* Cache the locale name, since CoreFoundation calls are expensive. */
static const char *cached_localename;
@@ -2888,7 +2888,7 @@ gl_locale_name_default (void)
if (cached_localename == NULL)
{
char namebuf[256];
-# if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
+# if HAVE_CFLOCALECOPYCURRENT /* Mac OS X 10.3 or newer */
CFLocaleRef locale = CFLocaleCopyCurrent ();
CFStringRef name = CFLocaleGetIdentifier (locale);
@@ -2899,7 +2899,7 @@ gl_locale_name_default (void)
cached_localename = strdup (namebuf);
}
CFRelease (locale);
-# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
+# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* Mac OS X 10.2 or newer */
CFTypeRef value =
CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
kCFPreferencesCurrentApplication);
diff --git a/gltests/stat.c b/gltests/stat.c
index 1fc633e..7599540 100644
--- a/gltests/stat.c
+++ b/gltests/stat.c
@@ -29,6 +29,7 @@
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
# if _GL_WINDOWS_64_BIT_ST_SIZE
+# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
# define stat _stati64
# define REPLACE_FUNC_STAT_DIR 1
# undef REPLACE_FUNC_STAT_FILE
diff --git a/gltests/test-alloca-opt.c b/gltests/test-alloca-opt.c
index 4e814c6..6b9a4d7 100644
--- a/gltests/test-alloca-opt.c
+++ b/gltests/test-alloca-opt.c
@@ -44,7 +44,7 @@ main ()
{
/* Try various values.
n = 0 gave a crash on Alpha with gcc-2.5.8.
- Some versions of MacOS X have a stack size limit of 512 KB. */
+ Some versions of Mac OS X have a stack size limit of 512 KB. */
func (34);
func (134);
func (399);
diff --git a/gltests/test-errno.c b/gltests/test-errno.c
index d9a030f..8d00717 100644
--- a/gltests/test-errno.c
+++ b/gltests/test-errno.c
@@ -98,6 +98,8 @@ int e115 = EINPROGRESS;
int e116 = ESTALE;
int e122 = EDQUOT;
int e125 = ECANCELED;
+int e130 = EOWNERDEAD;
+int e131 = ENOTRECOVERABLE;
/* Don't verify that these errno values are all different, except for possibly
EWOULDBLOCK == EAGAIN. Even Linux/x86 does not pass this check: it has
diff --git a/gltests/test-localename.c b/gltests/test-localename.c
index f04c301..37b76a3 100644
--- a/gltests/test-localename.c
+++ b/gltests/test-localename.c
@@ -715,7 +715,7 @@ test_locale_name_default (void)
ASSERT (name != NULL);
- /* Only MacOS X and Windows have a facility for the user to set the default
+ /* Only Mac OS X and Windows have a facility for the user to set the default
locale. */
#if !((defined __APPLE__ && defined __MACH__) || (defined _WIN32 || defined
__WIN32__ || defined __CYGWIN__))
ASSERT (strcmp (name, "C") == 0);
diff --git a/gltests/test-malloca.c b/gltests/test-malloca.c
index d7732c3..9c7109c 100644
--- a/gltests/test-malloca.c
+++ b/gltests/test-malloca.c
@@ -45,7 +45,7 @@ main ()
{
/* Try various values.
n = 0 gave a crash on Alpha with gcc-2.5.8.
- Some versions of MacOS X have a stack size limit of 512 KB. */
+ Some versions of Mac OS X have a stack size limit of 512 KB. */
func (34);
func (134);
func (399);
diff --git a/gltests/test-time.c b/gltests/test-time.c
index acf3d2d..11a4208 100644
--- a/gltests/test-time.c
+++ b/gltests/test-time.c
@@ -26,7 +26,7 @@
struct timespec t1;
#if 0
/* POSIX:2008 does not require pid_t in <time.h> unconditionally, and indeed
- it's missing on MacOS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */
+ it's missing on Mac OS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */
pid_t t2;
#endif
diff --git a/lib/build-aux/gendocs.sh b/lib/build-aux/gendocs.sh
index c8abd55..c293f96 100755
--- a/lib/build-aux/gendocs.sh
+++ b/lib/build-aux/gendocs.sh
@@ -2,10 +2,10 @@
# gendocs.sh -- generate a GNU manual in many formats. This script is
# mentioned in maintain.texi. See the help message below for usage details.
-scriptversion=2011-04-08.14
+scriptversion=2012-09-02.17
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# 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
@@ -51,15 +51,16 @@ unset use_texi2html
version="gendocs.sh $scriptversion
-Copyright 2010 Free Software Foundation, Inc.
+Copyright 2012 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING."
usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE
-Generate various output formats from PACKAGE.texinfo (or .texi or .txi) source.
-See the GNU Maintainers document for a more extensive discussion:
+Generate output in various formats from PACKAGE.texinfo (or .texi or
+.txi) source. See the GNU Maintainers document for a more extensive
+discussion:
http://www.gnu.org/prep/maintain_toc.html
Options:
@@ -68,6 +69,7 @@ Options:
--email ADR use ADR as contact in generated web pages.
--docbook convert to DocBook too (xml, txt, html, pdf and ps).
--html ARG pass indicated ARG to makeinfo or texi2html for HTML targets.
+ --info ARG pass indicated ARG to makeinfo for Info, instead of --no-split.
--texi2html use texi2html to generate HTML targets.
--help display this help and exit successfully.
--version display version information and exit successfully.
@@ -80,11 +82,11 @@ Typical sequence:
wget \"$templateurl\"
$prog --email BUGLIST MANUAL \"GNU MANUAL - One-line description\"
-Output will be in a new subdirectory \"manual\" (by default, use -o OUTDIR
-to override). Move all the new files into your web CVS tree, as
-explained in the Web Pages node of maintain.texi.
+Output will be in a new subdirectory \"manual\" (by default;
+use -o OUTDIR to override). Move all the new files into your web CVS
+tree, as explained in the Web Pages node of maintain.texi.
-Please use the --email ADDRESS option to specify your bug-reporting
+Please do use the --email ADDRESS option to specify your bug-reporting
address in the generated HTML pages.
MANUAL-TITLE is included as part of the HTML <title> of the overall
@@ -102,6 +104,9 @@ If a manual's Texinfo sources are spread across several
directories,
first copy or symlink all Texinfo sources into a single directory.
(Part of the script's work is to make a tar.gz of the sources.)
+As implied above, by default monolithic Info files are generated.
+If you want split Info, or other Info options, use --info to override.
+
You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML, and
DVIPS to control the programs that get executed, and
GENDOCS_TEMPLATE_DIR to control where the gendocs_template file is
@@ -126,6 +131,7 @@ MANUAL_TITLE=
PACKAGE=
address@hidden # please override with --email
htmlarg=
+infoarg=--no-split
outdir=manual
srcfile=
@@ -138,6 +144,7 @@ while test $# -gt 0; do
-o) shift; outdir=$1;;
--docbook) docbook=yes;;
--html) shift; htmlarg=$1;;
+ --info) shift; infoarg=$1;;
--texi2html) use_texi2html=1;;
-*)
echo "$0: Unknown option \`$1'." >&2
@@ -188,10 +195,10 @@ case $outdir in
*) abs_outdir=$srcdir/$outdir;;
esac
-echo Generating output formats for $srcfile
+echo "Generating output formats for $srcfile"
-cmd="$SETLANG $MAKEINFO -o $PACKAGE.info \"$srcfile\""
-echo "Generating info files... ($cmd)"
+cmd="$SETLANG $MAKEINFO -o $PACKAGE.info $infoarg \"$srcfile\""
+echo "Generating info file(s)... ($cmd)"
eval "$cmd"
mkdir -p "$outdir/"
tar czf "$outdir/$PACKAGE.info.tar.gz" $PACKAGE.info*
@@ -204,7 +211,7 @@ echo "Generating dvi ... ($cmd)"
eval "$cmd"
# now, before we compress dvi:
-echo Generating postscript...
+echo "Generating postscript..."
${DVIPS} $PACKAGE -o
gzip -f -9 $PACKAGE.ps
ps_gz_size=`calcsize $PACKAGE.ps.gz`
diff --git a/lib/build-aux/gnupload b/lib/build-aux/gnupload
index 40a59d3..a0e5c7b 100755
--- a/lib/build-aux/gnupload
+++ b/lib/build-aux/gnupload
@@ -1,7 +1,7 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2012-01-15.15; # UTC
+scriptversion=2012-06-11.00; # UTC
# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
@@ -28,6 +28,7 @@ GPG='gpg --batch --no-tty'
conffile=.gnuploadrc
to=
dry_run=false
+replace=
symlink_files=
delete_files=
delete_symlinks=
@@ -53,8 +54,10 @@ Options:
--to DEST specify one destination for FILES
(multiple --to options are allowed)
--user NAME sign with key NAME
+ --replace allow replacements of existing files
--symlink-regex[=EXPR] use sed script EXPR to compute symbolic link names
--dry-run do nothing, show what would have been done
+ (including the constructed directive file)
--version output version information and exit
If --symlink-regex is given without EXPR, then the link target name
@@ -146,6 +149,9 @@ while test -n "$1"; do
--delete)
collect_var=delete_files
;;
+ --replace)
+ replace="replace: true"
+ ;;
--rmsymlink)
collect_var=delete_symlinks
;;
@@ -243,11 +249,13 @@ unset passphrase
# listings with their arguments...).
# Remember this script runs with 'set -e', so if echo is not built-in
# it will exit now.
-PATH=/empty echo -n "Enter GPG passphrase: "
-stty -echo
-read -r passphrase
-stty echo
-echo
+if $dry_run; then :; else
+ PATH=/empty echo -n "Enter GPG passphrase: "
+ stty -echo
+ read -r passphrase
+ stty echo
+ echo
+fi
if test $# -ne 0; then
for file
@@ -270,7 +278,7 @@ filename: $3$stmt"
fi
cat >${2}.directive<<EOF
-version: 1.1
+version: 1.2
directory: $1
comment: gnupload v. $scriptversion$stmt
EOF
@@ -393,6 +401,12 @@ do
do
echo "Uploading $file to $dest ..."
stmt=
+ #
+ # allowing file replacement is all or nothing.
+ if test -n "$replace"; then stmt="$stmt
+$replace"
+ fi
+ #
files="$file $file.sig"
destdir=`echo $dest | sed 's/[^:]*://'`
if test -n "$symlink_expr"; then
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index 089f609..d653268 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -252,7 +252,7 @@ libgl_la_SOURCES += gettext.h
distclean-local: clean-GNUmakefile
clean-GNUmakefile:
- test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || :
+ test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile
EXTRA_DIST += $(top_srcdir)/GNUmakefile
diff --git a/lib/gl/alloca.in.h b/lib/gl/alloca.in.h
index e5f4e0e..feafbc5 100644
--- a/lib/gl/alloca.in.h
+++ b/lib/gl/alloca.in.h
@@ -44,6 +44,13 @@
# define alloca _alloca
# elif defined __DECC && defined __VMS
# define alloca __ALLOCA
+# elif defined __TANDEM && defined _TNS_E_TARGET
+# ifdef __cplusplus
+extern "C"
+# endif
+void *_alloca (unsigned short);
+# pragma intrinsic (_alloca)
+# define alloca _alloca
# else
# include <stddef.h>
# ifdef __cplusplus
diff --git a/lib/gl/base64.h b/lib/gl/base64.h
index 251e10d..55bc5d5 100644
--- a/lib/gl/base64.h
+++ b/lib/gl/base64.h
@@ -24,6 +24,10 @@
/* Get bool. */
# include <stdbool.h>
+# ifdef __cplusplus
+extern "C" {
+# endif
+
/* This uses that the expression (n+(k-1))/k means the smallest
integer >= n/k, i.e., the ceiling of n/k. */
# define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
@@ -57,4 +61,8 @@ extern bool base64_decode_alloc_ctx (struct
base64_decode_context *ctx,
#define base64_decode_alloc(in, inlen, out, outlen) \
base64_decode_alloc_ctx (NULL, in, inlen, out, outlen)
+# ifdef __cplusplus
+}
+# endif
+
#endif /* BASE64_H */
diff --git a/lib/gl/errno.in.h b/lib/gl/errno.in.h
index d14a2a0..a7df255 100644
--- a/lib/gl/errno.in.h
+++ b/lib/gl/errno.in.h
@@ -84,6 +84,16 @@
# define GNULIB_defined_ECANCELED 1
# endif
+# ifndef EOWNERDEAD
+# define EOWNERDEAD 133
+# define GNULIB_defined_EOWNERDEAD 1
+# endif
+
+# ifndef ENOTRECOVERABLE
+# define ENOTRECOVERABLE 127
+# define GNULIB_defined_ENOTRECOVERABLE 1
+# endif
+
# ifndef EINPROGRESS
# define EINPROGRESS 112
# define EALREADY 103
@@ -108,15 +118,17 @@
# define ELOOP 114
# define EHOSTUNREACH 110
# define EWOULDBLOCK 140
+# define GNULIB_defined_ESOCK 1
+# endif
+
+# ifndef ETXTBSY
# define ETXTBSY 139
# define ENODATA 120 /* not required by POSIX */
# define ENOSR 124 /* not required by POSIX */
# define ENOSTR 125 /* not required by POSIX */
-# define ENOTRECOVERABLE 127 /* not required by POSIX */
-# define EOWNERDEAD 133 /* not required by POSIX */
# define ETIME 137 /* not required by POSIX */
# define EOTHER 131 /* not required by POSIX */
-# define GNULIB_defined_ESOCK 1
+# define GNULIB_defined_ESTREAMS 1
# endif
/* These are intentionally the same values as the WSA* error numbers, defined
@@ -227,6 +239,36 @@
# define GNULIB_defined_ECANCELED 1
# endif
+/* On many platforms, the macros EOWNERDEAD and ENOTRECOVERABLE are not
+ defined. */
+
+# ifndef EOWNERDEAD
+# if defined __sun
+ /* Use the same values as defined for Solaris >= 8, for
+ interoperability. */
+# define EOWNERDEAD 58
+# define ENOTRECOVERABLE 59
+# elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+ /* We have a conflict here: pthreads-win32 defines these values
+ differently than MSVC 10. It's hairy to decide which one to use. */
+# if defined __MINGW32__ && !defined USE_WINDOWS_THREADS
+ /* Use the same values as defined by pthreads-win32, for
+ interoperability. */
+# define EOWNERDEAD 43
+# define ENOTRECOVERABLE 44
+# else
+ /* Use the same values as defined by MSVC 10, for
+ interoperability. */
+# define EOWNERDEAD 133
+# define ENOTRECOVERABLE 127
+# endif
+# else
+# define EOWNERDEAD 2013
+# define ENOTRECOVERABLE 2014
+# endif
+# define GNULIB_defined_EOWNERDEAD 1
+# define GNULIB_defined_ENOTRECOVERABLE 1
+# endif
#endif /* address@hidden@_ERRNO_H */
#endif /* address@hidden@_ERRNO_H */
diff --git a/lib/gl/gettext.h b/lib/gl/gettext.h
index 7628316..5aa525e 100644
--- a/lib/gl/gettext.h
+++ b/lib/gl/gettext.h
@@ -107,80 +107,4 @@
initializer for static 'char[]' or 'const char[]' variables. */
#define gettext_noop(String) String
-/* The separator between msgctxt and msgid in a .mo file. */
-#define GETTEXT_CONTEXT_GLUE "\004"
-
-/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
- MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
- short and rarely need to change.
- The letter 'p' stands for 'particular' or 'special'. */
-#ifdef DEFAULT_TEXT_DOMAIN
-# define pgettext(Msgctxt, Msgid) \
- pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, LC_MESSAGES)
-#else
-# define pgettext(Msgctxt, Msgid) \
- pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#endif
-#define dpgettext(Domainname, Msgctxt, Msgid) \
- pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
LC_MESSAGES)
-#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
- pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
Category)
-#ifdef DEFAULT_TEXT_DOMAIN
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, MsgidPlural, N, LC_MESSAGES)
-#else
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
-#endif
-#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
- npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
-#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
- npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, Category)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-pgettext_aux (const char *domain,
- const char *msg_ctxt_id, const char *msgid,
- int category)
-{
- const char *translation = dcgettext (domain, msg_ctxt_id, category);
- if (translation == msg_ctxt_id)
- return msgid;
- else
- return translation;
-}
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-npgettext_aux (const char *domain,
- const char *msg_ctxt_id, const char *msgid,
- const char *msgid_plural, unsigned long int n,
- int category)
-{
- const char *translation =
- dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
- if (translation == msg_ctxt_id || translation == msgid_plural)
- return (n == 1 ? msgid : msgid_plural);
- else
- return translation;
-}
-
-/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID
- can be arbitrary expressions. But for string literals these macros are
- less efficient than those above. */
-
-#include <string.h>
-
#endif /* _LIBGETTEXT_H */
diff --git a/lib/gl/m4/errno_h.m4 b/lib/gl/m4/errno_h.m4
index 4f0bb83..1e76ba2 100644
--- a/lib/gl/m4/errno_h.m4
+++ b/lib/gl/m4/errno_h.m4
@@ -1,4 +1,4 @@
-# errno_h.m4 serial 10
+# errno_h.m4 serial 11
dnl Copyright (C) 2004, 2006, 2008-2012 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,9 @@ AC_DEFUN_ONCE([gl_HEADER_ERRNO_H],
AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
AC_EGREP_CPP([booboo],[
#include <errno.h>
+#if !defined ETXTBSY
+booboo
+#endif
#if !defined ENOMSG
booboo
#endif
@@ -49,6 +52,12 @@ booboo
#if !defined ECANCELED
booboo
#endif
+#if !defined EOWNERDEAD
+booboo
+#endif
+#if !defined ENOTRECOVERABLE
+booboo
+#endif
],
[gl_cv_header_errno_h_complete=no],
[gl_cv_header_errno_h_complete=yes])
diff --git a/lib/gl/m4/extensions.m4 b/lib/gl/m4/extensions.m4
index 0bfaef6..6d17d8a 100644
--- a/lib/gl/m4/extensions.m4
+++ b/lib/gl/m4/extensions.m4
@@ -1,4 +1,4 @@
-# serial 11 -*- Autoconf -*-
+# serial 12 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -67,7 +67,7 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-/* Enable general extensions on MacOS X. */
+/* Enable general extensions on Mac OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
diff --git a/lib/gl/m4/fdopen.m4 b/lib/gl/m4/fdopen.m4
index 9ca9d2a..14f1554 100644
--- a/lib/gl/m4/fdopen.m4
+++ b/lib/gl/m4/fdopen.m4
@@ -1,4 +1,4 @@
-# fdopen.m4 serial 2
+# fdopen.m4 serial 3
dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -25,10 +25,8 @@ main (void)
FILE *fp;
errno = 0;
fp = fdopen (-1, "r");
- if (fp != NULL)
+ if (fp == NULL && errno == 0)
return 1;
- if (errno == 0)
- return 2;
return 0;
}]])],
[gl_cv_func_fdopen_works=yes],
diff --git a/lib/gl/m4/gettext.m4 b/lib/gl/m4/gettext.m4
index 5415f88..017d025 100644
--- a/lib/gl/m4/gettext.m4
+++ b/lib/gl/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 64 (gettext-0.18.2)
+# gettext.m4 serial 66 (gettext-0.18.2)
dnl Copyright (C) 1995-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
- dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
gt_INTL_MACOSX
dnl Set USE_NLS.
diff --git a/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4
index 73042e1..5fd80ac 100644
--- a/lib/gl/m4/gnulib-cache.m4
+++ b/lib/gl/m4/gnulib-cache.m4
@@ -69,5 +69,5 @@ gl_MAKEFILE_NAME([])
gl_LIBTOOL
gl_MACRO_PREFIX([gl])
gl_PO_DOMAIN([])
-gl_WITNESS_C_DOMAIN([])
+gl_WITNESS_C_MACRO([])
gl_VC_FILES([false])
diff --git a/lib/gl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index d62b767..15d2b2b 100644
--- a/lib/gl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 32
+# gnulib-common.m4 serial 33
dnl Copyright (C) 2007-2012 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,7 @@ AC_DEFUN([gl_COMMON_BODY], [
[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
- __APPLE__ && __MACH__ test for MacOS X.
+ __APPLE__ && __MACH__ test for Mac OS X.
__APPLE_CC__ tests for the Apple compiler and its version.
__STDC_VERSION__ tests for the C99 mode. */
#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined
__cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index c6fdb89..e7bf121 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -168,130 +168,130 @@ AC_DEFUN([gl_INIT],
m4_pushdef([gl_LIBSOURCES_DIR], [])
gl_COMMON
gl_source_base='gl'
-gl_FUNC_ALLOCA
-gl_FUNC_BASE64
-gl_GC
-if test "$ac_cv_libgcrypt" = yes; then
- AC_LIBOBJ([gc-libgcrypt])
-else
- AC_LIBOBJ([gc-gnulib])
-fi
-if test $gl_cond_libtool = false; then
- gl_ltlibdeps="$gl_ltlibdeps $LTLIBGCRYPT"
- gl_libdeps="$gl_libdeps $LIBGCRYPT"
-fi
-gl_GC_HMAC_MD5
-gl_MODULE_INDICATOR([gc-hmac-md5])
-gl_GC_HMAC_SHA1
-gl_MODULE_INDICATOR([gc-hmac-sha1])
-gl_GC_MD5
-gl_MODULE_INDICATOR([gc-md5])
-gl_GC_RANDOM
-gl_MODULE_INDICATOR([gc-random])
-gl_GC_SHA1
-gl_MODULE_INDICATOR([gc-sha1])
-gl_MD5
-gl_SHA1
-gl_HEADER_ERRNO_H
-gl_FLOAT_H
-if test $REPLACE_FLOAT_LDBL = 1; then
- AC_LIBOBJ([float])
-fi
-if test $REPLACE_ITOLD = 1; then
- AC_LIBOBJ([itold])
-fi
-gl_FUNC_GETDELIM
-if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
- AC_LIBOBJ([getdelim])
- gl_PREREQ_GETDELIM
-fi
-gl_STDIO_MODULE_INDICATOR([getdelim])
-gl_FUNC_GETLINE
-if test $REPLACE_GETLINE = 1; then
- AC_LIBOBJ([getline])
- gl_PREREQ_GETLINE
-fi
-gl_STDIO_MODULE_INDICATOR([getline])
-dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
-AM_GNU_GETTEXT_VERSION([0.18.1])
-AC_SUBST([LIBINTL])
-AC_SUBST([LTLIBINTL])
-# Autoconf 2.61a.99 and earlier don't support linking a file only
-# in VPATH builds. But since GNUmakefile is for maintainer use
-# only, it does not matter if we skip the link with older autoconf.
-# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
-# builds, so use a shell variable to bypass this.
-GNUmakefile=GNUmakefile
-m4_if(m4_version_compare([2.61a.100],
- m4_defn([m4_PACKAGE_VERSION])), [1], [],
- [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
- [GNUmakefile=$GNUmakefile])])
-sj_GSS_EXTRA
-gl_LD_OUTPUT_DEF
-gl_LD_VERSION_SCRIPT
-gl_VISIBILITY
-AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
- [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
-gl_FUNC_MEMCHR
-if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
- AC_LIBOBJ([memchr])
- gl_PREREQ_MEMCHR
-fi
-gl_STRING_MODULE_INDICATOR([memchr])
-gl_FUNC_MEMMEM
-if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
- AC_LIBOBJ([memmem])
-fi
-gl_FUNC_MEMMEM_SIMPLE
-if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
- AC_LIBOBJ([memmem])
-fi
-gl_STRING_MODULE_INDICATOR([memmem])
-gl_MEMXOR
-gl_MINMAX
-gl_MULTIARCH
-gl_FUNC_REALLOC_POSIX
-if test $REPLACE_REALLOC = 1; then
- AC_LIBOBJ([realloc])
-fi
-gl_STDLIB_MODULE_INDICATOR([realloc-posix])
-gl_SIZE_MAX
-gt_TYPE_SSIZE_T
-gl_STDALIGN_H
-AM_STDBOOL_H
-gl_STDDEF_H
-gl_STDINT_H
-gl_STDIO_H
-gl_STDLIB_H
-gl_HEADER_STRING_H
-gl_FUNC_STRNDUP
-if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
- AC_LIBOBJ([strndup])
-fi
-gl_STRING_MODULE_INDICATOR([strndup])
-gl_FUNC_STRNLEN
-if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
- AC_LIBOBJ([strnlen])
- gl_PREREQ_STRNLEN
-fi
-gl_STRING_MODULE_INDICATOR([strnlen])
-gl_FUNC_STRVERSCMP
-if test $HAVE_STRVERSCMP = 0; then
- AC_LIBOBJ([strverscmp])
- gl_PREREQ_STRVERSCMP
-fi
-gl_STRING_MODULE_INDICATOR([strverscmp])
-gl_SYS_TYPES_H
-AC_PROG_MKDIR_P
-gl_UNISTD_H
-gl_FUNC_VASNPRINTF
-gl_FUNC_VASPRINTF
-gl_STDIO_MODULE_INDICATOR([vasprintf])
-m4_ifdef([AM_XGETTEXT_OPTION],
- [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
- AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
-gl_WCHAR_H
-gl_XSIZE
+ gl_FUNC_ALLOCA
+ gl_FUNC_BASE64
+ gl_GC
+ if test "$ac_cv_libgcrypt" = yes; then
+ AC_LIBOBJ([gc-libgcrypt])
+ else
+ AC_LIBOBJ([gc-gnulib])
+ fi
+ if test $gl_cond_libtool = false; then
+ gl_ltlibdeps="$gl_ltlibdeps $LTLIBGCRYPT"
+ gl_libdeps="$gl_libdeps $LIBGCRYPT"
+ fi
+ gl_GC_HMAC_MD5
+ gl_MODULE_INDICATOR([gc-hmac-md5])
+ gl_GC_HMAC_SHA1
+ gl_MODULE_INDICATOR([gc-hmac-sha1])
+ gl_GC_MD5
+ gl_MODULE_INDICATOR([gc-md5])
+ gl_GC_RANDOM
+ gl_MODULE_INDICATOR([gc-random])
+ gl_GC_SHA1
+ gl_MODULE_INDICATOR([gc-sha1])
+ gl_MD5
+ gl_SHA1
+ gl_HEADER_ERRNO_H
+ gl_FLOAT_H
+ if test $REPLACE_FLOAT_LDBL = 1; then
+ AC_LIBOBJ([float])
+ fi
+ if test $REPLACE_ITOLD = 1; then
+ AC_LIBOBJ([itold])
+ fi
+ gl_FUNC_GETDELIM
+ if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
+ AC_LIBOBJ([getdelim])
+ gl_PREREQ_GETDELIM
+ fi
+ gl_STDIO_MODULE_INDICATOR([getdelim])
+ gl_FUNC_GETLINE
+ if test $REPLACE_GETLINE = 1; then
+ AC_LIBOBJ([getline])
+ gl_PREREQ_GETLINE
+ fi
+ gl_STDIO_MODULE_INDICATOR([getline])
+ dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
+ AM_GNU_GETTEXT_VERSION([0.18.1])
+ AC_SUBST([LIBINTL])
+ AC_SUBST([LTLIBINTL])
+ # Autoconf 2.61a.99 and earlier don't support linking a file only
+ # in VPATH builds. But since GNUmakefile is for maintainer use
+ # only, it does not matter if we skip the link with older autoconf.
+ # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
+ # builds, so use a shell variable to bypass this.
+ GNUmakefile=GNUmakefile
+ m4_if(m4_version_compare([2.61a.100],
+ m4_defn([m4_PACKAGE_VERSION])), [1], [],
+ [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
+ [GNUmakefile=$GNUmakefile])])
+ sj_GSS_EXTRA
+ gl_LD_OUTPUT_DEF
+ gl_LD_VERSION_SCRIPT
+ gl_VISIBILITY
+ AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
+ [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
+ gl_FUNC_MEMCHR
+ if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+ AC_LIBOBJ([memchr])
+ gl_PREREQ_MEMCHR
+ fi
+ gl_STRING_MODULE_INDICATOR([memchr])
+ gl_FUNC_MEMMEM
+ if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
+ AC_LIBOBJ([memmem])
+ fi
+ gl_FUNC_MEMMEM_SIMPLE
+ if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
+ AC_LIBOBJ([memmem])
+ fi
+ gl_STRING_MODULE_INDICATOR([memmem])
+ gl_MEMXOR
+ gl_MINMAX
+ gl_MULTIARCH
+ gl_FUNC_REALLOC_POSIX
+ if test $REPLACE_REALLOC = 1; then
+ AC_LIBOBJ([realloc])
+ fi
+ gl_STDLIB_MODULE_INDICATOR([realloc-posix])
+ gl_SIZE_MAX
+ gt_TYPE_SSIZE_T
+ gl_STDALIGN_H
+ AM_STDBOOL_H
+ gl_STDDEF_H
+ gl_STDINT_H
+ gl_STDIO_H
+ gl_STDLIB_H
+ gl_HEADER_STRING_H
+ gl_FUNC_STRNDUP
+ if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
+ AC_LIBOBJ([strndup])
+ fi
+ gl_STRING_MODULE_INDICATOR([strndup])
+ gl_FUNC_STRNLEN
+ if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
+ AC_LIBOBJ([strnlen])
+ gl_PREREQ_STRNLEN
+ fi
+ gl_STRING_MODULE_INDICATOR([strnlen])
+ gl_FUNC_STRVERSCMP
+ if test $HAVE_STRVERSCMP = 0; then
+ AC_LIBOBJ([strverscmp])
+ gl_PREREQ_STRVERSCMP
+ fi
+ gl_STRING_MODULE_INDICATOR([strverscmp])
+ gl_SYS_TYPES_H
+ AC_PROG_MKDIR_P
+ gl_UNISTD_H
+ gl_FUNC_VASNPRINTF
+ gl_FUNC_VASPRINTF
+ gl_STDIO_MODULE_INDICATOR([vasprintf])
+ m4_ifdef([AM_XGETTEXT_OPTION],
+ [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
+ AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
+ gl_WCHAR_H
+ gl_XSIZE
# End of code from modules
m4_ifval(gl_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -338,37 +338,37 @@ changequote([, ])dnl
AC_SUBST([gltests_WITNESS])
gl_module_indicator_condition=$gltests_WITNESS
m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
-gl_FUNC_FDOPEN
-if test $REPLACE_FDOPEN = 1; then
- AC_LIBOBJ([fdopen])
- gl_PREREQ_FDOPEN
-fi
-gl_STDIO_MODULE_INDICATOR([fdopen])
-gl_FUNC_GETPAGESIZE
-if test $REPLACE_GETPAGESIZE = 1; then
- AC_LIBOBJ([getpagesize])
-fi
-gl_UNISTD_MODULE_INDICATOR([getpagesize])
-gl_INTTYPES_H
-gl_INTTYPES_INCOMPLETE
-dnl Check for prerequisites for memory fence checks.
-gl_FUNC_MMAP_ANON
-AC_CHECK_HEADERS_ONCE([sys/mman.h])
-AC_CHECK_FUNCS_ONCE([mprotect])
-gl_FUNC_MMAP_ANON
-AC_CHECK_HEADERS_ONCE([sys/mman.h])
-AC_CHECK_FUNCS_ONCE([mprotect])
-AC_CHECK_DECLS_ONCE([alarm])
-gl_MSVC_INVAL
-if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
- AC_LIBOBJ([msvc-inval])
-fi
-gt_TYPE_WCHAR_T
-gt_TYPE_WINT_T
-dnl Check for prerequisites for memory fence checks.
-gl_FUNC_MMAP_ANON
-AC_CHECK_HEADERS_ONCE([sys/mman.h])
-AC_CHECK_FUNCS_ONCE([mprotect])
+ gl_FUNC_FDOPEN
+ if test $REPLACE_FDOPEN = 1; then
+ AC_LIBOBJ([fdopen])
+ gl_PREREQ_FDOPEN
+ fi
+ gl_STDIO_MODULE_INDICATOR([fdopen])
+ gl_FUNC_GETPAGESIZE
+ if test $REPLACE_GETPAGESIZE = 1; then
+ AC_LIBOBJ([getpagesize])
+ fi
+ gl_UNISTD_MODULE_INDICATOR([getpagesize])
+ gl_INTTYPES_H
+ gl_INTTYPES_INCOMPLETE
+ dnl Check for prerequisites for memory fence checks.
+ gl_FUNC_MMAP_ANON
+ AC_CHECK_HEADERS_ONCE([sys/mman.h])
+ AC_CHECK_FUNCS_ONCE([mprotect])
+ gl_FUNC_MMAP_ANON
+ AC_CHECK_HEADERS_ONCE([sys/mman.h])
+ AC_CHECK_FUNCS_ONCE([mprotect])
+ AC_CHECK_DECLS_ONCE([alarm])
+ gl_MSVC_INVAL
+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+ AC_LIBOBJ([msvc-inval])
+ fi
+ gt_TYPE_WCHAR_T
+ gt_TYPE_WINT_T
+ dnl Check for prerequisites for memory fence checks.
+ gl_FUNC_MMAP_ANON
+ AC_CHECK_HEADERS_ONCE([sys/mman.h])
+ AC_CHECK_FUNCS_ONCE([mprotect])
m4_popdef([gl_MODULE_INDICATOR_CONDITION])
m4_ifval(gltests_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
diff --git a/lib/gl/m4/intdiv0.m4 b/lib/gl/m4/intdiv0.m4
index 6d89aeb..55bef60 100644
--- a/lib/gl/m4/intdiv0.m4
+++ b/lib/gl/m4/intdiv0.m4
@@ -1,4 +1,4 @@
-# intdiv0.m4 serial 5 (gettext-0.18.2)
+# intdiv0.m4 serial 6 (gettext-0.18.2)
dnl Copyright (C) 2002, 2007-2008, 2010-2012 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,7 +18,7 @@ AC_DEFUN([gt_INTDIV0],
changequote(,)dnl
case "$host_os" in
macos* | darwin[6-9]* | darwin[1-9][0-9]*)
- # On MacOS X 10.2 or newer, just assume the same as when cross-
+ # On Mac OS X 10.2 or newer, just assume the same as when cross-
# compiling. If we were to perform the real test, 1 Crash Report
# dialog window would pop up.
case "$host_cpu" in
diff --git a/lib/gl/m4/intlmacosx.m4 b/lib/gl/m4/intlmacosx.m4
index dc2ddfe..d4da190 100644
--- a/lib/gl/m4/intlmacosx.m4
+++ b/lib/gl/m4/intlmacosx.m4
@@ -1,4 +1,4 @@
-# intlmacosx.m4 serial 4 (gettext-0.18.2)
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
dnl Copyright (C) 2004-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,11 +13,11 @@ dnl by the GNU Library General Public License, and the rest
of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
-dnl Checks for special options needed on MacOS X.
+dnl Checks for special options needed on Mac OS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
[
- dnl Check for API introduced in MacOS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.2.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
@@ -31,9 +31,9 @@ AC_DEFUN([gt_INTL_MACOSX],
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
fi
- dnl Check for API introduced in MacOS X 10.3.
+ dnl Check for API introduced in Mac OS X 10.3.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -46,7 +46,7 @@ AC_DEFUN([gt_INTL_MACOSX],
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in
the CoreFoundation framework.])
fi
INTL_MACOSX_LIBS=
if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test
$gt_cv_func_CFLocaleCopyCurrent = yes; then
diff --git a/lib/gl/m4/lock.m4 b/lib/gl/m4/lock.m4
index c0a6206..19c6d45 100644
--- a/lib/gl/m4/lock.m4
+++ b/lib/gl/m4/lock.m4
@@ -1,4 +1,4 @@
-# lock.m4 serial 11 (gettext-0.18.2)
+# lock.m4 serial 12 (gettext-0.18.2)
dnl Copyright (C) 2005-2012 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,7 +10,7 @@ AC_DEFUN([gl_LOCK],
[
AC_REQUIRE([gl_THREADLIB])
if test "$gl_threads_api" = posix; then
- # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
+ # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
# pthread_rwlock_* functions.
AC_CHECK_TYPE([pthread_rwlock_t],
[AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
diff --git a/lib/gl/m4/mmap-anon.m4 b/lib/gl/m4/mmap-anon.m4
index 4613cbe..748b17d 100644
--- a/lib/gl/m4/mmap-anon.m4
+++ b/lib/gl/m4/mmap-anon.m4
@@ -1,4 +1,4 @@
-# mmap-anon.m4 serial 9
+# mmap-anon.m4 serial 10
dnl Copyright (C) 2005, 2007, 2009-2012 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 @@ dnl with or without modifications, as long as this notice is
preserved.
# - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS
# and MAP_ANON exist and have the same value.
# - On HP-UX, only MAP_ANONYMOUS exists.
-# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
+# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
# - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be
# used.
@@ -27,18 +27,18 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
gl_have_mmap_anonymous=no
if test $gl_have_mmap = yes; then
AC_MSG_CHECKING([for MAP_ANONYMOUS])
- AC_EGREP_CPP([I cant identify this map], [
+ AC_EGREP_CPP([I cannot identify this map], [
#include <sys/mman.h>
#ifdef MAP_ANONYMOUS
- I cant identify this map
+ I cannot identify this map
#endif
],
[gl_have_mmap_anonymous=yes])
if test $gl_have_mmap_anonymous != yes; then
- AC_EGREP_CPP([I cant identify this map], [
+ AC_EGREP_CPP([I cannot identify this map], [
#include <sys/mman.h>
#ifdef MAP_ANON
- I cant identify this map
+ I cannot identify this map
#endif
],
[AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON],
diff --git a/lib/gl/m4/multiarch.m4 b/lib/gl/m4/multiarch.m4
index b424dce..0c288b8 100644
--- a/lib/gl/m4/multiarch.m4
+++ b/lib/gl/m4/multiarch.m4
@@ -1,4 +1,4 @@
-# multiarch.m4 serial 6
+# multiarch.m4 serial 7
dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is
preserved.
# Determine whether the compiler is or may be producing universal binaries.
#
-# On MacOS X 10.5 and later systems, the user can create libraries and
+# On Mac OS X 10.5 and later systems, the user can create libraries and
# executables that work on multiple system types--known as "fat" or
# "universal" binaries--by specifying multiple '-arch' options to the
# compiler but only a single '-arch' option to the preprocessor. Like
diff --git a/lib/gl/m4/printf.m4 b/lib/gl/m4/printf.m4
index d75aca0..751e896 100644
--- a/lib/gl/m4/printf.m4
+++ b/lib/gl/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 48
+# printf.m4 serial 50
dnl Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";;
darwin*) gl_cv_func_printf_sizes_c99="guessing yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -222,7 +222,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 6.
freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";;
darwin*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on HP-UX >= 11.
@@ -507,14 +507,14 @@ int main ()
if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0
|| buf[0] == '0')
result |= 8;
- /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug. */
+ /* This catches a Mac OS X 10.3.9 (Darwin 7.9) bug. */
if (sprintf (buf, "%.1a", 1.999) < 0
|| (strcmp (buf, "0x1.0p+1") != 0
&& strcmp (buf, "0x2.0p+0") != 0
&& strcmp (buf, "0x4.0p-1") != 0
&& strcmp (buf, "0x8.0p-2") != 0))
result |= 16;
- /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a
+ /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a
glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */
if (sprintf (buf, "%.1La", 1.999L) < 0
|| (strcmp (buf, "0x1.0p+1") != 0
@@ -590,7 +590,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 6.
freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";;
darwin*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on Solaris >= 2.10.
@@ -1028,8 +1028,9 @@ int main()
changequote([,])dnl
])])
if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
- (./conftest
+ (./conftest 2>&AS_MESSAGE_LOG_FD
result=$?
+ _AS_ECHO_LOG([\$? = $result])
if test $result != 0 && test $result != 77; then result=1; fi
exit $result
) >/dev/null 2>/dev/null
@@ -1043,7 +1044,7 @@ changequote([,])dnl
fi
rm -fr conftest*
else
- dnl A universal build on Apple MacOS X platforms.
+ dnl A universal build on Apple Mac OS X platforms.
dnl The result would be 'no' in 32-bit mode and 'yes' in 64-bit mode.
dnl But we need a configuration result that is valid in both modes.
gl_cv_func_printf_enomem="guessing no"
@@ -1137,7 +1138,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_truncation_c99="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing
no";;
darwin*) gl_cv_func_snprintf_truncation_c99="guessing
yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -1236,7 +1237,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";;
darwin*) gl_cv_func_snprintf_retval_c99="guessing
yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -1317,7 +1318,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_directive_n="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing
no";;
darwin*) gl_cv_func_snprintf_directive_n="guessing
yes";;
# Guess yes on Solaris >= 2.6.
@@ -1459,7 +1460,7 @@ changequote(,)dnl
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_vsnprintf_zerosize_c99="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing
no";;
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing
yes";;
# Guess yes on Cygwin.
@@ -1539,8 +1540,8 @@ dnl 1 2 3 4 5 6 7
8 9 10 11 12 13 14 15
dnl glibc 2.5 . . . . . . . . . . . . . .
. . . . . .
dnl glibc 2.3.6 . . . . # . . . . . . . . .
. . . . . .
dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . #
. . . . . .
-dnl MacOS X 10.5.8 . . . # # . . . . . . # . .
. . . . . .
-dnl MacOS X 10.3.9 . . . . # . . . . . . # . #
. . . . . .
+dnl Mac OS X 10.5.8 . . . # # . . . . . . # . .
. . . . . .
+dnl Mac OS X 10.3.9 . . . . # . . . . . . # . #
. . . . . .
dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . #
. . . . . .
dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ?
. . . . . .
dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . #
. . . . . .
diff --git a/lib/gl/m4/stdio_h.m4 b/lib/gl/m4/stdio_h.m4
index b03393b..5298dd6 100644
--- a/lib/gl/m4/stdio_h.m4
+++ b/lib/gl/m4/stdio_h.m4
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 41
+# stdio_h.m4 serial 42
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,9 @@ AC_DEFUN([gl_STDIO_H],
dnl No need to create extra modules for these functions. Everyone who uses
dnl <stdio.h> likely needs them.
GNULIB_FSCANF=1
+ gl_MODULE_INDICATOR([fscanf])
GNULIB_SCANF=1
+ gl_MODULE_INDICATOR([scanf])
GNULIB_FGETC=1
GNULIB_GETC=1
GNULIB_GETCHAR=1
diff --git a/lib/gl/m4/strndup.m4 b/lib/gl/m4/strndup.m4
index bdde5fe..cef6889 100644
--- a/lib/gl/m4/strndup.m4
+++ b/lib/gl/m4/strndup.m4
@@ -1,4 +1,4 @@
-# strndup.m4 serial 20
+# strndup.m4 serial 21
dnl Copyright (C) 2002-2003, 2005-2012 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,7 +24,7 @@ AC_DEFUN([gl_FUNC_STRNDUP],
[AC_RUN_IFELSE([
AC_LANG_PROGRAM([[#include <string.h>
#include <stdlib.h>]], [[
-#ifndef HAVE_DECL_STRNDUP
+#if !HAVE_DECL_STRNDUP
extern
#ifdef __cplusplus
"C"
diff --git a/lib/gl/m4/threadlib.m4 b/lib/gl/m4/threadlib.m4
index 9cedb67..cb93391 100644
--- a/lib/gl/m4/threadlib.m4
+++ b/lib/gl/m4/threadlib.m4
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 9 (gettext-0.18.2)
+# threadlib.m4 serial 10 (gettext-0.18.2)
dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -319,50 +319,50 @@ AC_DEFUN([gl_DISABLE_THREADS], [
dnl Survey of platforms:
dnl
-dnl Platform Available Compiler Supports test-lock
-dnl flavours option weak result
-dnl --------------- --------- --------- -------- ---------
-dnl Linux 2.4/glibc posix -lpthread Y OK
+dnl Platform Available Compiler Supports test-lock
+dnl flavours option weak result
+dnl --------------- --------- --------- -------- ---------
+dnl Linux 2.4/glibc posix -lpthread Y OK
dnl
-dnl GNU Hurd/glibc posix
+dnl GNU Hurd/glibc posix
dnl
-dnl FreeBSD 5.3 posix -lc_r Y
-dnl posix -lkse ? Y
-dnl posix -lpthread ? Y
-dnl posix -lthr Y
+dnl FreeBSD 5.3 posix -lc_r Y
+dnl posix -lkse ? Y
+dnl posix -lpthread ? Y
+dnl posix -lthr Y
dnl
-dnl FreeBSD 5.2 posix -lc_r Y
-dnl posix -lkse Y
-dnl posix -lthr Y
+dnl FreeBSD 5.2 posix -lc_r Y
+dnl posix -lkse Y
+dnl posix -lthr Y
dnl
-dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
+dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
dnl
-dnl NetBSD 1.6 --
+dnl NetBSD 1.6 --
dnl
-dnl OpenBSD 3.4 posix -lpthread Y OK
+dnl OpenBSD 3.4 posix -lpthread Y OK
dnl
-dnl MacOS X 10.[123] posix -lpthread Y OK
+dnl Mac OS X 10.[123] posix -lpthread Y OK
dnl
-dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9:
OK
-dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9:
OK
+dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9:
OK
+dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9:
OK
dnl
-dnl HP-UX 11 posix -lpthread N (cc) OK
+dnl HP-UX 11 posix -lpthread N (cc) OK
dnl Y (gcc)
dnl
-dnl IRIX 6.5 posix -lpthread Y 0.5
+dnl IRIX 6.5 posix -lpthread Y 0.5
dnl
-dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
+dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
dnl
-dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
+dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
dnl -lpthread (gcc) Y
dnl
-dnl Cygwin posix -lpthread Y OK
+dnl Cygwin posix -lpthread Y OK
dnl
-dnl Any of the above pth -lpth 0.0
+dnl Any of the above pth -lpth 0.0
dnl
-dnl Mingw windows N OK
+dnl Mingw windows N OK
dnl
-dnl BeOS 5 --
+dnl BeOS 5 --
dnl
dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
dnl turned off:
diff --git a/lib/gl/m4/visibility.m4 b/lib/gl/m4/visibility.m4
index 7b24d39..a7d4d8c 100644
--- a/lib/gl/m4/visibility.m4
+++ b/lib/gl/m4/visibility.m4
@@ -1,4 +1,4 @@
-# visibility.m4 serial 4 (gettext-0.18.2)
+# visibility.m4 serial 5 (gettext-0.18.2)
dnl Copyright (C) 2005, 2008, 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,7 @@ dnl __attribute__((__visibility__("hidden"))) and
dnl __attribute__((__visibility__("default"))).
dnl Does *not* test for __visibility__("protected") - which has tricky
dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
+dnl Mac OS X.
dnl Does *not* test for __visibility__("internal") - which has processor
dnl dependent semantics.
dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
diff --git a/lib/gl/override/lib/gettext.h.diff
b/lib/gl/override/lib/gettext.h.diff
index f575362..d4c27c8 100644
--- a/lib/gl/override/lib/gettext.h.diff
+++ b/lib/gl/override/lib/gettext.h.diff
@@ -1,106 +1,179 @@
---- gl/gettext.h.orig 2012-02-07 10:01:26.854383205 +0100
-+++ gl/gettext.h 2012-02-07 10:01:39.923793105 +0100
-@@ -184,103 +184,4 @@
-
- #include <string.h>
-
--#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
-- (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
-- /* || __STDC_VERSION__ >= 199901L */ )
--
--#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
--#include <stdlib.h>
--#endif
--
--#define pgettext_expr(Msgctxt, Msgid) \
-- dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
--#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
-- dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
--
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static const char *
--dcpgettext_expr (const char *domain,
-- const char *msgctxt, const char *msgid,
-- int category)
--{
-- size_t msgctxt_len = strlen (msgctxt) + 1;
-- size_t msgid_len = strlen (msgid) + 1;
-- const char *translation;
--#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- char msg_ctxt_id[msgctxt_len + msgid_len];
--#else
-- char buf[1024];
-- char *msg_ctxt_id =
-- (msgctxt_len + msgid_len <= sizeof (buf)
-- ? buf
-- : (char *) malloc (msgctxt_len + msgid_len));
-- if (msg_ctxt_id != NULL)
--#endif
-- {
-- memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-- msg_ctxt_id[msgctxt_len - 1] = '\004';
-- memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-- translation = dcgettext (domain, msg_ctxt_id, category);
--#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- if (msg_ctxt_id != buf)
-- free (msg_ctxt_id);
--#endif
-- if (translation != msg_ctxt_id)
-- return translation;
-- }
-- return msgid;
--}
--
--#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
-- dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
--#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
-- dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
--
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static const char *
--dcnpgettext_expr (const char *domain,
-- const char *msgctxt, const char *msgid,
-- const char *msgid_plural, unsigned long int n,
-- int category)
--{
-- size_t msgctxt_len = strlen (msgctxt) + 1;
-- size_t msgid_len = strlen (msgid) + 1;
-- const char *translation;
--#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- char msg_ctxt_id[msgctxt_len + msgid_len];
--#else
-- char buf[1024];
-- char *msg_ctxt_id =
-- (msgctxt_len + msgid_len <= sizeof (buf)
-- ? buf
-- : (char *) malloc (msgctxt_len + msgid_len));
-- if (msg_ctxt_id != NULL)
--#endif
-- {
-- memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-- msg_ctxt_id[msgctxt_len - 1] = '\004';
-- memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-- translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n,
category);
--#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-- if (msg_ctxt_id != buf)
-- free (msg_ctxt_id);
--#endif
-- if (!(translation == msg_ctxt_id || translation == msgid_plural))
-- return translation;
-- }
-- return (n == 1 ? msgid : msgid_plural);
--}
--
- #endif /* _LIBGETTEXT_H */
+110,287d109
+< /* The separator between msgctxt and msgid in a .mo file. */
+< #define GETTEXT_CONTEXT_GLUE "\004"
+<
+< /* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+< MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
+< short and rarely need to change.
+< The letter 'p' stands for 'particular' or 'special'. */
+< #ifdef DEFAULT_TEXT_DOMAIN
+< # define pgettext(Msgctxt, Msgid) \
+< pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, LC_MESSAGES)
+< #else
+< # define pgettext(Msgctxt, Msgid) \
+< pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
LC_MESSAGES)
+< #endif
+< #define dpgettext(Domainname, Msgctxt, Msgid) \
+< pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
LC_MESSAGES)
+< #define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+< pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
Category)
+< #ifdef DEFAULT_TEXT_DOMAIN
+< # define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+< npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid,
Msgid, MsgidPlural, N, LC_MESSAGES)
+< #else
+< # define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+< npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
+< #endif
+< #define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+< npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, LC_MESSAGES)
+< #define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+< npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid,
MsgidPlural, N, Category)
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< pgettext_aux (const char *domain,
+< const char *msg_ctxt_id, const char *msgid,
+< int category)
+< {
+< const char *translation = dcgettext (domain, msg_ctxt_id, category);
+< if (translation == msg_ctxt_id)
+< return msgid;
+< else
+< return translation;
+< }
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< npgettext_aux (const char *domain,
+< const char *msg_ctxt_id, const char *msgid,
+< const char *msgid_plural, unsigned long int n,
+< int category)
+< {
+< const char *translation =
+< dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+< if (translation == msg_ctxt_id || translation == msgid_plural)
+< return (n == 1 ? msgid : msgid_plural);
+< else
+< return translation;
+< }
+<
+< /* The same thing extended for non-constant arguments. Here MSGCTXT and
MSGID
+< can be arbitrary expressions. But for string literals these macros are
+< less efficient than those above. */
+<
+< #include <string.h>
+<
+< #if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
+< /* || __STDC_VERSION__ >= 199901L */ )
+< # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
+< #else
+< # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
+< #endif
+<
+< #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< #include <stdlib.h>
+< #endif
+<
+< #define pgettext_expr(Msgctxt, Msgid) \
+< dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+< #define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+< dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< dcpgettext_expr (const char *domain,
+< const char *msgctxt, const char *msgid,
+< int category)
+< {
+< size_t msgctxt_len = strlen (msgctxt) + 1;
+< size_t msgid_len = strlen (msgid) + 1;
+< const char *translation;
+< #if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< char msg_ctxt_id[msgctxt_len + msgid_len];
+< #else
+< char buf[1024];
+< char *msg_ctxt_id =
+< (msgctxt_len + msgid_len <= sizeof (buf)
+< ? buf
+< : (char *) malloc (msgctxt_len + msgid_len));
+< if (msg_ctxt_id != NULL)
+< #endif
+< {
+< memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+< msg_ctxt_id[msgctxt_len - 1] = '\004';
+< memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+< translation = dcgettext (domain, msg_ctxt_id, category);
+< #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< if (msg_ctxt_id != buf)
+< free (msg_ctxt_id);
+< #endif
+< if (translation != msg_ctxt_id)
+< return translation;
+< }
+< return msgid;
+< }
+<
+< #define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+< dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+< #define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+< dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+<
+< #ifdef __GNUC__
+< __inline
+< #else
+< #ifdef __cplusplus
+< inline
+< #endif
+< #endif
+< static const char *
+< dcnpgettext_expr (const char *domain,
+< const char *msgctxt, const char *msgid,
+< const char *msgid_plural, unsigned long int n,
+< int category)
+< {
+< size_t msgctxt_len = strlen (msgctxt) + 1;
+< size_t msgid_len = strlen (msgid) + 1;
+< const char *translation;
+< #if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< char msg_ctxt_id[msgctxt_len + msgid_len];
+< #else
+< char buf[1024];
+< char *msg_ctxt_id =
+< (msgctxt_len + msgid_len <= sizeof (buf)
+< ? buf
+< : (char *) malloc (msgctxt_len + msgid_len));
+< if (msg_ctxt_id != NULL)
+< #endif
+< {
+< memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+< msg_ctxt_id[msgctxt_len - 1] = '\004';
+< memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+< translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n,
category);
+< #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+< if (msg_ctxt_id != buf)
+< free (msg_ctxt_id);
+< #endif
+< if (!(translation == msg_ctxt_id || translation == msgid_plural))
+< return translation;
+< }
+< return (n == 1 ? msgid : msgid_plural);
+< }
+<
diff --git a/lib/gl/printf-parse.c b/lib/gl/printf-parse.c
index 0438e8f..5bc6ef6 100644
--- a/lib/gl/printf-parse.c
+++ b/lib/gl/printf-parse.c
@@ -401,7 +401,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d,
arguments *a)
cp++;
}
#if defined __APPLE__ && defined __MACH__
- /* On MacOS X 10.3, PRIdMAX is defined as "qd".
+ /* On Mac OS X 10.3, PRIdMAX is defined as "qd".
We cannot change it to "lld" because PRIdMAX must also
be understood by the system's printf routines. */
else if (*cp == 'q')
diff --git a/lib/gl/stdbool.in.h b/lib/gl/stdbool.in.h
index a329c70..183efe2 100644
--- a/lib/gl/stdbool.in.h
+++ b/lib/gl/stdbool.in.h
@@ -66,24 +66,19 @@
# undef true
#endif
-/* For the sake of symbolic names in gdb, we define true and false as
- enum constants, not only as macros.
- It is tempting to write
- typedef enum { false = 0, true = 1 } _Bool;
- so that gdb prints values of type 'bool' symbolically. But if we do
- this, values of type '_Bool' may promote to 'int' or 'unsigned int'
- (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
- (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
- enum; this ensures that '_Bool' promotes to 'int'. */
-#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
+#ifdef __cplusplus
+# define _Bool bool
+# define bool bool
+#else
+# if defined __BEOS__ && !defined __HAIKU__
/* A compiler known to have 'bool'. */
/* If the compiler already has both 'bool' and '_Bool', we can assume they
are the same types. */
-# if address@hidden@
+# if address@hidden@
typedef bool _Bool;
-# endif
-#else
-# if !defined __GNUC__
+# endif
+# else
+# if !defined __GNUC__
/* If @HAVE__BOOL@:
Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
the built-in _Bool type is used. See
@@ -103,19 +98,35 @@ typedef bool _Bool;
"Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
The only benefit of the enum, debuggability, is not important
with these compilers. So use 'signed char' and no enum. */
-# define _Bool signed char
-# else
+# define _Bool signed char
+# else
/* With this compiler, trust the _Bool type if the compiler has it. */
-# if address@hidden@
+# if address@hidden@
+ /* For the sake of symbolic names in gdb, define true and false as
+ enum constants, not only as macros.
+ It is tempting to write
+ typedef enum { false = 0, true = 1 } _Bool;
+ so that gdb prints values of type 'bool' symbolically. But then
+ values of type '_Bool' might promote to 'int' or 'unsigned int'
+ (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+ (see ISO C 99 6.3.1.1.(2)). So add a negative value to the
+ enum; this ensures that '_Bool' promotes to 'int'. */
typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
+# endif
# endif
# endif
+# define bool _Bool
#endif
-#define bool _Bool
/* The other macros must be usable in preprocessor directives. */
-#define false 0
-#define true 1
+#ifdef __cplusplus
+# define false false
+# define true true
+#else
+# define false 0
+# define true 1
+#endif
+
#define __bool_true_false_are_defined 1
#endif /* _GL_STDBOOL_H */
diff --git a/lib/gl/stdint.in.h b/lib/gl/stdint.in.h
index 3475dbe..4f61f95 100644
--- a/lib/gl/stdint.in.h
+++ b/lib/gl/stdint.in.h
@@ -83,7 +83,7 @@
/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
AIX 5.2 <sys/types.h> isn't needed and causes troubles.
- MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+ Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
relies on the system <stdint.h> definitions, so include
<sys/types.h> after @address@hidden */
#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
diff --git a/lib/gl/stdlib.in.h b/lib/gl/stdlib.in.h
index 2214c92..f270075 100644
--- a/lib/gl/stdlib.in.h
+++ b/lib/gl/stdlib.in.h
@@ -87,8 +87,8 @@ struct random_data
#endif
#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined
GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined
__WIN32__) && ! defined __CYGWIN__)
-/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */
-/* On MacOS X 10.5, only <unistd.h> declares mkstemps. */
+/* On Mac OS X 10.3, only <unistd.h> declares mkstemp. */
+/* On Mac OS X 10.5, only <unistd.h> declares mkstemps. */
/* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */
/* But avoid namespace pollution on glibc systems and native Windows. */
# include <unistd.h>
diff --git a/lib/gl/unistd.in.h b/lib/gl/unistd.in.h
index 5c6134a..28d1477 100644
--- a/lib/gl/unistd.in.h
+++ b/lib/gl/unistd.in.h
@@ -1318,7 +1318,7 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
_GL_ARG_NONNULL ((1)));
# endif
-/* Need to cast, because on Solaris 11 2011-10, MacOS X 10.5, IRIX 6.5
+/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
and FreeBSD 6.4 the second parameter is int. On Solaris 11
2011-10, the first parameter is not const. */
_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
diff --git a/lib/gl/vasnprintf.c b/lib/gl/vasnprintf.c
index 24d2d1e..d875f7a 100644
--- a/lib/gl/vasnprintf.c
+++ b/lib/gl/vasnprintf.c
@@ -275,7 +275,7 @@ decimal_point_char (void)
{
const char *point;
/* Determine it in a multithread-safe way. We know nl_langinfo is
- multithread-safe on glibc systems and MacOS X systems, but is not required
+ multithread-safe on glibc systems and Mac OS X systems, but is not
required
to be multithread-safe by POSIX. sprintf(), however, is multithread-safe.
localeconv() is rarely multithread-safe. */
# if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined
__APPLE__ && defined __MACH__))
diff --git a/lib/gl/verify.h b/lib/gl/verify.h
index f87a08c..71b30f4 100644
--- a/lib/gl/verify.h
+++ b/lib/gl/verify.h
@@ -125,7 +125,7 @@
extern int (*dummy (void)) [sizeof (struct {...})];
* GCC warns about duplicate declarations of the dummy function if
- -Wredundant_decls is used. GCC 4.3 and later have a builtin
+ -Wredundant-decls is used. GCC 4.3 and later have a builtin
__COUNTER__ macro that can let us generate unique identifiers for
each dummy function, to suppress this warning.
@@ -133,6 +133,10 @@
which do not support _Static_assert, also do not warn about the
last declaration mentioned above.
+ * GCC warns if -Wnested-externs is enabled and verify() is used
+ within a function body; but inside a function, you can always
+ arrange to use verify_expr() instead.
+
* In C++, any struct definition inside sizeof is invalid.
Use a template type to work around the problem. */
diff --git a/lib/gltests/init.sh b/lib/gltests/init.sh
index f525a7c..5f6e638 100644
--- a/lib/gltests/init.sh
+++ b/lib/gltests/init.sh
@@ -411,8 +411,7 @@ path_prepend_ ()
case $path_dir_ in
'') fail_ "invalid path dir: '$1'";;
/*) abs_path_dir_=$path_dir_;;
- *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \
- || fail_ "invalid path dir: $path_dir_";;
+ *) abs_path_dir_=$initial_cwd_/$path_dir_;;
esac
case $abs_path_dir_ in
*:*) fail_ "invalid path dir: '$abs_path_dir_'";;
@@ -448,7 +447,7 @@ setup_ ()
pfx_=`testdir_prefix_`
test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
|| fail_ "failed to create temporary directory in $initial_cwd_"
- cd "$test_dir_"
+ cd "$test_dir_" || fail_ "failed to cd to temporary directory"
# As autoconf-generated configure scripts do, ensure that IFS
# is defined initially, so that saving and restoring $IFS works.
diff --git a/lib/gltests/test-alloca-opt.c b/lib/gltests/test-alloca-opt.c
index 4e814c6..6b9a4d7 100644
--- a/lib/gltests/test-alloca-opt.c
+++ b/lib/gltests/test-alloca-opt.c
@@ -44,7 +44,7 @@ main ()
{
/* Try various values.
n = 0 gave a crash on Alpha with gcc-2.5.8.
- Some versions of MacOS X have a stack size limit of 512 KB. */
+ Some versions of Mac OS X have a stack size limit of 512 KB. */
func (34);
func (134);
func (399);
diff --git a/lib/gltests/test-errno.c b/lib/gltests/test-errno.c
index d9a030f..8d00717 100644
--- a/lib/gltests/test-errno.c
+++ b/lib/gltests/test-errno.c
@@ -98,6 +98,8 @@ int e115 = EINPROGRESS;
int e116 = ESTALE;
int e122 = EDQUOT;
int e125 = ECANCELED;
+int e130 = EOWNERDEAD;
+int e131 = ENOTRECOVERABLE;
/* Don't verify that these errno values are all different, except for possibly
EWOULDBLOCK == EAGAIN. Even Linux/x86 does not pass this check: it has
diff --git a/lib/gssapi/client.c b/lib/gssapi/client.c
index 3697e21..011a0fe 100644
--- a/lib/gssapi/client.c
+++ b/lib/gssapi/client.c
@@ -205,9 +205,13 @@ _gsasl_gssapi_client_step (Gsasl_session * sctx,
/* FIXME: Fix maxbuf. */
- p = gsasl_property_get (sctx, GSASL_AUTHID);
+ p = gsasl_property_get (sctx, GSASL_AUTHZID);
if (!p)
- return GSASL_NO_AUTHID;
+ /* The following is for backwards compatibility: this
+ mechanism only used GSASL_AUTHID before. */
+ p = gsasl_property_get (sctx, GSASL_AUTHID);
+ if (!p)
+ p = "";
bufdesc.length = 4 + strlen (p);
bufdesc.value = malloc (bufdesc.length);
diff --git a/lib/maint.mk b/lib/maint.mk
index 1c7af03..4627bc5 100644
--- a/lib/maint.mk
+++ b/lib/maint.mk
@@ -61,7 +61,7 @@ endif
# (i.e., with no $(srcdir) prefix), this definition is careful to
# remove any $(srcdir) prefix, and to restore what it removes.
_sc_excl = \
- $(if $(exclude_file_name_regexp--$@),$(exclude_file_name_regexp--$@),^$$)
+ $(or $(exclude_file_name_regexp--$@),^$$)
VC_LIST_EXCEPT = \
$(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \
| if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
@@ -187,9 +187,11 @@ syntax-check: $(local-check)
#
# in_vc_files | in_files
#
-# grep-E-style regexp denoting the files to check. If no files
-# are specified the default are all the files that are under
-# version control.
+# grep-E-style regexp selecting the files to check. For in_vc_files,
+# the regexp is used to select matching files from the list of all
+# version-controlled files; for in_files, it's from the names printed
+# by "find $(srcdir)". When neither is specified, use all files that
+# are under version control.
#
# containing | non_containing
#
@@ -261,7 +263,7 @@ define _sc_search_regexp
: Filter by file name; \
if test -n "$$in_files"; then \
files=$$(find $(srcdir) | grep -E "$$in_files" \
- | grep -Ev '$(exclude_file_name_regexp--$@)'); \
+ | grep -Ev '$(_sc_excl)'); \
else
\
files=$$($(VC_LIST_EXCEPT)); \
if test -n "$$in_vc_files"; then \
@@ -329,7 +331,15 @@ sp_ = strcmp *\(.+\)
sc_prohibit_strcmp:
@prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)' \
exclude=':# *define STRN?EQ\(' \
- halt='$(ME): replace strcmp calls above with STREQ/STRNEQ' \
+ halt='replace strcmp calls above with STREQ/STRNEQ' \
+ $(_sc_search_regexp)
+
+# Really. You don't want to use this function.
+# It may fail to NUL-terminate the destination,
+# and always NUL-pads out to the specified length.
+sc_prohibit_strncpy:
+ @prohibit='\<strncpy *\(' \
+ halt='do not use strncpy, period' \
$(_sc_search_regexp)
# Pass EXIT_*, not number, to usage, exit, and error (when exiting)
@@ -343,8 +353,9 @@ sc_prohibit_strcmp:
# | xargs --no-run-if-empty \
# perl -pi -e 's/(^|[^.])\b(exit ?)\(0\)/$1$2(EXIT_SUCCESS)/'
sc_prohibit_magic_number_exit:
- @prohibit='(^|[^.])\<(usage|exit) ?\([0-9]|\<error ?\([1-9][0-9]*,'
\
- halt='use EXIT_* values rather than magic number'
\
+ @prohibit='(^|[^.])\<(usage|exit|error) ?\(-?[0-9]+[,)]' \
+ exclude='error ?\((0,|[^,]*)' \
+ halt='use EXIT_* values rather than magic number' \
$(_sc_search_regexp)
# Using EXIT_SUCCESS as the first argument to error is misleading,
@@ -733,7 +744,7 @@ _gl_translatable_diag_func_re ?= error
sc_unmarked_diagnostics:
@prohibit='\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \
exclude='(_|ngettext ?)\(' \
- halt='$(ME): found unmarked diagnostic(s)' \
+ halt='found unmarked diagnostic(s)' \
$(_sc_search_regexp)
# Avoid useless parentheses like those in this example:
@@ -767,6 +778,11 @@ sc_prohibit_always_true_header_tests:
' with the corresponding gnulib module, they are always true') \
$(_sc_search_regexp)
+sc_prohibit_defined_have_decl_tests:
+ @prohibit='#[ ]*if(n?def|.*\<defined)\>[ (]+HAVE_DECL_' \
+ halt='HAVE_DECL macros are always defined' \
+ $(_sc_search_regexp)
+
# ==================================================================
gl_other_headers_ ?= \
intprops.h \
@@ -1004,7 +1020,7 @@ sc_redundant_const:
sc_const_long_option:
@prohibit='^ *static.*struct option ' \
exclude='const struct option|struct option const' \
- halt='$(ME): add "const" to the above declarations' \
+ halt='add "const" to the above declarations' \
$(_sc_search_regexp)
NEWS_hash = \
@@ -1051,7 +1067,7 @@ sc_makefile_at_at_check:
&& { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
news-check: NEWS
- if sed -n $(news-check-lines-spec)p $(srcdir)/NEWS \
+ $(AM_V_GEN)if sed -n $(news-check-lines-spec)p $< \
| grep -E $(news-check-regexp) >/dev/null; then \
:; \
else \
@@ -1107,7 +1123,7 @@ sc_po_check:
# Sometimes it is useful to change the PATH environment variable
# in Makefiles. When doing so, it's better not to use the Unix-centric
# path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'.
-msg = '$(ME): Do not use ":" above; use $$(PATH_SEPARATOR) instead'
+msg = 'Do not use ":" above; use $$(PATH_SEPARATOR) instead'
sc_makefile_path_separator_check:
@prohibit='PATH[=].*:' \
in_vc_files='akefile|\.mk$$' \
@@ -1206,16 +1222,25 @@ sc_prohibit_path_max_allocation:
sc_vulnerable_makefile_CVE-2009-4029:
@prohibit='perm -777 -exec chmod a\+rwx|chmod 777 \$$\(distdir\)' \
- in_files=$$(find $(srcdir) -name Makefile.in) \
+ in_files='(^|/)Makefile\.in$$' \
halt=$$(printf '%s\n' \
'the above files are vulnerable; beware of running' \
' "make dist*" rules, and upgrade to fixed automake' \
' see http://bugzilla.redhat.com/542609 for details') \
$(_sc_search_regexp)
+sc_vulnerable_makefile_CVE-2012-3386:
+ @prohibit='chmod a\+w \$$\(distdir\)' \
+ in_files='(^|/)Makefile\.in$$' \
+ halt=$$(printf '%s\n' \
+ 'the above files are vulnerable; beware of running' \
+ ' "make distcheck", and upgrade to fixed automake' \
+ ' see http://bugzilla.redhat.com/CVE-2012-3386 for details') \
+ $(_sc_search_regexp)
+
vc-diff-check:
- (unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
- if test -s vc-diffs; then \
+ $(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
+ $(AM_V_at)if test -s vc-diffs; then \
cat vc-diffs; \
echo "Some files are locally modified:" 1>&2; \
exit 1; \
@@ -1231,10 +1256,11 @@ bootstrap-tools ?= autoconf,automake,gnulib
# If it's not already specified, derive the GPG key ID from
# the signed tag we've just applied to mark this release.
-gpg_key_ID ?= \
- $$(git cat-file tag v$(VERSION) \
- | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
- | sed -n '/^\[GNUPG:\] ERRSIG /{s///;s/ .*//p;q}')
+gpg_key_ID ?= \
+ $$(cd $(srcdir) \
+ && git cat-file tag v$(VERSION) \
+ | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
+ | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
translation_project_ ?= address@hidden
@@ -1253,13 +1279,14 @@ else
endif
announcement: NEWS ChangeLog $(rel-files)
- @$(srcdir)/$(_build-aux)/announce-gen \
+ $(AM_V_GEN)$(srcdir)/$(_build-aux)/announce-gen \
--mail-headers='$(announcement_mail_headers_)' \
--release-type=$(RELEASE_TYPE) \
--package=$(PACKAGE) \
--prev=$(PREV_VERSION) \
--curr=$(VERSION) \
--gpg-key-id=$(gpg_key_ID) \
+ --srcdir=$(srcdir) \
--news=$(srcdir)/NEWS \
--bootstrap-tools=$(bootstrap-tools) \
$$(case ,$(bootstrap-tools), in (*,gnulib,*) \
@@ -1267,6 +1294,12 @@ announcement: NEWS ChangeLog $(rel-files)
--no-print-checksums \
$(addprefix --url-dir=, $(url_dir_list))
+.PHONY: release-commit
+release-commit:
+ $(AM_V_GEN)cd $(srcdir) \
+ && $(_build-aux)/do-release-commit-and-tag \
+ -C $(abs_builddir) $(RELEASE)
+
## ---------------- ##
## Updating files. ##
## ---------------- ##
@@ -1294,7 +1327,7 @@ endef
.PHONY: no-submodule-changes
no-submodule-changes:
- if test -d $(srcdir)/.git; then \
+ $(AM_V_GEN)if test -d $(srcdir)/.git; then \
diff=$$(cd $(srcdir) && git submodule -q foreach \
git diff-index --name-only HEAD) \
|| exit 1; \
@@ -1333,16 +1366,16 @@ check: $(gl_public_submodule_commit)
.PHONY: alpha beta stable
ALL_RECURSIVE_TARGETS += alpha beta stable
alpha beta stable: $(local-check) writable-files $(submodule-checks)
- test $@ = stable \
+ $(AM_V_GEN)test $@ = stable \
&& { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
|| { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
|| :
- $(MAKE) vc-diff-check
- $(MAKE) news-check
- $(MAKE) distcheck
- $(MAKE) dist
- $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
- $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
+ $(AM_V_at)$(MAKE) vc-diff-check
+ $(AM_V_at)$(MAKE) news-check
+ $(AM_V_at)$(MAKE) distcheck
+ $(AM_V_at)$(MAKE) dist
+ $(AM_V_at)$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
+ $(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
# Override this in cfg.mk if you follow different procedures.
release-prep-hook ?= release-prep
@@ -1350,19 +1383,21 @@ release-prep-hook ?= release-prep
gl_noteworthy_news_ = * Noteworthy changes in release ?.? (????-??-??) [?]
.PHONY: release-prep
release-prep:
- case $$RELEASE_TYPE in alpha|beta|stable) ;; \
+ $(AM_V_GEN)case $$RELEASE_TYPE in alpha|beta|stable) ;; \
*) echo "invalid RELEASE_TYPE: $$RELEASE_TYPE" 1>&2; exit 1;; esac
- $(MAKE) --no-print-directory -s announcement > ~/announce-$(my_distdir)
- if test -d $(release_archive_dir); then \
+ $(AM_V_at)$(MAKE) --no-print-directory -s announcement \
+ > ~/announce-$(my_distdir)
+ $(AM_V_at)if test -d $(release_archive_dir); then \
ln $(rel-files) $(release_archive_dir); \
chmod a-w $(rel-files); \
fi
- echo $(VERSION) > $(prev_version_file)
- $(MAKE) update-NEWS-hash
- perl -pi -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' NEWS
- $(emit-commit-log) > .ci-msg
- $(VC) commit -F .ci-msg -a
- rm .ci-msg
+ $(AM_V_at)echo $(VERSION) > $(prev_version_file)
+ $(AM_V_at)$(MAKE) update-NEWS-hash
+ $(AM_V_at)perl -pi \
+ -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' \
+ $(srcdir)/NEWS
+ $(AM_V_at)msg=$$($(emit-commit-log)) || exit 1; \
+ cd $(srcdir) && $(VC) commit -m "$$msg" -a
# Override this with e.g., -s $(srcdir)/some_other_name.texi
# if the default $(PACKAGE)-derived name doesn't apply.
@@ -1370,14 +1405,20 @@ gendocs_options_ ?=
.PHONY: web-manual
web-manual:
- @test -z "$(manual_title)" \
+ $(AM_V_GEN)test -z "$(manual_title)" \
&& { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
- @cd '$(srcdir)/doc'; \
+ $(AM_V_at)cd '$(srcdir)/doc'; \
$(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \
-o '$(abs_builddir)/doc/manual' \
--email $(PACKAGE_BUGREPORT) $(PACKAGE) \
"$(PACKAGE_NAME) - $(manual_title)"
- @echo " *** Upload the doc/manual directory to web-cvs."
+ $(AM_V_at)echo " *** Upload the doc/manual directory to web-cvs."
+
+.PHONY: web-manual-update
+web-manual-update:
+ $(AM_V_GEN)cd $(srcdir) \
+ && $(_build-aux)/gnu-web-doc-update -C $(abs_builddir)
+
# Code Coverage
@@ -1403,6 +1444,31 @@ gen-coverage:
coverage: init-coverage build-coverage gen-coverage
+# Some projects carry local adjustments for gnulib modules via patches in
+# a gnulib patch directory whose default name is gl/ (defined in bootstrap
+# via local_gl_dir=gl). Those patches become stale as the originals evolve
+# in gnulib. Use this rule to refresh any stale patches. It applies each
+# patch to the original in $(gnulib_dir) and uses the temporary result to
+# generate a fuzz-free .diff file. If you customize the name of your local
+# gnulib patch directory via bootstrap.conf, this rule detects that name.
+# Run this from a non-VPATH (i.e., srcdir) build directory.
+.PHONY: refresh-gnulib-patches
+refresh-gnulib-patches:
+ gl=gl; \
+ if test -f bootstrap.conf; then \
+ t=$$(perl -lne '/^\s*local_gl_dir=(\S+)/ and $$d=$$1;' \
+ -e 'END{defined $$d and print $$d}' bootstrap.conf); \
+ test -n "$$t" && gl=$$t; \
+ fi; \
+ for diff in $$(cd $$gl; git ls-files | grep '\.diff$$'); do \
+ b=$$(printf %s "$$diff"|sed 's/\.diff$$//'); \
+ VERSION_CONTROL=none \
+ patch "$(gnulib_dir)/$$b" "$$gl/$$diff" || exit 1; \
+ ( cd $(gnulib_dir) || exit 1; \
+ git diff "$$b" > "../$$gl/$$diff"; \
+ git checkout $$b ) || exit 1; \
+ done
+
# Update gettext files.
PACKAGE ?= $(shell basename $(PWD))
PO_DOMAIN ?= $(PACKAGE)
@@ -1414,7 +1480,7 @@ refresh-po:
wget --no-verbose --directory-prefix $(PODIR) --no-directories
--recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
echo 'address@hidden' > $(PODIR)/LINGUAS && \
echo 'address@hidden' >> $(PODIR)/LINGUAS && \
- ls $(PODIR)/*.po | sed 's/\.po//' | sed 's,$(PODIR)/,,' | sort >>
$(PODIR)/LINGUAS
+ ls $(PODIR)/*.po | sed 's/\.po//;s,$(PODIR)/,,' | sort >>
$(PODIR)/LINGUAS
# Running indent once is not idempotent, but running it twice is.
INDENT_SOURCES ?= $(C_SOURCES)
@@ -1436,7 +1502,7 @@ update-copyright-env ?=
# in the file .x-update-copyright.
.PHONY: update-copyright
update-copyright:
- grep -l -w Copyright \
+ $(AM_V_GEN)grep -l -w Copyright \
$$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \
| $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@
diff --git a/lib/po/LINGUAS b/lib/po/LINGUAS
index 17fff4f..3c5cb4a 100644
--- a/lib/po/LINGUAS
+++ b/lib/po/LINGUAS
@@ -1,5 +1,6 @@
address@hidden
address@hidden
+de
eo
fi
fr
diff --git a/lib/po/de.po.in b/lib/po/de.po.in
index 46b5da9..839c4b0 100644
--- a/lib/po/de.po.in
+++ b/lib/po/de.po.in
@@ -1,97 +1,292 @@
-# German translation for gsasl.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gsasl package.
-# Roland Illig <address@hidden>, 2004.
-#
+# German translation of libgsasl
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgsasl package.
+# Arun Persaud <address@hidden>, 2012
msgid ""
msgstr ""
-"Project-Id-Version: gsasl 0.1.0\n"
+"Project-Id-Version: libgsasl 1.7.4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2004-04-16 21:12+0200\n"
-"PO-Revision-Date: 2004-04-25 03:15+0100\n"
-"Last-Translator: Roland Illig <address@hidden>\n"
-"Language-Team: German <address@hidden>\n"
+"POT-Creation-Date: 2012-05-16 00:55+0200\n"
+"PO-Revision-Date: 2012-06-08 21:53-0700\n"
+"Last-Translator: Arun Persaud <address@hidden>\n"
+"Language-Team: German <address@hidden>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/gsasl.c:106
-#, c-format
-msgid "Chose SASL mechanism:\n"
-msgstr "SASL-Mechanismus auswählen:\n"
-
-#: src/gsasl.c:114
-#, c-format
-msgid "Input SASL mechanism supported by server:\n"
-msgstr "SASL-Eingabemechanismus, der vom Server unterstützt wird:\n"
-
-#: src/gsasl.c:133
-#, c-format
-msgid "Using mechanism:\n"
-msgstr "Benutze Mechanismus:\n"
-
-#: src/gsasl.c:150
-#, c-format
-msgid "Output from client:\n"
-msgstr "Ausgabe vom Client:\n"
-
-#: src/gsasl.c:152
-#, c-format
-msgid "Output from server:\n"
-msgstr "Ausgabe vom Server:\n"
-
-#: src/gsasl.c:302 src/gsasl.c:347 src/gsasl.c:402 src/gsasl.c:447
-#: src/gsasl.c:542
-#, c-format
-msgid "Libgsasl error (%d): %s\n"
-msgstr "Libgsasl-Fehler (%d): %s\n"
-
-#: src/gsasl.c:356
-#, c-format
-msgid "This client supports the following mechanisms:\n"
-msgstr "Dieser Client unterstützt folgende Mechanismen:\n"
-
-#: src/gsasl.c:359
-#, c-format
-msgid "This server supports the following mechanisms:\n"
-msgstr "Dieser Server unterstützt folgende Mechanismen:\n"
-
-#: src/gsasl.c:384
-#, c-format
-msgid "Cannot find mechanism...\n"
-msgstr "Kann Mechanismus nicht finden...\n"
-
-#: src/gsasl.c:433
-#, c-format
-msgid "Enter base64 authentication data from server (press RET if none):\n"
-msgstr "Geben Sie Base64-Authentifizierungsdaten vom Server ein (ENTER für
keine):\n"
-
-#: src/gsasl.c:436
-#, c-format
-msgid "Enter base64 authentication data from client (press RET if none):\n"
-msgstr "Geben Sie Base64-Authentifizierungsdaten vom Client ein (ENTER für
keine):\n"
-
-#: src/gsasl.c:458
-#, c-format
-msgid "Client authentication finished (server trusted)...\n"
-msgstr "Client-Authentifizierung abgeschlossen (der Server vertraut)...\n"
-
-#: src/gsasl.c:461
-#, c-format
-msgid "Server authentication finished (client trusted)...\n"
-msgstr "Server-Authentifizierung abgeschlossen (der Client vertraut)...\n"
-
-#: src/gsasl.c:476
-#, c-format
-msgid "Enter application data (EOF to finish):\n"
-msgstr "Geben Sie Anwendungsdaten ein (EOF zum Beenden):\n"
-
-#: src/gsasl.c:515
-#, c-format
-msgid "Base64 encoded application data to send:\n"
-msgstr "Base64-codierte Anwendungsdaten zum Verschicken:\n"
-
-#: src/gsasl.c:549
-#, c-format
-msgid "Session finished...\n"
-msgstr "Sitzung beendet...\n"
+#: src/error.c:46
+msgid "Libgsasl success"
+msgstr "Libgsasl erfolgreich"
+
+#: src/error.c:47
+msgid "SASL mechanism needs more data"
+msgstr "SASL-Methode benötigt mehr Daten"
+
+#: src/error.c:48
+msgid "Unknown SASL mechanism"
+msgstr "Unbekannte SASL-Methode"
+
+#: src/error.c:50
+msgid "SASL mechanism called too many times"
+msgstr "SASL-Methode wurde zu oft aufgerufen"
+
+#: src/error.c:52
+msgid "SASL function needs larger buffer (internal error)"
+msgstr "SASL-Funktion benötigt einen gröÃeren Puffer (interner Fehler)"
+
+#: src/error.c:53
+msgid "Could not open file in SASL library"
+msgstr "Datei in SASL-Bibliothek konnte nicht geöffnet werden"
+
+#: src/error.c:54
+msgid "Could not close file in SASL library"
+msgstr "Datei in SASL-Bibliothek konnte nicht geschlossen werden"
+
+#: src/error.c:55
+msgid "Memory allocation error in SASL library"
+msgstr "Speicher konnte nicht bereitgestellt werden in SASL-Bibliothek"
+
+#: src/error.c:56
+msgid "Base 64 coding error in SASL library"
+msgstr "Base-64 Kodierungsfehler in SASL-Bibliothek"
+
+#: src/error.c:57
+msgid "Low-level crypto error in SASL library"
+msgstr "Kryptographischer systemnaher Fehler in SASL-Bibliothek"
+
+#: src/error.c:60
+msgid "SASL mechanism needs gsasl_client_callback_anonymous() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_client_callback_anonymous() Rückruf
(Fehler in Andwendung)"
+
+#: src/error.c:63
+msgid "SASL mechanism needs gsasl_client_callback_password() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_client_callback_password() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:66
+msgid "SASL mechanism needs gsasl_client_callback_passcode() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_client_callback_passcode() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:69
+msgid "SASL mechanism needs gsasl_client_callback_pin() callback (application
error)"
+msgstr "SASL-Methode benötigt gsasl_client_callback_pin() Rückruf (Fehler in
Anwendung)"
+
+#: src/error.c:72
+msgid "SASL mechanism needs gsasl_client_callback_authorization_id() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_client_callback_service() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:75
+msgid "SASL mechanism needs gsasl_client_callback_authentication_id() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_client_callback_authentication_id()
Rückruf (Fehler in Anwendung)"
+
+#: src/error.c:78
+msgid "SASL mechanism needs gsasl_client_callback_service() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_client_callback_service() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:81
+msgid "SASL mechanism needs gsasl_server_callback_validate() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_validate() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:84
+msgid "SASL mechanism needs gsasl_server_callback_cram_md5() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_cram_md5() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:87
+msgid "SASL mechanism needs gsasl_server_callback_digest_md5() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_digest_md5() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:90
+msgid "SASL mechanism needs gsasl_server_callback_external() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_external() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:93
+msgid "SASL mechanism needs gsasl_server_callback_anonymous() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_anonymous() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:96
+msgid "SASL mechanism needs gsasl_server_callback_realm() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_realm() Rückruf (Fehler
in Anwendung)"
+
+#: src/error.c:99
+msgid "SASL mechanism needs gsasl_server_callback_securid() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_securid() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:102
+msgid "SASL mechanism needs gsasl_server_callback_service() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_service() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:105
+msgid "SASL mechanism needs gsasl_server_callback_gssapi() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_gssapi() Rückruf (Fehler
in Anwendung)"
+
+#: src/error.c:108
+msgid "SASL mechanism needs gsasl_server_callback_retrieve() callback
(application error)"
+msgstr "SASL-Methode benötigt gsasl_server_callback_retrive() Rückruf
(Fehler in Anwendung)"
+
+#: src/error.c:111
+msgid "Failed to perform Unicode Normalization on string."
+msgstr "Unicode-Normalisierung einer Zeichenkette fehlgeschlagen"
+
+#: src/error.c:113
+msgid "Could not prepare internationalized (non-ASCII) string."
+msgstr "Konnte internationalisierte Zeichenkette (nicht-ASCII) nicht
vorbereiten"
+
+#: src/error.c:115
+msgid "SASL mechanism could not parse input"
+msgstr "SASL-Methode konnte die Eingabe nicht parsen"
+
+#: src/error.c:116
+msgid "Error authenticating user"
+msgstr "Fehler beim Authentisieren des Benutzers"
+
+#: src/error.c:118
+msgid "Cannot get internal library handle (library error)"
+msgstr "Konnte Handle der internen Bibliothek nicht erhalten
(Bibliothekfehler)"
+
+#: src/error.c:119
+msgid "Integrity error in application payload"
+msgstr "Integritätsfehler in der Nutzlast der Anwendung"
+
+#: src/error.c:120
+msgid "No more realms available (non-fatal)"
+msgstr "Keine Gebiete (realms) mehr verfügbar (nicht fatal)"
+
+#: src/error.c:122
+msgid "Client-side functionality not available in library (application error)"
+msgstr "Funktionalität seitens des Clients nicht verfügbar in der Bibliothek
(Andwendungsfehler)"
+
+#: src/error.c:125
+msgid "Server-side functionality not available in library (application error)"
+msgstr "Funktionalität seitens des Servers nicht verfügbar in der Bibliothek
(Anwendungsfehler)"
+
+#: src/error.c:128
+msgid "GSSAPI library could not deallocate memory in gss_release_buffer() in
SASL library. This is a serious internal error."
+msgstr "GSSAPI-Bibliothek konnte Speicher in gss_release_buffer() in
SASL-Bibliothek nicht freigeben. Dies ist ein gravierender interner Fehler."
+
+#: src/error.c:132
+msgid "GSSAPI library could not understand a peer name in gss_import_name() in
SASL library. This is most likely due to incorrect service and/or hostnames."
+msgstr "GSSAPI-Bibliothek konnte einen Peernamen in gss_import_name() in der
SASL-Bibliothek nicht verstehen. Dies ist höchstwahrscheinlich bedingt durch
einen inkorrekten Service- und/oder Hostnamen."
+
+#: src/error.c:136
+msgid "GSSAPI error in client while negotiating security context in
gss_init_sec_context() in SASL library. This is most likely due insufficient
credentials or malicious interactions."
+msgstr "GSSAPI-Fehler im Client während der Verhandlung des
Sicherheitskontexts in gss_init_sec_context() in der SASL-Bibliothek. Dies ist
höchstwahrscheinlich bedingt durch unzureichende Zeugnisse oder bösartige
Interaktionen."
+
+#: src/error.c:140
+msgid "GSSAPI error in server while negotiating security context in
gss_accept_sec_context() in SASL library. This is most likely due insufficient
credentials or malicious interactions."
+msgstr "GSSAPI-Fehler im Server während der Verhandlung des
Sicherheitskontexts in gss_accept_sec_context() in der SASL-Bibliothek. Dies
ist höchstwahrscheinlich bedingt durch unzureichende Zeugnisse oder bösartige
Interaktionen."
+
+#: src/error.c:144
+msgid "GSSAPI error while decrypting or decoding data in gss_unwrap() in SASL
library. This is most likely due to data corruption."
+msgstr "GSSAPI-Fehler während der Entschlüsselung von Daten in gss_unwrap()
in der SASL-Bibliothek. Dies ist höchstwahrscheinlich bedingt durch
Verfälschung der Daten."
+
+#: src/error.c:147
+msgid "GSSAPI error while encrypting or encoding data in gss_wrap() in SASL
library."
+msgstr "GSSAPI-Fehler beim Verschlüsseln von Daten in gss_wrap() in der
SASL-Bibliothek."
+
+#: src/error.c:150
+msgid "GSSAPI error acquiring credentials in gss_acquire_cred() in SASL
library. This is most likely due to not having the proper Kerberos key
available in /etc/krb5.keytab on the server."
+msgstr "GSSAPI-Fehler beim Erwerben der Zeugnisse in gss_acquire_cred() in der
SASL-Bibliothek. Dies ist höchstwahrscheinlich bedingt durch einen inkorrekten
Kerberos-Schlüssel in /etc/krb5.keytab auf dem Server."
+
+#: src/error.c:154
+msgid "GSSAPI error creating a display name denoting the client in
gss_display_name() in SASL library. This is probably because the client
supplied bad data."
+msgstr "GSSAPI-Fehler beim Erstellen einen Bildschirmnamens zum Kennzeichnen
des Clients in gss_display_name() in der SASL-Bibliothek. Dies ist
wahrscheinlich bedingt durch inkorrete Daten, die vom Client bereitgestellt
wurden. "
+
+#: src/error.c:158
+msgid "Other entity requested integrity or confidentiality protection in
GSSAPI mechanism but this is currently not implemented."
+msgstr "Eine andere Entität beantragte Integritäts- oder
Geheimhaltungssicherung in der GSSAPI-Methode, aber dies wird gegenwärtig
nicht unterstützt."
+
+#: src/error.c:161
+msgid "Kerberos V5 initialization failure."
+msgstr "Initialisierungsfehler von Kerbereos V5."
+
+#: src/error.c:163
+msgid "Kerberos V5 internal error."
+msgstr "Interner Fehler von Kerberos V5."
+
+#: src/error.c:165
+msgid "SecurID needs additional passcode."
+msgstr "SecurID benötigt einen weiteren Passcode. "
+
+#: src/error.c:167
+msgid "SecurID needs new pin."
+msgstr "SecurID benötigt einen neuen Pin."
+
+#: src/error.c:169
+msgid "The provided library handle was invalid (application error)"
+msgstr "Der bereitgestellte Bibliotheken-Handle ist ungültigt
(Anwendungsfehler)"
+
+#: src/error.c:171
+msgid "No callback specified by caller (application error)."
+msgstr "Keine Rückrufsfunktions vom Aufruf angeben (Anwendungsfehler)."
+
+#: src/error.c:173
+msgid "Authentication failed because the anonymous token was not provided."
+msgstr "Authentifizierung fehlgeschlagen, da kein anonymes Token
bereitgestellt wurde."
+
+#: src/error.c:176
+msgid "Authentication failed because the authentication identity was not
provided."
+msgstr "Authentifizierung fehlgeschlagen, da keine Identität zum
Authentifizieren angegeben wurde."
+
+#: src/error.c:179
+msgid "Authentication failed because the authorization identity was not
provided."
+msgstr "Authentifizierung fehlgeschlagen, da keine Identität zur
Autorisierung angegeben wurde."
+
+#: src/error.c:182
+msgid "Authentication failed because the password was not provided."
+msgstr "Authentifizierung fehlgeschlagen, da kein Passwort angegeben wurde."
+
+#: src/error.c:184
+msgid "Authentication failed because the passcode was not provided."
+msgstr "Authentifizierung fehlgeschlagen, da kein Passkode angegeben wurde."
+
+#: src/error.c:186
+msgid "Authentication failed because the pin code was not provided."
+msgstr "Authentifizierung fehlgeschlagen, da kein Pin angegeben wurde."
+
+#: src/error.c:188
+msgid "Authentication failed because the service name was not provided."
+msgstr "Authentifizierung fehlgeschlagen, da kein Service-Name angegeben
wurde."
+
+#: src/error.c:190
+msgid "Authentication failed because the host name was not provided."
+msgstr "Authentifizierung fehlgeschlagen, da kein Hostname angegeben wurde."
+
+#: src/error.c:192
+msgid "GSSAPI error encapsulating token."
+msgstr "GSSAPI-Fehler beim Verkapseln des Tokens."
+
+#: src/error.c:194
+msgid "GSSAPI error decapsulating token."
+msgstr "GSSAPI-Fehler beim Entkapseln des Tokens."
+
+#: src/error.c:196
+msgid "GSSAPI error getting OID for SASL mechanism name."
+msgstr "GSSAPI-Fehler beim Erhalten des OID für den Namen der SASL-Methode."
+
+#: src/error.c:198
+msgid "GSSAPI error testing for OID in OID set."
+msgstr "GSSAPI-Fehler beim Prüfen des OID in der OID-Menge."
+
+#: src/error.c:200
+msgid "GSSAPI error releasing OID set."
+msgstr "GSSAPI-Fehler beim Freigeben der OID-Menge."
+
+#: src/error.c:202
+msgid "Authentication failed because a tls-unique CB was not provided."
+msgstr "Autentifizierung fehlgeschlagen, da kein tls-unique CB bereitgestellt
wurde."
+
+#: src/error.c:204
+msgid "Callback failed to provide SAML20 IdP identifier."
+msgstr "Rückruf verfehlte einen SAML20 IdP-Kennung bereitzustellen."
+
+#: src/error.c:206
+msgid "Callback failed to provide SAML20 redirect URL."
+msgstr "Rückruf verfehlte eine SMAL20-Weiterleitungs-URL bereitzustellen."
+
+#: src/error.c:208
+msgid "Callback failed to provide OPENID20 redirect URL."
+msgstr "Rückruf verfehlte eine OPENID20-Weiterleitungs-URL bereitzustellen."
+
+#: src/error.c:230
+msgid "Libgsasl unknown error"
+msgstr "Libgsasl unbekannter Fehler"
diff --git a/maint.mk b/maint.mk
index 1c7af03..4627bc5 100644
--- a/maint.mk
+++ b/maint.mk
@@ -61,7 +61,7 @@ endif
# (i.e., with no $(srcdir) prefix), this definition is careful to
# remove any $(srcdir) prefix, and to restore what it removes.
_sc_excl = \
- $(if $(exclude_file_name_regexp--$@),$(exclude_file_name_regexp--$@),^$$)
+ $(or $(exclude_file_name_regexp--$@),^$$)
VC_LIST_EXCEPT = \
$(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \
| if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
@@ -187,9 +187,11 @@ syntax-check: $(local-check)
#
# in_vc_files | in_files
#
-# grep-E-style regexp denoting the files to check. If no files
-# are specified the default are all the files that are under
-# version control.
+# grep-E-style regexp selecting the files to check. For in_vc_files,
+# the regexp is used to select matching files from the list of all
+# version-controlled files; for in_files, it's from the names printed
+# by "find $(srcdir)". When neither is specified, use all files that
+# are under version control.
#
# containing | non_containing
#
@@ -261,7 +263,7 @@ define _sc_search_regexp
: Filter by file name; \
if test -n "$$in_files"; then \
files=$$(find $(srcdir) | grep -E "$$in_files" \
- | grep -Ev '$(exclude_file_name_regexp--$@)'); \
+ | grep -Ev '$(_sc_excl)'); \
else
\
files=$$($(VC_LIST_EXCEPT)); \
if test -n "$$in_vc_files"; then \
@@ -329,7 +331,15 @@ sp_ = strcmp *\(.+\)
sc_prohibit_strcmp:
@prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)' \
exclude=':# *define STRN?EQ\(' \
- halt='$(ME): replace strcmp calls above with STREQ/STRNEQ' \
+ halt='replace strcmp calls above with STREQ/STRNEQ' \
+ $(_sc_search_regexp)
+
+# Really. You don't want to use this function.
+# It may fail to NUL-terminate the destination,
+# and always NUL-pads out to the specified length.
+sc_prohibit_strncpy:
+ @prohibit='\<strncpy *\(' \
+ halt='do not use strncpy, period' \
$(_sc_search_regexp)
# Pass EXIT_*, not number, to usage, exit, and error (when exiting)
@@ -343,8 +353,9 @@ sc_prohibit_strcmp:
# | xargs --no-run-if-empty \
# perl -pi -e 's/(^|[^.])\b(exit ?)\(0\)/$1$2(EXIT_SUCCESS)/'
sc_prohibit_magic_number_exit:
- @prohibit='(^|[^.])\<(usage|exit) ?\([0-9]|\<error ?\([1-9][0-9]*,'
\
- halt='use EXIT_* values rather than magic number'
\
+ @prohibit='(^|[^.])\<(usage|exit|error) ?\(-?[0-9]+[,)]' \
+ exclude='error ?\((0,|[^,]*)' \
+ halt='use EXIT_* values rather than magic number' \
$(_sc_search_regexp)
# Using EXIT_SUCCESS as the first argument to error is misleading,
@@ -733,7 +744,7 @@ _gl_translatable_diag_func_re ?= error
sc_unmarked_diagnostics:
@prohibit='\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \
exclude='(_|ngettext ?)\(' \
- halt='$(ME): found unmarked diagnostic(s)' \
+ halt='found unmarked diagnostic(s)' \
$(_sc_search_regexp)
# Avoid useless parentheses like those in this example:
@@ -767,6 +778,11 @@ sc_prohibit_always_true_header_tests:
' with the corresponding gnulib module, they are always true') \
$(_sc_search_regexp)
+sc_prohibit_defined_have_decl_tests:
+ @prohibit='#[ ]*if(n?def|.*\<defined)\>[ (]+HAVE_DECL_' \
+ halt='HAVE_DECL macros are always defined' \
+ $(_sc_search_regexp)
+
# ==================================================================
gl_other_headers_ ?= \
intprops.h \
@@ -1004,7 +1020,7 @@ sc_redundant_const:
sc_const_long_option:
@prohibit='^ *static.*struct option ' \
exclude='const struct option|struct option const' \
- halt='$(ME): add "const" to the above declarations' \
+ halt='add "const" to the above declarations' \
$(_sc_search_regexp)
NEWS_hash = \
@@ -1051,7 +1067,7 @@ sc_makefile_at_at_check:
&& { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
news-check: NEWS
- if sed -n $(news-check-lines-spec)p $(srcdir)/NEWS \
+ $(AM_V_GEN)if sed -n $(news-check-lines-spec)p $< \
| grep -E $(news-check-regexp) >/dev/null; then \
:; \
else \
@@ -1107,7 +1123,7 @@ sc_po_check:
# Sometimes it is useful to change the PATH environment variable
# in Makefiles. When doing so, it's better not to use the Unix-centric
# path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'.
-msg = '$(ME): Do not use ":" above; use $$(PATH_SEPARATOR) instead'
+msg = 'Do not use ":" above; use $$(PATH_SEPARATOR) instead'
sc_makefile_path_separator_check:
@prohibit='PATH[=].*:' \
in_vc_files='akefile|\.mk$$' \
@@ -1206,16 +1222,25 @@ sc_prohibit_path_max_allocation:
sc_vulnerable_makefile_CVE-2009-4029:
@prohibit='perm -777 -exec chmod a\+rwx|chmod 777 \$$\(distdir\)' \
- in_files=$$(find $(srcdir) -name Makefile.in) \
+ in_files='(^|/)Makefile\.in$$' \
halt=$$(printf '%s\n' \
'the above files are vulnerable; beware of running' \
' "make dist*" rules, and upgrade to fixed automake' \
' see http://bugzilla.redhat.com/542609 for details') \
$(_sc_search_regexp)
+sc_vulnerable_makefile_CVE-2012-3386:
+ @prohibit='chmod a\+w \$$\(distdir\)' \
+ in_files='(^|/)Makefile\.in$$' \
+ halt=$$(printf '%s\n' \
+ 'the above files are vulnerable; beware of running' \
+ ' "make distcheck", and upgrade to fixed automake' \
+ ' see http://bugzilla.redhat.com/CVE-2012-3386 for details') \
+ $(_sc_search_regexp)
+
vc-diff-check:
- (unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
- if test -s vc-diffs; then \
+ $(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
+ $(AM_V_at)if test -s vc-diffs; then \
cat vc-diffs; \
echo "Some files are locally modified:" 1>&2; \
exit 1; \
@@ -1231,10 +1256,11 @@ bootstrap-tools ?= autoconf,automake,gnulib
# If it's not already specified, derive the GPG key ID from
# the signed tag we've just applied to mark this release.
-gpg_key_ID ?= \
- $$(git cat-file tag v$(VERSION) \
- | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
- | sed -n '/^\[GNUPG:\] ERRSIG /{s///;s/ .*//p;q}')
+gpg_key_ID ?= \
+ $$(cd $(srcdir) \
+ && git cat-file tag v$(VERSION) \
+ | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
+ | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
translation_project_ ?= address@hidden
@@ -1253,13 +1279,14 @@ else
endif
announcement: NEWS ChangeLog $(rel-files)
- @$(srcdir)/$(_build-aux)/announce-gen \
+ $(AM_V_GEN)$(srcdir)/$(_build-aux)/announce-gen \
--mail-headers='$(announcement_mail_headers_)' \
--release-type=$(RELEASE_TYPE) \
--package=$(PACKAGE) \
--prev=$(PREV_VERSION) \
--curr=$(VERSION) \
--gpg-key-id=$(gpg_key_ID) \
+ --srcdir=$(srcdir) \
--news=$(srcdir)/NEWS \
--bootstrap-tools=$(bootstrap-tools) \
$$(case ,$(bootstrap-tools), in (*,gnulib,*) \
@@ -1267,6 +1294,12 @@ announcement: NEWS ChangeLog $(rel-files)
--no-print-checksums \
$(addprefix --url-dir=, $(url_dir_list))
+.PHONY: release-commit
+release-commit:
+ $(AM_V_GEN)cd $(srcdir) \
+ && $(_build-aux)/do-release-commit-and-tag \
+ -C $(abs_builddir) $(RELEASE)
+
## ---------------- ##
## Updating files. ##
## ---------------- ##
@@ -1294,7 +1327,7 @@ endef
.PHONY: no-submodule-changes
no-submodule-changes:
- if test -d $(srcdir)/.git; then \
+ $(AM_V_GEN)if test -d $(srcdir)/.git; then \
diff=$$(cd $(srcdir) && git submodule -q foreach \
git diff-index --name-only HEAD) \
|| exit 1; \
@@ -1333,16 +1366,16 @@ check: $(gl_public_submodule_commit)
.PHONY: alpha beta stable
ALL_RECURSIVE_TARGETS += alpha beta stable
alpha beta stable: $(local-check) writable-files $(submodule-checks)
- test $@ = stable \
+ $(AM_V_GEN)test $@ = stable \
&& { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
|| { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
|| :
- $(MAKE) vc-diff-check
- $(MAKE) news-check
- $(MAKE) distcheck
- $(MAKE) dist
- $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
- $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
+ $(AM_V_at)$(MAKE) vc-diff-check
+ $(AM_V_at)$(MAKE) news-check
+ $(AM_V_at)$(MAKE) distcheck
+ $(AM_V_at)$(MAKE) dist
+ $(AM_V_at)$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
+ $(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
# Override this in cfg.mk if you follow different procedures.
release-prep-hook ?= release-prep
@@ -1350,19 +1383,21 @@ release-prep-hook ?= release-prep
gl_noteworthy_news_ = * Noteworthy changes in release ?.? (????-??-??) [?]
.PHONY: release-prep
release-prep:
- case $$RELEASE_TYPE in alpha|beta|stable) ;; \
+ $(AM_V_GEN)case $$RELEASE_TYPE in alpha|beta|stable) ;; \
*) echo "invalid RELEASE_TYPE: $$RELEASE_TYPE" 1>&2; exit 1;; esac
- $(MAKE) --no-print-directory -s announcement > ~/announce-$(my_distdir)
- if test -d $(release_archive_dir); then \
+ $(AM_V_at)$(MAKE) --no-print-directory -s announcement \
+ > ~/announce-$(my_distdir)
+ $(AM_V_at)if test -d $(release_archive_dir); then \
ln $(rel-files) $(release_archive_dir); \
chmod a-w $(rel-files); \
fi
- echo $(VERSION) > $(prev_version_file)
- $(MAKE) update-NEWS-hash
- perl -pi -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' NEWS
- $(emit-commit-log) > .ci-msg
- $(VC) commit -F .ci-msg -a
- rm .ci-msg
+ $(AM_V_at)echo $(VERSION) > $(prev_version_file)
+ $(AM_V_at)$(MAKE) update-NEWS-hash
+ $(AM_V_at)perl -pi \
+ -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' \
+ $(srcdir)/NEWS
+ $(AM_V_at)msg=$$($(emit-commit-log)) || exit 1; \
+ cd $(srcdir) && $(VC) commit -m "$$msg" -a
# Override this with e.g., -s $(srcdir)/some_other_name.texi
# if the default $(PACKAGE)-derived name doesn't apply.
@@ -1370,14 +1405,20 @@ gendocs_options_ ?=
.PHONY: web-manual
web-manual:
- @test -z "$(manual_title)" \
+ $(AM_V_GEN)test -z "$(manual_title)" \
&& { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
- @cd '$(srcdir)/doc'; \
+ $(AM_V_at)cd '$(srcdir)/doc'; \
$(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \
-o '$(abs_builddir)/doc/manual' \
--email $(PACKAGE_BUGREPORT) $(PACKAGE) \
"$(PACKAGE_NAME) - $(manual_title)"
- @echo " *** Upload the doc/manual directory to web-cvs."
+ $(AM_V_at)echo " *** Upload the doc/manual directory to web-cvs."
+
+.PHONY: web-manual-update
+web-manual-update:
+ $(AM_V_GEN)cd $(srcdir) \
+ && $(_build-aux)/gnu-web-doc-update -C $(abs_builddir)
+
# Code Coverage
@@ -1403,6 +1444,31 @@ gen-coverage:
coverage: init-coverage build-coverage gen-coverage
+# Some projects carry local adjustments for gnulib modules via patches in
+# a gnulib patch directory whose default name is gl/ (defined in bootstrap
+# via local_gl_dir=gl). Those patches become stale as the originals evolve
+# in gnulib. Use this rule to refresh any stale patches. It applies each
+# patch to the original in $(gnulib_dir) and uses the temporary result to
+# generate a fuzz-free .diff file. If you customize the name of your local
+# gnulib patch directory via bootstrap.conf, this rule detects that name.
+# Run this from a non-VPATH (i.e., srcdir) build directory.
+.PHONY: refresh-gnulib-patches
+refresh-gnulib-patches:
+ gl=gl; \
+ if test -f bootstrap.conf; then \
+ t=$$(perl -lne '/^\s*local_gl_dir=(\S+)/ and $$d=$$1;' \
+ -e 'END{defined $$d and print $$d}' bootstrap.conf); \
+ test -n "$$t" && gl=$$t; \
+ fi; \
+ for diff in $$(cd $$gl; git ls-files | grep '\.diff$$'); do \
+ b=$$(printf %s "$$diff"|sed 's/\.diff$$//'); \
+ VERSION_CONTROL=none \
+ patch "$(gnulib_dir)/$$b" "$$gl/$$diff" || exit 1; \
+ ( cd $(gnulib_dir) || exit 1; \
+ git diff "$$b" > "../$$gl/$$diff"; \
+ git checkout $$b ) || exit 1; \
+ done
+
# Update gettext files.
PACKAGE ?= $(shell basename $(PWD))
PO_DOMAIN ?= $(PACKAGE)
@@ -1414,7 +1480,7 @@ refresh-po:
wget --no-verbose --directory-prefix $(PODIR) --no-directories
--recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
echo 'address@hidden' > $(PODIR)/LINGUAS && \
echo 'address@hidden' >> $(PODIR)/LINGUAS && \
- ls $(PODIR)/*.po | sed 's/\.po//' | sed 's,$(PODIR)/,,' | sort >>
$(PODIR)/LINGUAS
+ ls $(PODIR)/*.po | sed 's/\.po//;s,$(PODIR)/,,' | sort >>
$(PODIR)/LINGUAS
# Running indent once is not idempotent, but running it twice is.
INDENT_SOURCES ?= $(C_SOURCES)
@@ -1436,7 +1502,7 @@ update-copyright-env ?=
# in the file .x-update-copyright.
.PHONY: update-copyright
update-copyright:
- grep -l -w Copyright \
+ $(AM_V_GEN)grep -l -w Copyright \
$$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \
| $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@
diff --git a/po/LINGUAS b/po/LINGUAS
index ac61613..15ea44a 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -6,6 +6,7 @@ eu
fi
fr
ga
+hr
id
it
nl
diff --git a/po/pl.po.in b/po/hr.po.in
similarity index 58%
copy from po/pl.po.in
copy to po/hr.po.in
index fd956cc..405d474 100644
--- a/po/pl.po.in
+++ b/po/hr.po.in
@@ -1,35 +1,37 @@
-# Polish translation for gsasl.
-# Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2012 Free Software
Foundation, Inc.
+# Translation of gsasl to Croatian.
+# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the gsasl package.
-# Jakub Bogusz <address@hidden>, 2004-2012.
#
+# Tomislav Krznar <address@hidden>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: gsasl 1.7.4\n"
"Report-Msgid-Bugs-To: address@hidden"
"POT-Creation-Date: 2012-05-16 00:55+0200\n"
-"PO-Revision-Date: 2012-05-21 19:10+0200\n"
-"Last-Translator: Jakub Bogusz <address@hidden>\n"
-"Language-Team: Polish <address@hidden>\n"
-"Language: pl\n"
+"PO-Revision-Date: 2012-08-13 23:09+0200\n"
+"Last-Translator: Tomislav Krznar <address@hidden>\n"
+"Language-Team: Croatian <address@hidden>\n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.4\n"
#: src/imap.c:76 src/smtp.c:79
#, c-format
msgid "Chose SASL mechanisms:\n"
-msgstr "Wybór mechanizmów SASL:\n"
+msgstr "Odaberite SASL mehanizme:\n"
#: src/imap.c:106 src/smtp.c:113 src/gsasl.c:206
#, c-format
msgid "Using mechanism:\n"
-msgstr "Użycie mechanizmu:\n"
+msgstr "Koristim mehanizam:\n"
#: src/imap.c:180
#, c-format
msgid "error: server did not return a token\n"
-msgstr "bÅÄ
d: serwer nie zwróciŠtokenu\n"
+msgstr "greška: poslužitelj nije vratio simbol\n"
#: src/smtp.c:192
#, c-format
@@ -37,230 +39,230 @@ msgid ""
"error: could not parse server data:\n"
"%s\n"
msgstr ""
-"bÅÄ
d: nie udaÅo siÄ przeanalizowaÄ danych z serwera:\n"
+"greška: ne mogu obraditi podatke poslužitelja:\n"
"%s\n"
#: src/gsasl.c:178
#, c-format
msgid "Choose SASL mechanism:\n"
-msgstr "Wybór mechanizmów SASL:\n"
+msgstr "Odaberite SASL mehanizam:\n"
#: src/gsasl.c:187
#, c-format
msgid "Input list of SASL mechanisms supported by server:\n"
-msgstr "WejÅciowa lista mechanizmów SASL obsÅugiwanych przez serwer:\n"
+msgstr "Ulazni popis SASL mehanizama koje podržava poslužitelj:\n"
#: src/gsasl.c:223
#, c-format
msgid "Output from server:\n"
-msgstr "WyjÅcie serwera:\n"
+msgstr "Ispis poslužitelja:\n"
#: src/gsasl.c:225
#, c-format
msgid "Output from client:\n"
-msgstr "WyjÅcie klienta:\n"
+msgstr "Ispis klijenta:\n"
#: src/gsasl.c:272
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Polecenie `%s --help' pozwoli uzyskaÄ wiÄcej informacji.\n"
+msgstr "PokuÅ¡ajte â%s --helpâ za viÅ¡e informacija.\n"
#: src/gsasl.c:327
#, c-format
msgid "missing argument"
-msgstr "brak argumentu"
+msgstr "nedostaje argument"
#: src/gsasl.c:334
#, c-format
msgid "need both --x509-cert-file and --x509-key-file"
-msgstr "wymagane jest zarówno --x509-cert-file jak i --x509-key-file"
+msgstr "zahtijeva i --x509-cert-file i --x509-key-file"
#: src/gsasl.c:338
#, c-format
msgid "cannot use both --starttls and --no-starttls"
-msgstr "nie można użyÄ --starttls i --nostarttls jednoczeÅnie"
+msgstr "ne mogu koristiti i --starttls i --no-starttls"
#: src/gsasl.c:341
#, c-format
msgid "cannot use both --smtp and --imap"
-msgstr "nie można użyÄ --smtp i --imap jednoczeÅnie"
+msgstr "ne mogu koristiti i --smtp i --imap"
#: src/gsasl.c:407
#, c-format
msgid "initialization failure: %s"
-msgstr "bÅÄ
d inicjalizacji: %s"
+msgstr "greška inicijalizacije: %s"
#: src/gsasl.c:422
#, c-format
msgid "error listing mechanisms: %s"
-msgstr "bÅÄ
d wypisywania mechanizmów: %s"
+msgstr "greška ispisa mehanizama: %s"
#: src/gsasl.c:429
#, c-format
msgid "This client supports the following mechanisms:\n"
-msgstr "Mechanizmy obsÅugiwane przez tego klienta:\n"
+msgstr "Ovaj klijent podržava sljedeÄe mehanizme:\n"
#: src/gsasl.c:432
#, c-format
msgid "This server supports the following mechanisms:\n"
-msgstr "Mechanizmy obsÅugiwane przez ten serwer:\n"
+msgstr "Ovaj poslužitelj podržava sljedeÄe mehanizme:\n"
#: src/gsasl.c:494
#, c-format
msgid "GnuTLS global initialization failed: %s"
-msgstr "Globalna inicjalizacja GnuTLS nie powiodÅa siÄ: %s"
+msgstr "GnuTLS globalna inicijalizacija nije uspjela: %s"
#: src/gsasl.c:499
#, c-format
msgid "GnuTLS initialization failed: %s"
-msgstr "Inicjalizacja GnuTLS nie powiodÅa siÄ: %s"
+msgstr "GnuTLS inicijalizacija nije uspjela: %s"
#: src/gsasl.c:504
#, c-format
msgid "setting GnuTLS defaults failed: %s"
-msgstr "ustawienie wartoÅci domyÅlnych GnuTLS nie powiodÅo siÄ: %s"
+msgstr "postavljanje GnuTLS zadanih postavki nije uspjelo: %s"
#: src/gsasl.c:510
#, c-format
msgid "allocating anonymous GnuTLS credential: %s"
-msgstr "przydzielanie anonimowych danych uwierzytelniajÄ
cych GnuTLS: %s"
+msgstr "alociram anonimnu GnuTLS vjerodajnicu: %s"
#: src/gsasl.c:515
#, c-format
msgid "setting anonymous GnuTLS credential: %s"
-msgstr "ustawianie anonimowych danych uwierzytelniajÄ
cych GnuTLS: %s"
+msgstr "postavljam anonimnu GnuTLS vjerodajnicu: %s"
#: src/gsasl.c:520
#, c-format
msgid "allocating X.509 GnuTLS credential: %s"
-msgstr "przydzielanie danych uwierzytelniajÄ
cych X.509 GnuTLS: %s"
+msgstr "alociram X.509 GnuTLS vjerodajnicu: %s"
#: src/gsasl.c:528
#, c-format
msgid "loading X.509 GnuTLS credential: %s"
-msgstr "wczytywanie danych uwierzytelniajÄ
cych X.509 GnuTLS: %s"
+msgstr "uÄitavam X.509 GnuTLS vjerodajnicu: %s"
#: src/gsasl.c:536
#, c-format
msgid "no X.509 CAs found: %s"
-msgstr "nie znaleziono CA X.509: %s"
+msgstr "nijedan X.509 CA nije pronaÄen: %s"
#: src/gsasl.c:539
#, c-format
msgid "no X.509 CAs found"
-msgstr "nie znaleziono CA X.509"
+msgstr "nijedan X.509 CA nije pronaÄen"
#: src/gsasl.c:545
#, c-format
msgid "setting X.509 GnuTLS credential: %s"
-msgstr "ustawianie danych uwierzytelniajÄ
cych X.509 GnuTLS: %s"
+msgstr "postavljam X.509 GnuTLS vjerodajnicu: %s"
#: src/gsasl.c:556
#, c-format
msgid "setting GnuTLS cipher priority (%s): %s\n"
-msgstr "ustawianie priorytetu szyfrów GnuTLS (%s): %s\n"
+msgstr "postavljam GnuTLS prioritet Å¡ifriranja (%s): %s\n"
#: src/gsasl.c:568
#, c-format
msgid "GnuTLS handshake failed: %s"
-msgstr "powitanie GnuTLS nie powiodÅo siÄ: %s"
+msgstr "GnuTLS rukovanje nije uspjelo: %s"
#: src/gsasl.c:577
#, c-format
msgid "verifying peer certificate: %s"
-msgstr "sprawdzanie certyfikatu drugiej strony: %s"
+msgstr "provjeravam certifikat Älana: %s"
#: src/gsasl.c:581
#, c-format
msgid "server certificate is not trusted"
-msgstr "certyfikat serwera nie jest zaufany"
+msgstr "certifikat poslužitelja nije pouzdan"
#: src/gsasl.c:585
#, c-format
msgid "server certificate hasn't got a known issuer"
-msgstr "certyfikat serwera nie ma znanego wystawcy"
+msgstr "certifikat poslužitelja nema poznatog izdavatelja"
#: src/gsasl.c:588
#, c-format
msgid "server certificate has been revoked"
-msgstr "certyfikat serwera zostaÅ anulowany"
+msgstr "certifikat poslužitelja je ukinut"
#: src/gsasl.c:592
#, c-format
msgid "could not verify server certificate (rc=%d)"
-msgstr "nie można zweryfikowaÄ certyfikatu serwera (rc=%d)"
+msgstr "ne mogu provjeriti certifikat poslužitelja (rc=%d)"
#: src/gsasl.c:603
#, c-format
msgid "getting channel binding failed: %s"
-msgstr "pobranie przypisania kanaÅu nie powiodÅo siÄ: %s"
+msgstr "nisam uspio dohvatiti dodijeljene vrijednosti kanala: %s"
#: src/gsasl.c:633
#, c-format
msgid "Cannot find mechanism...\n"
-msgstr "Nie znaleziono mechanizmu...\n"
+msgstr "Ne mogu pronaÄi mehanizam...\n"
#: src/gsasl.c:650
#, c-format
msgid "mechanism unavailable: %s"
-msgstr "mechanizm niedostÄpny: %s"
+msgstr "mehanizam nije dostupan: %s"
#: src/gsasl.c:678
#, c-format
msgid "Enter base64 authentication data from client (press RET if none):\n"
-msgstr "Dana uwierzytelniajÄ
ce base64 od klienta (RET jeÅli żadne):\n"
+msgstr "Unesite base64 podatke ovjere klijenta (pritisnite RET ako ih nema):\n"
#: src/gsasl.c:681
#, c-format
msgid "Enter base64 authentication data from server (press RET if none):\n"
-msgstr "Dane uwierzytelniajÄ
ce base64 od serwera (RET jeÅli żadne):\n"
+msgstr "Unesite base64 podatke ovjere poslužitelja (pritisnite RET ako ih
nema):\n"
#: src/gsasl.c:691
#, c-format
msgid "server error"
-msgstr "bÅÄ
d serwera"
+msgstr "greška poslužitelja"
#: src/gsasl.c:699
#, c-format
msgid "mechanism error: %s"
-msgstr "bÅÄ
d mechanizmu: %s"
+msgstr "greška mehanizma: %s"
#: src/gsasl.c:705
#, c-format
msgid "Server authentication finished (client trusted)...\n"
-msgstr "Uwierzytelnienie serwera zakoÅczone (klient zaufaÅ)...\n"
+msgstr "Ovjera poslužitelja završena (klijent je pouzdan)...\n"
#: src/gsasl.c:708
#, c-format
msgid "Client authentication finished (server trusted)...\n"
-msgstr "Uwierzytelnienie klienta zakoÅczone (serwer zaufaÅ)...\n"
+msgstr "Ovjera klijenta završena (poslužitelj je pouzdan)...\n"
#: src/gsasl.c:733
#, c-format
msgid "Enter application data (EOF to finish):\n"
-msgstr "Dane aplikacji (EOF aby zakoÅczyÄ):\n"
+msgstr "Unesite programske podatke (EOF za završetak):\n"
#: src/gsasl.c:804
#, c-format
msgid "Base64 encoded application data to send:\n"
-msgstr "Zakodowane base64 dane aplikacji do wysÅania:\n"
+msgstr "Base64 kodirani programski podaci za slanje:\n"
#: src/gsasl.c:850
#, c-format
msgid "SASL record too large: %zu\n"
-msgstr "Rekord SASL zbyt duży: %zu\n"
+msgstr "SASL zapis je prevelik: %zu\n"
#: src/gsasl.c:874
#, c-format
msgid "encoding error: %s"
-msgstr "bÅÄ
d kodowania: %s"
+msgstr "greška kodiranja: %s"
#: src/gsasl.c:879
#, c-format
msgid "Session finished...\n"
-msgstr "Sesja zakoÅczona...\n"
+msgstr "Sjednica završena...\n"
#: src/gsasl.c:895
#, c-format
msgid "terminating GnuTLS session failed: %s"
-msgstr "zakoÅczenie sesji GnuTLS nie powiodÅo siÄ: %s"
+msgstr "prekidanje GnuTLS sjednice nije uspjelo: %s"
diff --git a/po/sk.po.in b/po/sk.po.in
index 36b7649..5cfacd6 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -1,264 +1,285 @@
# Slovak translation of gsasl
# Copyright (C) 2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the gsasl package.
-# Ivan Masár <address@hidden>, 2009, 2010.
+# Ivan Masár <address@hidden>, 2009, 2010, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: gsasl 1.4.1\n"
+"Project-Id-Version: gsasl 1.7.4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-02-16 14:57+0100\n"
-"PO-Revision-Date: 2010-02-26 23:15+0100\n"
+"POT-Creation-Date: 2012-05-16 00:55+0200\n"
+"PO-Revision-Date: 2012-07-03 01:00+0100\n"
"Last-Translator: Ivan Masár <address@hidden>\n"
"Language-Team: Slovak <address@hidden>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-#: src/imap.c:78 src/smtp.c:81
+#: src/imap.c:76 src/smtp.c:79
#, c-format
msgid "Chose SASL mechanisms:\n"
msgstr "Vyberte mechanizmy SASL:\n"
-#: src/imap.c:108 src/smtp.c:112 src/gsasl.c:198
+#: src/imap.c:106 src/smtp.c:113 src/gsasl.c:206
#, c-format
msgid "Using mechanism:\n"
msgstr "PoužÃva sa mechanizmus:\n"
-#: src/imap.c:152
+#: src/imap.c:180
#, c-format
-msgid ""
-"error: Server did not return expected SASL data (it must begin with '+ '):\n"
-"%s\n"
-msgstr ""
-"chyba: Server nevrátil oÄakávané údaje SASL (musia zaÄÃnaÅ¥ â+
â):\n"
-"%s\n"
+msgid "error: server did not return a token\n"
+msgstr "chyba: server nevrátil token\n"
-#: src/smtp.c:154
+#: src/smtp.c:192
#, c-format
msgid ""
-"error: Server did not return expected SASL data (it must begin with '334
'):\n"
+"error: could not parse server data:\n"
"%s\n"
msgstr ""
-"chyba: Server nevrátil oÄakávané údaje SASL (musia zaÄÃnaÅ¥ â334
â):\n"
+"chyba: nebolo možné spracovať dáta servera:\n"
"%s\n"
-#: src/gsasl.c:170
+#: src/gsasl.c:178
#, c-format
msgid "Choose SASL mechanism:\n"
msgstr "Vyberte mechanizmus SASL:\n"
-#: src/gsasl.c:179
+#: src/gsasl.c:187
#, c-format
msgid "Input list of SASL mechanisms supported by server:\n"
msgstr "Vstupný zoznam mechanizmov SASL, ktoré server podporuje:\n"
-#: src/gsasl.c:215
+#: src/gsasl.c:223
#, c-format
msgid "Output from server:\n"
msgstr "Výstup zo servera:\n"
-#: src/gsasl.c:217
+#: src/gsasl.c:225
#, c-format
msgid "Output from client:\n"
msgstr "Výstup od klienta:\n"
-#: src/gsasl.c:273
+#: src/gsasl.c:272
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Viac informácià zÃskate pomocou â%s --helpâ.\n"
-#: src/gsasl.c:321
+#: src/gsasl.c:327
#, c-format
msgid "missing argument"
msgstr "chýba argument"
-#: src/gsasl.c:328
+#: src/gsasl.c:334
#, c-format
msgid "need both --x509-cert-file and --x509-key-file"
msgstr "vyžadujú sa oba argumenty: --x509-cert-file aj --x509-key-file"
-#: src/gsasl.c:332
+#: src/gsasl.c:338
#, c-format
msgid "cannot use both --starttls and --no-starttls"
msgstr "nemožno použiÅ¥ súÄasne --starttls a --no-starttls"
-#: src/gsasl.c:335
+#: src/gsasl.c:341
#, c-format
msgid "cannot use both --smtp and --imap"
msgstr "nemožno použiÅ¥ súÄasne --smtp a --imap"
-#: src/gsasl.c:400
+#: src/gsasl.c:407
#, c-format
msgid "initialization failure: %s"
msgstr "chyba inicializácie: %s"
-#: src/gsasl.c:415
+#: src/gsasl.c:422
#, c-format
msgid "error listing mechanisms: %s"
msgstr "chyba pri výpise zoznamu mechanizmov: %s"
-#: src/gsasl.c:422
+#: src/gsasl.c:429
#, c-format
msgid "This client supports the following mechanisms:\n"
msgstr "Tento klient podporuje nasledovné mechanizmy:\n"
-#: src/gsasl.c:425
+#: src/gsasl.c:432
#, c-format
msgid "This server supports the following mechanisms:\n"
msgstr "Tento server podporuje nasledovné mechanizmy:\n"
-#: src/gsasl.c:491
+#: src/gsasl.c:494
#, c-format
msgid "GnuTLS global initialization failed: %s"
msgstr "globálna inicializácia GnuTLS zlyhala: %s"
-#: src/gsasl.c:496
+#: src/gsasl.c:499
#, c-format
msgid "GnuTLS initialization failed: %s"
msgstr "inicializácia GnuTLS zlyhala: %s"
-#: src/gsasl.c:501
+#: src/gsasl.c:504
#, c-format
msgid "setting GnuTLS defaults failed: %s"
msgstr "nastavenie predvolených hodnôt GnuTLS zlyhalo: %s"
-#: src/gsasl.c:507
+#: src/gsasl.c:510
#, c-format
msgid "allocating anonymous GnuTLS credential: %s"
msgstr "vyhradzujú sa anonymné overovacie údaje GnuTLS: %s"
-#: src/gsasl.c:512
+#: src/gsasl.c:515
#, c-format
msgid "setting anonymous GnuTLS credential: %s"
msgstr "nastavujú sa anonymné overovacie údaje GnuTLS: %s"
-#: src/gsasl.c:517
+#: src/gsasl.c:520
#, c-format
msgid "allocating X.509 GnuTLS credential: %s"
msgstr "vyhradzujú sa X.509 overovacie údaje GnuTLS: %s"
-#: src/gsasl.c:525
+#: src/gsasl.c:528
#, c-format
msgid "loading X.509 GnuTLS credential: %s"
msgstr "naÄÃtavajú sa X.509 overovacie údaje GnuTLS: %s"
-#: src/gsasl.c:533
+#: src/gsasl.c:536
#, c-format
msgid "no X.509 CAs found: %s"
msgstr "neboli nájdené žiadne X.509 certifikaÄné autority: %s"
-#: src/gsasl.c:536
+#: src/gsasl.c:539
#, c-format
msgid "no X.509 CAs found"
msgstr "neboli nájdené žiadne X.509 certifikaÄné autority"
-#: src/gsasl.c:542
+#: src/gsasl.c:545
#, c-format
msgid "setting X.509 GnuTLS credential: %s"
msgstr "nastavujú sa X.509 overovacie údaje GnuTLS: %s"
-#: src/gsasl.c:553
+#: src/gsasl.c:556
#, c-format
msgid "setting GnuTLS cipher priority (%s): %s\n"
msgstr "nastavuje sa priorita Å¡ifier GnuTLS (%s): %s\n"
-#: src/gsasl.c:564
+#: src/gsasl.c:568
#, c-format
msgid "GnuTLS handshake failed: %s"
msgstr "zlyhal GnuTLS handshake: %s"
-#: src/gsasl.c:573
+#: src/gsasl.c:577
#, c-format
msgid "verifying peer certificate: %s"
msgstr "overuje sa certifikát druhej strany: %s"
-#: src/gsasl.c:577
+#: src/gsasl.c:581
#, c-format
msgid "server certificate is not trusted"
msgstr "certifikát servera nie je dôveryhodný"
-#: src/gsasl.c:581
+#: src/gsasl.c:585
#, c-format
msgid "server certificate hasn't got a known issuer"
msgstr "certifikát servera nemá známeho vydavateľa"
-#: src/gsasl.c:584
+#: src/gsasl.c:588
#, c-format
msgid "server certificate has been revoked"
msgstr "certifikát servera bol odvolaný"
-#: src/gsasl.c:588
+#: src/gsasl.c:592
#, c-format
msgid "could not verify server certificate (rc=%d)"
msgstr "certifikát servera sa nepodarilo overiť (rc=%d)"
-#: src/gsasl.c:611
+#: src/gsasl.c:603
+#, c-format
+msgid "getting channel binding failed: %s"
+msgstr "zlyhalo zÃskavanie väzby kanála: %s"
+
+#: src/gsasl.c:633
#, c-format
msgid "Cannot find mechanism...\n"
msgstr "Nepodarilo sa nájsť mechanizmus...\n"
-#: src/gsasl.c:628
+#: src/gsasl.c:650
#, c-format
msgid "mechanism unavailable: %s"
msgstr "mechanizmus nie je dostupný: %s"
-#: src/gsasl.c:657
+#: src/gsasl.c:678
#, c-format
msgid "Enter base64 authentication data from client (press RET if none):\n"
msgstr "Zadajte overovacie údaje v base64 od klienta (ak žiadne, stlaÄte
Enter):\n"
-#: src/gsasl.c:660
+#: src/gsasl.c:681
#, c-format
msgid "Enter base64 authentication data from server (press RET if none):\n"
msgstr "Zadajte overovacie údaje v base64 od servera (ak žiadne, stlaÄte
Enter):\n"
-#: src/gsasl.c:670
+#: src/gsasl.c:691
+#, c-format
+msgid "server error"
+msgstr "chyba servera"
+
+#: src/gsasl.c:699
#, c-format
msgid "mechanism error: %s"
msgstr "chyba mechanizmu: %s"
-#: src/gsasl.c:679
+#: src/gsasl.c:705
#, c-format
msgid "Server authentication finished (client trusted)...\n"
msgstr "Overenie u servera dokonÄené (klient je dôveryhodný)...\n"
-#: src/gsasl.c:682
+#: src/gsasl.c:708
#, c-format
msgid "Client authentication finished (server trusted)...\n"
msgstr "Overenie u klienta dokonÄené (server je dôveryhodný)...\n"
-#: src/gsasl.c:705
+#: src/gsasl.c:733
#, c-format
msgid "Enter application data (EOF to finish):\n"
msgstr "Zadajte dáta aplikácie (ukonÄite pomocou EOF):\n"
-#: src/gsasl.c:780
+#: src/gsasl.c:804
#, c-format
msgid "Base64 encoded application data to send:\n"
msgstr "Dáta aplikácie v base64, ktoré sa majú poslať:\n"
-#: src/gsasl.c:822
+#: src/gsasl.c:850
#, c-format
msgid "SASL record too large: %zu\n"
msgstr "Záznam SASL je prÃliÅ¡ veľký: %zu\n"
-#: src/gsasl.c:841
+#: src/gsasl.c:874
#, c-format
msgid "encoding error: %s"
msgstr "chyba kódovania: %s"
-#: src/gsasl.c:846
+#: src/gsasl.c:879
#, c-format
msgid "Session finished...\n"
msgstr "Relácia dokonÄená...\n"
-#: src/gsasl.c:862
+#: src/gsasl.c:895
#, c-format
msgid "terminating GnuTLS session failed: %s"
msgstr "ukonÄenie relácie GnuTLS zlyhalo: %s"
+#~ msgid ""
+#~ "error: Server did not return expected SASL data (it must begin with '+
'):\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "chyba: Server nevrátil oÄakávané údaje SASL (musia zaÄÃnaÅ¥ â+
â):\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "error: Server did not return expected SASL data (it must begin with '334
'):\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "chyba: Server nevrátil oÄakávané údaje SASL (musia zaÄÃnaÅ¥ â334
â):\n"
+#~ "%s\n"
+
#~ msgid "Cannot initialize Windows sockets."
#~ msgstr "Nepodarilo sa inicializovať Windows sockets."
diff --git a/tests/gssapi.c b/tests/gssapi.c
index c91d84c..8cafd88 100644
--- a/tests/gssapi.c
+++ b/tests/gssapi.c
@@ -47,8 +47,8 @@ callback (Gsasl * ctx, Gsasl_session * sctx, Gsasl_property
prop)
switch (prop)
{
- case GSASL_AUTHID:
- gsasl_property_set (sctx, GSASL_AUTHID, USERNAME[i]);
+ case GSASL_AUTHZID:
+ gsasl_property_set (sctx, GSASL_AUTHZID, USERNAME[i]);
rc = GSASL_OK;
break;
hooks/post-receive
--
GNU gsasl
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gsasl branch, master, updated. gsasl-1-8-0-9-gf7d306f,
Simon Josefsson <=