summaryrefslogtreecommitdiffstats
path: root/gl/m4
diff options
context:
space:
mode:
Diffstat (limited to 'gl/m4')
-rw-r--r--gl/m4/asm-underscore.m448
-rw-r--r--gl/m4/getopt.m441
-rw-r--r--gl/m4/gettext.m46
-rw-r--r--gl/m4/gnulib-cache.m44
-rw-r--r--gl/m4/gnulib-common.m410
-rw-r--r--gl/m4/gnulib-comp.m412
-rw-r--r--gl/m4/iconv.m419
-rw-r--r--gl/m4/intl.m493
-rw-r--r--gl/m4/lib-link.m446
-rw-r--r--gl/m4/netdb_h.m417
-rw-r--r--gl/m4/onceonly.m410
-rw-r--r--gl/m4/po.m42
-rw-r--r--gl/m4/printf.m44
-rw-r--r--gl/m4/sha1.m416
-rw-r--r--gl/m4/sockpfaf.m43
-rw-r--r--gl/m4/stdint.m414
-rw-r--r--gl/m4/stdio_h.m43
-rw-r--r--gl/m4/string_h.m43
-rw-r--r--gl/m4/strnlen.m422
-rw-r--r--gl/m4/time_h.m419
-rw-r--r--gl/m4/unistd_h.m411
-rw-r--r--gl/m4/vasnprintf.m414
-rw-r--r--gl/m4/visibility.m426
23 files changed, 323 insertions, 120 deletions
diff --git a/gl/m4/asm-underscore.m4 b/gl/m4/asm-underscore.m4
new file mode 100644
index 0000000..1736cc4
--- /dev/null
+++ b/gl/m4/asm-underscore.m4
@@ -0,0 +1,48 @@
1# asm-underscore.m4 serial 1
2dnl Copyright (C) 2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible. Based on as-underscore.m4 in GNU clisp.
8
9# gl_ASM_SYMBOL_PREFIX
10# Tests for the prefix of C symbols at the assembly language level and the
11# linker level. This prefix is either an underscore or empty. Defines the
12# C macro USER_LABEL_PREFIX to this prefix, and sets ASM_SYMBOL_PREFIX to
13# a stringified variant of this prefix.
14
15AC_DEFUN([gl_ASM_SYMBOL_PREFIX],
16[
17 dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because
18 dnl 1. It works only for GCC.
19 dnl 2. It is incorrectly defined on some platforms, in some GCC versions.
20 AC_CACHE_CHECK(
21 [whether C symbols are prefixed with underscore at the linker level],
22 [gl_cv_prog_as_underscore],
23 [cat > conftest.c <<EOF
24#ifdef __cplusplus
25extern "C" int foo (void);
26#endif
27int foo(void) { return 0; }
28EOF
29 # Look for the assembly language name in the .s file.
30 AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -S conftest.c) >/dev/null 2>&1
31 if grep _foo conftest.s >/dev/null ; then
32 gl_cv_prog_as_underscore=yes
33 else
34 gl_cv_prog_as_underscore=no
35 fi
36 rm -f conftest*
37 ])
38 if test $gl_cv_prog_as_underscore = yes; then
39 USER_LABEL_PREFIX=_
40 else
41 USER_LABEL_PREFIX=
42 fi
43 AC_DEFINE_UNQUOTED([USER_LABEL_PREFIX], [$USER_LABEL_PREFIX],
44 [Define to the prefix of C symbols at the assembler and linker level,
45 either an underscore or empty.])
46 ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
47 AC_SUBST([ASM_SYMBOL_PREFIX])
48])
diff --git a/gl/m4/getopt.m4 b/gl/m4/getopt.m4
index a19805e..5b211e5 100644
--- a/gl/m4/getopt.m4
+++ b/gl/m4/getopt.m4
@@ -1,4 +1,4 @@
1# getopt.m4 serial 24 1# getopt.m4 serial 28
2dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -79,8 +79,13 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
79 dnl Existence of the variable, in and of itself, is not a reason to replace 79 dnl Existence of the variable, in and of itself, is not a reason to replace
80 dnl getopt, but knowledge of the variable is needed to determine how to 80 dnl getopt, but knowledge of the variable is needed to determine how to
81 dnl reset and whether a reset reparses the environment. 81 dnl reset and whether a reset reparses the environment.
82 if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then 82 dnl Solaris supports neither optreset nor optind=0, but keeps no state that
83 AC_CHECK_DECLS([optreset], [], [], 83 dnl needs a reset beyond setting optind=1; detect Solaris by getopt_clip.
84 if test -z "$gl_replace_getopt"; then
85 AC_CHECK_DECLS([optreset], [],
86 [AC_CHECK_DECLS([getopt_clip], [], [],
87 [[#include <getopt.h>]])
88 ],
84 [[#include <getopt.h>]]) 89 [[#include <getopt.h>]])
85 fi 90 fi
86 91
@@ -89,6 +94,10 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
89 dnl is left over from earlier calls, and neither setting optind = 0 nor 94 dnl is left over from earlier calls, and neither setting optind = 0 nor
90 dnl setting optreset = 1 get rid of this internal state. 95 dnl setting optreset = 1 get rid of this internal state.
91 dnl POSIX is silent on optind vs. optreset, so we allow either behavior. 96 dnl POSIX is silent on optind vs. optreset, so we allow either behavior.
97 dnl POSIX 2008 does not specify leading '+' behavior, but see
98 dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on
99 dnl the next version of POSIX. For now, we only guarantee leading '+'
100 dnl behavior with getopt-gnu.
92 if test -z "$gl_replace_getopt"; then 101 if test -z "$gl_replace_getopt"; then
93 AC_CACHE_CHECK([whether getopt is POSIX compatible], 102 AC_CACHE_CHECK([whether getopt is POSIX compatible],
94 [gl_cv_func_getopt_posix], 103 [gl_cv_func_getopt_posix],
@@ -99,7 +108,7 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
99#include <stdlib.h> 108#include <stdlib.h>
100#include <string.h> 109#include <string.h>
101 110
102#if !HAVE_DECL_OPTRESET 111#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP
103# define OPTIND_MIN 0 112# define OPTIND_MIN 0
104#else 113#else
105# define OPTIND_MIN 1 114# define OPTIND_MIN 1
@@ -167,6 +176,20 @@ main ()
167 if (!(optind == 1)) 176 if (!(optind == 1))
168 return 12; 177 return 12;
169 } 178 }
179 /* Detect MacOS 10.5 bug. */
180 {
181 char *argv[3] = { "program", "-ab", NULL };
182 optind = OPTIND_MIN;
183 opterr = 0;
184 if (getopt (2, argv, "ab:") != 'a')
185 return 13;
186 if (getopt (2, argv, "ab:") != '?')
187 return 14;
188 if (optopt != 'b')
189 return 15;
190 if (optind != 2)
191 return 16;
192 }
170 193
171 return 0; 194 return 0;
172} 195}
@@ -174,6 +197,7 @@ main ()
174 [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], 197 [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no],
175 [case "$host_os" in 198 [case "$host_os" in
176 mingw*) gl_cv_func_getopt_posix="guessing no";; 199 mingw*) gl_cv_func_getopt_posix="guessing no";;
200 darwin*) gl_cv_func_getopt_posix="guessing no";;
177 *) gl_cv_func_getopt_posix="guessing yes";; 201 *) gl_cv_func_getopt_posix="guessing yes";;
178 esac 202 esac
179 ]) 203 ])
@@ -234,6 +258,15 @@ main ()
234 if (getopt (3, argv, "-p") != 'p') 258 if (getopt (3, argv, "-p") != 'p')
235 return 7; 259 return 7;
236 } 260 }
261 /* This code fails on glibc 2.11. */
262 {
263 char *argv[] = { "program", "-b", "-a", NULL };
264 optind = opterr = 0;
265 if (getopt (3, argv, "+:a:b") != 'b')
266 return 8;
267 if (getopt (3, argv, "+:a:b") != ':')
268 return 9;
269 }
237 return 0; 270 return 0;
238 ]])], 271 ]])],
239 [gl_cv_func_getopt_gnu=yes], 272 [gl_cv_func_getopt_gnu=yes],
diff --git a/gl/m4/gettext.m4 b/gl/m4/gettext.m4
index d6dc3fe..f84e6a5 100644
--- a/gl/m4/gettext.m4
+++ b/gl/m4/gettext.m4
@@ -1,4 +1,4 @@
1# gettext.m4 serial 62 (gettext-0.18) 1# gettext.m4 serial 63 (gettext-0.18)
2dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
15 15
16dnl Authors: 16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
19 19
20dnl Macro to add for using GNU gettext. 20dnl Macro to add for using GNU gettext.
21 21
@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
60 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , 60 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
61 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT 61 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
62])])])])]) 62])])])])])
63 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
64 [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
63 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , 65 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
64 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT 66 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
65])])])]) 67])])])])
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 0ac6b96..97b1849 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,12 +15,13 @@
15 15
16 16
17# Specification in the form of a command-line invocation: 17# Specification in the form of a command-line invocation:
18# gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl base64 dirname floorf fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex timegm vasprintf vsnprintf 18# gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname floorf fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex timegm vasprintf vsnprintf
19 19
20# Specification in the form of a few gnulib-tool.m4 macro invocations: 20# Specification in the form of a few gnulib-tool.m4 macro invocations:
21gl_LOCAL_DIR([]) 21gl_LOCAL_DIR([])
22gl_MODULES([ 22gl_MODULES([
23 base64 23 base64
24 crypto/sha1
24 dirname 25 dirname
25 floorf 26 floorf
26 fsusage 27 fsusage
@@ -45,3 +46,4 @@ gl_LIB([libgnu])
45gl_MAKEFILE_NAME([]) 46gl_MAKEFILE_NAME([])
46gl_MACRO_PREFIX([gl]) 47gl_MACRO_PREFIX([gl])
47gl_PO_DOMAIN([]) 48gl_PO_DOMAIN([])
49gl_VC_FILES([false])
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index 9cc519e..4c7ac30 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
1# gnulib-common.m4 serial 18 1# gnulib-common.m4 serial 20
2dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -35,6 +35,12 @@ AC_DEFUN([gl_COMMON_BODY], [
35 is a misnomer outside of parameter lists. */ 35 is a misnomer outside of parameter lists. */
36#define _UNUSED_PARAMETER_ _GL_UNUSED 36#define _UNUSED_PARAMETER_ _GL_UNUSED
37]) 37])
38 dnl Preparation for running test programs:
39 dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
40 dnl to /dev/tty, so they can be redirected to log files. Such diagnostics
41 dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N.
42 LIBC_FATAL_STDERR_=1
43 export LIBC_FATAL_STDERR_
38]) 44])
39 45
40# gl_MODULE_INDICATOR_CONDITION 46# gl_MODULE_INDICATOR_CONDITION
@@ -132,6 +138,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [
132# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ 138# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
133# works. 139# works.
134# This definition can be removed once autoconf >= 2.62 can be assumed. 140# This definition can be removed once autoconf >= 2.62 can be assumed.
141m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
135AC_DEFUN([AC_C_RESTRICT], 142AC_DEFUN([AC_C_RESTRICT],
136[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], 143[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
137 [ac_cv_c_restrict=no 144 [ac_cv_c_restrict=no
@@ -169,6 +176,7 @@ AC_DEFUN([AC_C_RESTRICT],
169 *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; 176 *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
170 esac 177 esac
171]) 178])
179])
172 180
173# gl_BIGENDIAN 181# gl_BIGENDIAN
174# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. 182# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 4a956e4..f4031cc 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -26,7 +26,6 @@ AC_DEFUN([gl_EARLY],
26 m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable 26 m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
27 AC_REQUIRE([AC_PROG_RANLIB]) 27 AC_REQUIRE([AC_PROG_RANLIB])
28 # Code from module alignof: 28 # Code from module alignof:
29 # Code from module alloca:
30 # Code from module alloca-opt: 29 # Code from module alloca-opt:
31 # Code from module arg-nonnull: 30 # Code from module arg-nonnull:
32 # Code from module arpa_inet: 31 # Code from module arpa_inet:
@@ -37,6 +36,7 @@ AC_DEFUN([gl_EARLY],
37 # Code from module cloexec: 36 # Code from module cloexec:
38 # Code from module close-hook: 37 # Code from module close-hook:
39 # Code from module configmake: 38 # Code from module configmake:
39 # Code from module crypto/sha1:
40 # Code from module dirname: 40 # Code from module dirname:
41 # Code from module dirname-lgpl: 41 # Code from module dirname-lgpl:
42 # Code from module double-slash-root: 42 # Code from module double-slash-root:
@@ -146,7 +146,6 @@ AC_DEFUN([gl_INIT],
146 gl_COMMON 146 gl_COMMON
147 gl_source_base='gl' 147 gl_source_base='gl'
148 # Code from module alignof: 148 # Code from module alignof:
149 # Code from module alloca:
150 # Code from module alloca-opt: 149 # Code from module alloca-opt:
151 gl_FUNC_ALLOCA 150 gl_FUNC_ALLOCA
152 # Code from module arg-nonnull: 151 # Code from module arg-nonnull:
@@ -166,6 +165,8 @@ AC_DEFUN([gl_INIT],
166 gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) 165 gl_MODULE_INDICATOR_FOR_TESTS([cloexec])
167 # Code from module close-hook: 166 # Code from module close-hook:
168 # Code from module configmake: 167 # Code from module configmake:
168 # Code from module crypto/sha1:
169 gl_SHA1
169 # Code from module dirname: 170 # Code from module dirname:
170 gl_DIRNAME 171 gl_DIRNAME
171 gl_MODULE_INDICATOR([dirname]) 172 gl_MODULE_INDICATOR([dirname])
@@ -222,7 +223,7 @@ AC_DEFUN([gl_INIT],
222 gl_FUNC_GETOPT_POSIX 223 gl_FUNC_GETOPT_POSIX
223 # Code from module gettext: 224 # Code from module gettext:
224 dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac. 225 dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
225 AM_GNU_GETTEXT_VERSION([0.17]) 226 AM_GNU_GETTEXT_VERSION([0.18.1])
226 # Code from module gettext-h: 227 # Code from module gettext-h:
227 AC_SUBST([LIBINTL]) 228 AC_SUBST([LIBINTL])
228 AC_SUBST([LTLIBINTL]) 229 AC_SUBST([LTLIBINTL])
@@ -522,7 +523,6 @@ AC_DEFUN([gl_FILE_LIST], [
522 build-aux/config.rpath 523 build-aux/config.rpath
523 build-aux/warn-on-use.h 524 build-aux/warn-on-use.h
524 lib/alignof.h 525 lib/alignof.h
525 lib/alloca.c
526 lib/alloca.in.h 526 lib/alloca.in.h
527 lib/arpa_inet.in.h 527 lib/arpa_inet.in.h
528 lib/asnprintf.c 528 lib/asnprintf.c
@@ -613,6 +613,8 @@ AC_DEFUN([gl_FILE_LIST], [
613 lib/safe-read.h 613 lib/safe-read.h
614 lib/safe-write.c 614 lib/safe-write.c
615 lib/safe-write.h 615 lib/safe-write.h
616 lib/sha1.c
617 lib/sha1.h
616 lib/size_max.h 618 lib/size_max.h
617 lib/snprintf.c 619 lib/snprintf.c
618 lib/sockets.c 620 lib/sockets.c
@@ -660,6 +662,7 @@ AC_DEFUN([gl_FILE_LIST], [
660 m4/00gnulib.m4 662 m4/00gnulib.m4
661 m4/alloca.m4 663 m4/alloca.m4
662 m4/arpa_inet_h.m4 664 m4/arpa_inet_h.m4
665 m4/asm-underscore.m4
663 m4/base64.m4 666 m4/base64.m4
664 m4/btowc.m4 667 m4/btowc.m4
665 m4/c-strtod.m4 668 m4/c-strtod.m4
@@ -740,6 +743,7 @@ AC_DEFUN([gl_FILE_LIST], [
740 m4/safe-read.m4 743 m4/safe-read.m4
741 m4/safe-write.m4 744 m4/safe-write.m4
742 m4/servent.m4 745 m4/servent.m4
746 m4/sha1.m4
743 m4/size_max.m4 747 m4/size_max.m4
744 m4/snprintf.m4 748 m4/snprintf.m4
745 m4/sockets.m4 749 m4/sockets.m4
diff --git a/gl/m4/iconv.m4 b/gl/m4/iconv.m4
index f46ff14..e2041b9 100644
--- a/gl/m4/iconv.m4
+++ b/gl/m4/iconv.m4
@@ -1,4 +1,4 @@
1# iconv.m4 serial 9 (gettext-0.18) 1# iconv.m4 serial 11 (gettext-0.18.1)
2dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -170,7 +170,22 @@ int main ()
170 AC_SUBST([LTLIBICONV]) 170 AC_SUBST([LTLIBICONV])
171]) 171])
172 172
173AC_DEFUN([AM_ICONV], 173dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
174dnl avoid warnings like
175dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
176dnl This is tricky because of the way 'aclocal' is implemented:
177dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
178dnl Otherwise aclocal's initial scan pass would miss the macro definition.
179dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
180dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
181dnl warnings.
182m4_define([gl_iconv_AC_DEFUN],
183 m4_version_prereq([2.64],
184 [[AC_DEFUN_ONCE(
185 [$1], [$2])]],
186 [[AC_DEFUN(
187 [$1], [$2])]]))
188gl_iconv_AC_DEFUN([AM_ICONV],
174[ 189[
175 AM_ICONV_LINK 190 AM_ICONV_LINK
176 if test "$am_cv_func_iconv" = yes; then 191 if test "$am_cv_func_iconv" = yes; then
diff --git a/gl/m4/intl.m4 b/gl/m4/intl.m4
index 5e17fea..335b23c 100644
--- a/gl/m4/intl.m4
+++ b/gl/m4/intl.m4
@@ -1,5 +1,5 @@
1# intl.m4 serial 8 (gettext-0.17) 1# intl.m4 serial 17 (gettext-0.18)
2dnl Copyright (C) 1995-2007, 2009-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -15,9 +15,9 @@ dnl They are *not* in the public domain.
15 15
16dnl Authors: 16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2009.
19 19
20AC_PREREQ(2.52) 20AC_PREREQ([2.52])
21 21
22dnl Checks for all prerequisites of the intl subdirectory, 22dnl Checks for all prerequisites of the intl subdirectory,
23dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, 23dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
@@ -40,14 +40,24 @@ AC_DEFUN([AM_INTL_SUBDIR],
40 AC_REQUIRE([gt_PRINTF_POSIX]) 40 AC_REQUIRE([gt_PRINTF_POSIX])
41 AC_REQUIRE([gl_GLIBC21])dnl 41 AC_REQUIRE([gl_GLIBC21])dnl
42 AC_REQUIRE([gl_XSIZE])dnl 42 AC_REQUIRE([gl_XSIZE])dnl
43 AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
43 AC_REQUIRE([gt_INTL_MACOSX])dnl 44 AC_REQUIRE([gt_INTL_MACOSX])dnl
44 45
46 dnl Support for automake's --enable-silent-rules.
47 case "$enable_silent_rules" in
48 yes) INTL_DEFAULT_VERBOSITY=0;;
49 no) INTL_DEFAULT_VERBOSITY=1;;
50 *) INTL_DEFAULT_VERBOSITY=1;;
51 esac
52 AC_SUBST([INTL_DEFAULT_VERBOSITY])
53
45 AC_CHECK_TYPE([ptrdiff_t], , 54 AC_CHECK_TYPE([ptrdiff_t], ,
46 [AC_DEFINE([ptrdiff_t], [long], 55 [AC_DEFINE([ptrdiff_t], [long],
47 [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) 56 [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
48 ]) 57 ])
49 AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) 58 AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
50 AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) 59 AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
60 snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
51 61
52 dnl Use the _snprintf function only if it is declared (because on NetBSD it 62 dnl Use the _snprintf function only if it is declared (because on NetBSD it
53 dnl is defined as a weak alias of snprintf; we prefer to use the latter). 63 dnl is defined as a weak alias of snprintf; we prefer to use the latter).
@@ -78,6 +88,12 @@ AC_DEFUN([AM_INTL_SUBDIR],
78 HAVE_SNPRINTF=0 88 HAVE_SNPRINTF=0
79 fi 89 fi
80 AC_SUBST([HAVE_SNPRINTF]) 90 AC_SUBST([HAVE_SNPRINTF])
91 if test "$ac_cv_func_newlocale" = yes; then
92 HAVE_NEWLOCALE=1
93 else
94 HAVE_NEWLOCALE=0
95 fi
96 AC_SUBST([HAVE_NEWLOCALE])
81 if test "$ac_cv_func_wprintf" = yes; then 97 if test "$ac_cv_func_wprintf" = yes; then
82 HAVE_WPRINTF=1 98 HAVE_WPRINTF=1
83 else 99 else
@@ -146,22 +162,31 @@ AC_DEFUN([AM_INTL_SUBDIR],
146#define __libc_lock_lock_recursive gl_recursive_lock_lock 162#define __libc_lock_lock_recursive gl_recursive_lock_lock
147#define __libc_lock_unlock_recursive gl_recursive_lock_unlock 163#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
148#define glthread_in_use libintl_thread_in_use 164#define glthread_in_use libintl_thread_in_use
149#define glthread_lock_init libintl_lock_init 165#define glthread_lock_init_func libintl_lock_init_func
150#define glthread_lock_lock libintl_lock_lock 166#define glthread_lock_lock_func libintl_lock_lock_func
151#define glthread_lock_unlock libintl_lock_unlock 167#define glthread_lock_unlock_func libintl_lock_unlock_func
152#define glthread_lock_destroy libintl_lock_destroy 168#define glthread_lock_destroy_func libintl_lock_destroy_func
153#define glthread_rwlock_init libintl_rwlock_init 169#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded
154#define glthread_rwlock_rdlock libintl_rwlock_rdlock 170#define glthread_rwlock_init_func libintl_rwlock_init_func
155#define glthread_rwlock_wrlock libintl_rwlock_wrlock 171#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded
156#define glthread_rwlock_unlock libintl_rwlock_unlock 172#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func
157#define glthread_rwlock_destroy libintl_rwlock_destroy 173#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded
158#define glthread_recursive_lock_init libintl_recursive_lock_init 174#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func
159#define glthread_recursive_lock_lock libintl_recursive_lock_lock 175#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded
160#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock 176#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func
161#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy 177#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded
162#define glthread_once libintl_once 178#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func
163#define glthread_once_call libintl_once_call 179#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded
180#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func
181#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded
182#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func
183#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded
184#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func
185#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded
186#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func
187#define glthread_once_func libintl_once_func
164#define glthread_once_singlethreaded libintl_once_singlethreaded 188#define glthread_once_singlethreaded libintl_once_singlethreaded
189#define glthread_once_multithreaded libintl_once_multithreaded
165]) 190])
166]) 191])
167 192
@@ -198,40 +223,24 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
198 AC_TRY_LINK( 223 AC_TRY_LINK(
199 [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], 224 [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
200 [], 225 [],
201 [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, 226 [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
202 [Define to 1 if the compiler understands __builtin_expect.])]) 227 [Define to 1 if the compiler understands __builtin_expect.])])
203 228
204 AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) 229 AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
205 AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ 230 AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
206 stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ 231 stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
207 argz_next __fsetlocking]) 232 argz_stringify argz_next __fsetlocking])
208 233
209 dnl Use the *_unlocked functions only if they are declared. 234 dnl Use the *_unlocked functions only if they are declared.
210 dnl (because some of them were defined without being declared in Solaris 235 dnl (because some of them were defined without being declared in Solaris
211 dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built 236 dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
212 dnl on Solaris 2.5.1 to run on Solaris 2.6). 237 dnl on Solaris 2.5.1 to run on Solaris 2.6).
213 dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. 238 dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
214 gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) 239 gt_CHECK_DECL([feof_unlocked], [#include <stdio.h>])
215 gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) 240 gt_CHECK_DECL([fgets_unlocked], [#include <stdio.h>])
216 241
217 AM_ICONV 242 AM_ICONV
218 243
219 dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
220 dnl and a _NL_LOCALE_NAME macro always.
221 AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
222 [AC_TRY_LINK([#include <langinfo.h>
223#include <locale.h>],
224 [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));
225 return !cs;
226 ],
227 gt_cv_nl_locale_name=yes,
228 gt_cv_nl_locale_name=no)
229 ])
230 if test $gt_cv_nl_locale_name = yes; then
231 AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
232 [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
233 fi
234
235 dnl intl/plural.c is generated from intl/plural.y. It requires bison, 244 dnl intl/plural.c is generated from intl/plural.y. It requires bison,
236 dnl because plural.y uses bison specific features. It requires at least 245 dnl because plural.y uses bison specific features. It requires at least
237 dnl bison-1.26 because earlier versions generate a plural.c that doesn't 246 dnl bison-1.26 because earlier versions generate a plural.c that doesn't
@@ -269,7 +278,7 @@ dnl gt_CHECK_DECL(FUNC, INCLUDES)
269dnl Check whether a function is declared. 278dnl Check whether a function is declared.
270AC_DEFUN([gt_CHECK_DECL], 279AC_DEFUN([gt_CHECK_DECL],
271[ 280[
272 AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, 281 AC_CACHE_CHECK([whether $1 is declared], [ac_cv_have_decl_$1],
273 [AC_TRY_COMPILE([$2], [ 282 [AC_TRY_COMPILE([$2], [
274#ifndef $1 283#ifndef $1
275 char *p = (char *) $1; 284 char *p = (char *) $1;
diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4
index 90e1ac9..59b367d 100644
--- a/gl/m4/lib-link.m4
+++ b/gl/m4/lib-link.m4
@@ -1,4 +1,4 @@
1# lib-link.m4 serial 20 (gettext-0.18) 1# lib-link.m4 serial 23 (gettext-0.18.2)
2dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
18[ 18[
19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
20 AC_REQUIRE([AC_LIB_RPATH]) 20 AC_REQUIRE([AC_LIB_RPATH])
21 pushdef([Name],[translit([$1],[./-], [___])]) 21 pushdef([Name],[m4_translit([$1],[./+-], [____])])
22 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 22 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
24 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ 24 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
25 AC_LIB_LINKFLAGS_BODY([$1], [$2]) 25 AC_LIB_LINKFLAGS_BODY([$1], [$2])
26 ac_cv_lib[]Name[]_libs="$LIB[]NAME" 26 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -58,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
58[ 58[
59 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 59 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
60 AC_REQUIRE([AC_LIB_RPATH]) 60 AC_REQUIRE([AC_LIB_RPATH])
61 pushdef([Name],[translit([$1],[./-], [___])]) 61 pushdef([Name],[m4_translit([$1],[./+-], [____])])
62 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 62 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
63 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 63 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
64 64
65 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME 65 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
66 dnl accordingly. 66 dnl accordingly.
@@ -74,7 +74,17 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
74 74
75 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ 75 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
76 ac_save_LIBS="$LIBS" 76 ac_save_LIBS="$LIBS"
77 LIBS="$LIBS $LIB[]NAME" 77 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
78 dnl because these -l options might require -L options that are present in
79 dnl LIBS. -l options benefit only from the -L options listed before it.
80 dnl Otherwise, add it to the front of LIBS, because it may be a static
81 dnl library that depends on another static library that is present in LIBS.
82 dnl Static libraries benefit only from the static libraries listed after
83 dnl it.
84 case " $LIB[]NAME" in
85 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
86 *) LIBS="$LIB[]NAME $LIBS" ;;
87 esac
78 AC_TRY_LINK([$3], [$4], 88 AC_TRY_LINK([$3], [$4],
79 [ac_cv_lib[]Name=yes], 89 [ac_cv_lib[]Name=yes],
80 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) 90 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
@@ -147,13 +157,13 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
147dnl macro call that searches for libname. 157dnl macro call that searches for libname.
148AC_DEFUN([AC_LIB_FROMPACKAGE], 158AC_DEFUN([AC_LIB_FROMPACKAGE],
149[ 159[
150 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 160 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
151 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 161 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
152 define([acl_frompackage_]NAME, [$2]) 162 define([acl_frompackage_]NAME, [$2])
153 popdef([NAME]) 163 popdef([NAME])
154 pushdef([PACK],[$2]) 164 pushdef([PACK],[$2])
155 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], 165 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
156 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 166 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
157 define([acl_libsinpackage_]PACKUP, 167 define([acl_libsinpackage_]PACKUP,
158 m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) 168 m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
159 popdef([PACKUP]) 169 popdef([PACKUP])
@@ -168,14 +178,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
168AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 178AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
169[ 179[
170 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 180 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
171 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 181 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
172 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 182 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
173 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) 183 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
174 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], 184 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
175 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 185 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
176 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) 186 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
177 dnl Autoconf >= 2.61 supports dots in --with options. 187 dnl Autoconf >= 2.61 supports dots in --with options.
178 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) 188 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
179 dnl By default, look in $includedir and $libdir. 189 dnl By default, look in $includedir and $libdir.
180 use_additional=yes 190 use_additional=yes
181 AC_LIB_WITH_FINAL_PREFIX([ 191 AC_LIB_WITH_FINAL_PREFIX([
@@ -232,7 +242,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
232 names_already_handled="$names_already_handled $name" 242 names_already_handled="$names_already_handled $name"
233 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS 243 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
234 dnl or AC_LIB_HAVE_LINKFLAGS call. 244 dnl or AC_LIB_HAVE_LINKFLAGS call.
235 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` 245 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
236 eval value=\"\$HAVE_LIB$uppername\" 246 eval value=\"\$HAVE_LIB$uppername\"
237 if test -n "$value"; then 247 if test -n "$value"; then
238 if test "$value" = yes; then 248 if test "$value" = yes; then
diff --git a/gl/m4/netdb_h.m4 b/gl/m4/netdb_h.m4
index 40ba8f6..c870fb6 100644
--- a/gl/m4/netdb_h.m4
+++ b/gl/m4/netdb_h.m4
@@ -1,4 +1,4 @@
1# netdb_h.m4 serial 7 1# netdb_h.m4 serial 9
2dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -10,21 +10,16 @@ AC_DEFUN([gl_HEADER_NETDB],
10 AC_CHECK_HEADERS_ONCE([netdb.h]) 10 AC_CHECK_HEADERS_ONCE([netdb.h])
11 gl_CHECK_NEXT_HEADERS([netdb.h]) 11 gl_CHECK_NEXT_HEADERS([netdb.h])
12 if test $ac_cv_header_netdb_h = yes; then 12 if test $ac_cv_header_netdb_h = yes; then
13 AC_COMPILE_IFELSE(
14 [AC_LANG_PROGRAM([[
15 #include <netdb.h>
16 struct addrinfo a;
17 int b = EAI_OVERFLOW;
18 int c = AI_NUMERICSERV;
19 ]])],
20 [NETDB_H=''], [NETDB_H='netdb.h'])
21 HAVE_NETDB_H=1 13 HAVE_NETDB_H=1
22 else 14 else
23 NETDB_H='netdb.h'
24 HAVE_NETDB_H=0 15 HAVE_NETDB_H=0
25 fi 16 fi
26 AC_SUBST([HAVE_NETDB_H]) 17 AC_SUBST([HAVE_NETDB_H])
27 AC_SUBST([NETDB_H]) 18
19 dnl Check for declarations of anything we want to poison if the
20 dnl corresponding gnulib module is not in use.
21 gl_WARN_ON_USE_PREPARE([[#include <netdb.h>]],
22 [getaddrinfo freeaddrinfo gai_strerror getnameinfo])
28]) 23])
29 24
30AC_DEFUN([gl_NETDB_MODULE_INDICATOR], 25AC_DEFUN([gl_NETDB_MODULE_INDICATOR],
diff --git a/gl/m4/onceonly.m4 b/gl/m4/onceonly.m4
index 4a3cd84..6a9c87b 100644
--- a/gl/m4/onceonly.m4
+++ b/gl/m4/onceonly.m4
@@ -1,4 +1,4 @@
1# onceonly.m4 serial 6 1# onceonly.m4 serial 7
2dnl Copyright (C) 2002-2003, 2005-2006, 2008-2010 Free Software Foundation, 2dnl Copyright (C) 2002-2003, 2005-2006, 2008-2010 Free Software Foundation,
3dnl Inc. 3dnl Inc.
4dnl This file is free software, distributed under the terms of the GNU 4dnl This file is free software, distributed under the terms of the GNU
@@ -39,16 +39,16 @@ AC_PREREQ([2.59])
39AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ 39AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
40 : 40 :
41 m4_foreach_w([gl_HEADER_NAME], [$1], [ 41 m4_foreach_w([gl_HEADER_NAME], [$1], [
42 AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, 42 AC_DEFUN([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME,
43 [./-], [___])), [ 43 [./-], [___])), [
44 m4_divert_text([INIT_PREPARE], 44 m4_divert_text([INIT_PREPARE],
45 [gl_header_list="$gl_header_list gl_HEADER_NAME"]) 45 [gl_header_list="$gl_header_list gl_HEADER_NAME"])
46 gl_HEADERS_EXPANSION 46 gl_HEADERS_EXPANSION
47 AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])), 47 AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
48 [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.]) 48 [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
49 ]) 49 ])
50 AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, 50 AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME,
51 [./-], [___]))) 51 [./-], [___])))
52 ]) 52 ])
53]) 53])
54m4_define([gl_HEADERS_EXPANSION], [ 54m4_define([gl_HEADERS_EXPANSION], [
diff --git a/gl/m4/po.m4 b/gl/m4/po.m4
index 960efe1..47f36a4 100644
--- a/gl/m4/po.m4
+++ b/gl/m4/po.m4
@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
29 29
30 dnl Release version of the gettext macros. This is used to ensure that 30 dnl Release version of the gettext macros. This is used to ensure that
31 dnl the gettext macros and po/Makefile.in.in are in sync. 31 dnl the gettext macros and po/Makefile.in.in are in sync.
32 AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) 32 AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
33 33
34 dnl Perform the following tests also if --disable-nls has been given, 34 dnl Perform the following tests also if --disable-nls has been given,
35 dnl because they are needed for "make dist" to work. 35 dnl because they are needed for "make dist" to work.
diff --git a/gl/m4/printf.m4 b/gl/m4/printf.m4
index ebca536..b31efe3 100644
--- a/gl/m4/printf.m4
+++ b/gl/m4/printf.m4
@@ -1,4 +1,4 @@
1# printf.m4 serial 33 1# printf.m4 serial 34
2dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -1101,7 +1101,7 @@ dnl }
1101dnl --------------------------------------------------------------------- 1101dnl ---------------------------------------------------------------------
1102dnl Result is gl_cv_func_snprintf_retval_c99. 1102dnl Result is gl_cv_func_snprintf_retval_c99.
1103 1103
1104AC_DEFUN([gl_SNPRINTF_RETVAL_C99], 1104AC_DEFUN_ONCE([gl_SNPRINTF_RETVAL_C99],
1105[ 1105[
1106 AC_REQUIRE([AC_PROG_CC]) 1106 AC_REQUIRE([AC_PROG_CC])
1107 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles 1107 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
diff --git a/gl/m4/sha1.m4 b/gl/m4/sha1.m4
new file mode 100644
index 0000000..0d18d85
--- /dev/null
+++ b/gl/m4/sha1.m4
@@ -0,0 +1,16 @@
1# sha1.m4 serial 9
2dnl Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free Software
3dnl Foundation, Inc.
4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it,
6dnl with or without modifications, as long as this notice is preserved.
7
8AC_DEFUN([gl_SHA1],
9[
10 AC_LIBOBJ([sha1])
11
12 dnl Prerequisites of lib/sha1.c.
13 AC_REQUIRE([gl_BIGENDIAN])
14 AC_REQUIRE([AC_C_INLINE])
15 :
16])
diff --git a/gl/m4/sockpfaf.m4 b/gl/m4/sockpfaf.m4
index 8a0c236..8806705 100644
--- a/gl/m4/sockpfaf.m4
+++ b/gl/m4/sockpfaf.m4
@@ -47,6 +47,9 @@ AC_DEFUN([gl_SOCKET_FAMILIES],
47#endif 47#endif
48#ifdef HAVE_WINSOCK2_H 48#ifdef HAVE_WINSOCK2_H
49#include <winsock2.h> 49#include <winsock2.h>
50#endif
51#ifdef HAVE_WS2TCPIP_H
52#include <ws2tcpip.h>
50#endif]], 53#endif]],
51[[int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; 54[[int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z;
52 if (&x && &y && &z) return 0;]])], 55 if (&x && &y && &z) return 0;]])],
diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4
index 1cc57e6..c5e813a 100644
--- a/gl/m4/stdint.m4
+++ b/gl/m4/stdint.m4
@@ -1,4 +1,4 @@
1# stdint.m4 serial 34 1# stdint.m4 serial 35
2dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -309,7 +309,7 @@ AC_DEFUN([gl_STDINT_BITSIZEOF],
309 dnl config.h.in, 309 dnl config.h.in,
310 dnl - extra AC_SUBST calls, so that the right substitutions are made. 310 dnl - extra AC_SUBST calls, so that the right substitutions are made.
311 m4_foreach_w([gltype], [$1], 311 m4_foreach_w([gltype], [$1],
312 [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), 312 [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
313 [Define to the number of bits in type ']gltype['.])]) 313 [Define to the number of bits in type ']gltype['.])])
314 for gltype in $1 ; do 314 for gltype in $1 ; do
315 AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}], 315 AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
@@ -334,7 +334,7 @@ AC_DEFUN([gl_STDINT_BITSIZEOF],
334 eval BITSIZEOF_${GLTYPE}=\$result 334 eval BITSIZEOF_${GLTYPE}=\$result
335 done 335 done
336 m4_foreach_w([gltype], [$1], 336 m4_foreach_w([gltype], [$1],
337 [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) 337 [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
338]) 338])
339 339
340dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES) 340dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
@@ -347,7 +347,7 @@ AC_DEFUN([gl_CHECK_TYPES_SIGNED],
347 dnl config.h.in, 347 dnl config.h.in,
348 dnl - extra AC_SUBST calls, so that the right substitutions are made. 348 dnl - extra AC_SUBST calls, so that the right substitutions are made.
349 m4_foreach_w([gltype], [$1], 349 m4_foreach_w([gltype], [$1],
350 [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), 350 [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
351 [Define to 1 if ']gltype[' is a signed integer type.])]) 351 [Define to 1 if ']gltype[' is a signed integer type.])])
352 for gltype in $1 ; do 352 for gltype in $1 ; do
353 AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed], 353 AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
@@ -367,7 +367,7 @@ AC_DEFUN([gl_CHECK_TYPES_SIGNED],
367 fi 367 fi
368 done 368 done
369 m4_foreach_w([gltype], [$1], 369 m4_foreach_w([gltype], [$1],
370 [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) 370 [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
371]) 371])
372 372
373dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES) 373dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
@@ -380,7 +380,7 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
380 dnl config.h.in, 380 dnl config.h.in,
381 dnl - extra AC_SUBST calls, so that the right substitutions are made. 381 dnl - extra AC_SUBST calls, so that the right substitutions are made.
382 m4_foreach_w([gltype], [$1], 382 m4_foreach_w([gltype], [$1],
383 [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX], 383 [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
384 [Define to l, ll, u, ul, ull, etc., as suitable for 384 [Define to l, ll, u, ul, ull, etc., as suitable for
385 constants of type ']gltype['.])]) 385 constants of type ']gltype['.])])
386 for gltype in $1 ; do 386 for gltype in $1 ; do
@@ -419,7 +419,7 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
419 AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result]) 419 AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
420 done 420 done
421 m4_foreach_w([gltype], [$1], 421 m4_foreach_w([gltype], [$1],
422 [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])]) 422 [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
423]) 423])
424 424
425dnl gl_STDINT_INCLUDES 425dnl gl_STDINT_INCLUDES
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index 1d1d95e..f5650cd 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,4 +1,4 @@
1# stdio_h.m4 serial 30 1# stdio_h.m4 serial 31
2dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -8,6 +8,7 @@ AC_DEFUN([gl_STDIO_H],
8[ 8[
9 AC_REQUIRE([gl_STDIO_H_DEFAULTS]) 9 AC_REQUIRE([gl_STDIO_H_DEFAULTS])
10 AC_REQUIRE([AC_C_INLINE]) 10 AC_REQUIRE([AC_C_INLINE])
11 AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
11 gl_CHECK_NEXT_HEADERS([stdio.h]) 12 gl_CHECK_NEXT_HEADERS([stdio.h])
12 dnl No need to create extra modules for these functions. Everyone who uses 13 dnl No need to create extra modules for these functions. Everyone who uses
13 dnl <stdio.h> likely needs them. 14 dnl <stdio.h> likely needs them.
diff --git a/gl/m4/string_h.m4 b/gl/m4/string_h.m4
index cf26123..1977aec 100644
--- a/gl/m4/string_h.m4
+++ b/gl/m4/string_h.m4
@@ -5,7 +5,7 @@
5# gives unlimited permission to copy and/or distribute it, 5# gives unlimited permission to copy and/or distribute it,
6# with or without modifications, as long as this notice is preserved. 6# with or without modifications, as long as this notice is preserved.
7 7
8# serial 16 8# serial 17
9 9
10# Written by Paul Eggert. 10# Written by Paul Eggert.
11 11
@@ -105,6 +105,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
105 REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) 105 REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR])
106 REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT]) 106 REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT])
107 REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP]) 107 REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP])
108 REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN])
108 REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) 109 REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL])
109 REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R]) 110 REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R])
110 UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R]) 111 UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R])
diff --git a/gl/m4/strnlen.m4 b/gl/m4/strnlen.m4
index cd48948..52bb838 100644
--- a/gl/m4/strnlen.m4
+++ b/gl/m4/strnlen.m4
@@ -1,4 +1,4 @@
1# strnlen.m4 serial 10 1# strnlen.m4 serial 12
2dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation, 2dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation,
3dnl Inc. 3dnl Inc.
4dnl This file is free software; the Free Software Foundation 4dnl This file is free software; the Free Software Foundation
@@ -7,23 +7,23 @@ dnl with or without modifications, as long as this notice is preserved.
7 7
8AC_DEFUN([gl_FUNC_STRNLEN], 8AC_DEFUN([gl_FUNC_STRNLEN],
9[ 9[
10 AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
11
10 dnl Persuade glibc <string.h> to declare strnlen(). 12 dnl Persuade glibc <string.h> to declare strnlen().
11 AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) 13 AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
12 14
13 AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
14 AC_CHECK_DECLS_ONCE([strnlen]) 15 AC_CHECK_DECLS_ONCE([strnlen])
15 if test $ac_cv_have_decl_strnlen = no; then 16 if test $ac_cv_have_decl_strnlen = no; then
16 HAVE_DECL_STRNLEN=0 17 HAVE_DECL_STRNLEN=0
18 else
19 AC_FUNC_STRNLEN
20 dnl Note: AC_FUNC_STRNLEN does AC_LIBOBJ([strnlen]).
21 if test $ac_cv_func_strnlen_working = no; then
22 REPLACE_STRNLEN=1
23 fi
17 fi 24 fi
18 25 if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
19 AC_FUNC_STRNLEN 26 AC_LIBOBJ([strnlen])
20 if test $ac_cv_func_strnlen_working = no; then
21 # This is necessary because automake-1.6.1 doesn't understand
22 # that the above use of AC_FUNC_STRNLEN means we may have to use
23 # lib/strnlen.c.
24 #AC_LIBOBJ([strnlen])
25 AC_DEFINE([strnlen], [rpl_strnlen],
26 [Define to rpl_strnlen if the replacement function should be used.])
27 gl_PREREQ_STRNLEN 27 gl_PREREQ_STRNLEN
28 fi 28 fi
29]) 29])
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index b88ba94..a45a10a 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -2,6 +2,8 @@
2 2
3# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc. 3# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
4 4
5# serial 2
6
5# This file is free software; the Free Software Foundation 7# This file is free software; the Free Software Foundation
6# gives unlimited permission to copy and/or distribute it, 8# gives unlimited permission to copy and/or distribute it,
7# with or without modifications, as long as this notice is preserved. 9# with or without modifications, as long as this notice is preserved.
@@ -24,7 +26,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY],
24]) 26])
25 27
26dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared 28dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
27dnl in time.h or sys/time.h. 29dnl in time.h, sys/time.h, or pthread.h.
28 30
29AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], 31AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
30[ 32[
@@ -41,6 +43,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
41 43
42 TIME_H_DEFINES_STRUCT_TIMESPEC=0 44 TIME_H_DEFINES_STRUCT_TIMESPEC=0
43 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 45 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
46 PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
44 if test $gl_cv_sys_struct_timespec_in_time_h = yes; then 47 if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
45 TIME_H_DEFINES_STRUCT_TIMESPEC=1 48 TIME_H_DEFINES_STRUCT_TIMESPEC=1
46 else 49 else
@@ -55,10 +58,24 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
55 [gl_cv_sys_struct_timespec_in_sys_time_h=no])]) 58 [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
56 if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then 59 if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
57 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1 60 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
61 else
62 AC_CACHE_CHECK([for struct timespec in <pthread.h>],
63 [gl_cv_sys_struct_timespec_in_pthread_h],
64 [AC_COMPILE_IFELSE(
65 [AC_LANG_PROGRAM(
66 [[#include <pthread.h>
67 ]],
68 [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
69 [gl_cv_sys_struct_timespec_in_pthread_h=yes],
70 [gl_cv_sys_struct_timespec_in_pthread_h=no])])
71 if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
72 PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
73 fi
58 fi 74 fi
59 fi 75 fi
60 AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC]) 76 AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC])
61 AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC]) 77 AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC])
78 AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC])
62]) 79])
63 80
64AC_DEFUN([gl_TIME_MODULE_INDICATOR], 81AC_DEFUN([gl_TIME_MODULE_INDICATOR],
diff --git a/gl/m4/unistd_h.m4 b/gl/m4/unistd_h.m4
index 8c2eec6..48d06c7 100644
--- a/gl/m4/unistd_h.m4
+++ b/gl/m4/unistd_h.m4
@@ -1,4 +1,4 @@
1# unistd_h.m4 serial 45 1# unistd_h.m4 serial 46
2dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -38,8 +38,9 @@ AC_DEFUN([gl_UNISTD_H],
38 ]], [chown dup2 dup3 environ euidaccess faccessat fchdir fchownat 38 ]], [chown dup2 dup3 environ euidaccess faccessat fchdir fchownat
39 fsync ftruncate getcwd getdomainname getdtablesize getgroups 39 fsync ftruncate getcwd getdomainname getdtablesize getgroups
40 gethostname getlogin getlogin_r getpagesize getusershell setusershell 40 gethostname getlogin getlogin_r getpagesize getusershell setusershell
41 endusershell lchown link linkat lseek pipe2 pread readlink readlinkat 41 endusershell lchown link linkat lseek pipe2 pread pwrite readlink
42 rmdir sleep symlink symlinkat ttyname_r unlink unlinkat usleep]) 42 readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat
43 usleep])
43]) 44])
44 45
45AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], 46AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
@@ -79,6 +80,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
79 GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) 80 GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK])
80 GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) 81 GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2])
81 GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) 82 GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD])
83 GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE])
82 GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) 84 GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK])
83 GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) 85 GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT])
84 GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) 86 GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR])
@@ -113,6 +115,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
113 HAVE_LINKAT=1; AC_SUBST([HAVE_LINKAT]) 115 HAVE_LINKAT=1; AC_SUBST([HAVE_LINKAT])
114 HAVE_PIPE2=1; AC_SUBST([HAVE_PIPE2]) 116 HAVE_PIPE2=1; AC_SUBST([HAVE_PIPE2])
115 HAVE_PREAD=1; AC_SUBST([HAVE_PREAD]) 117 HAVE_PREAD=1; AC_SUBST([HAVE_PREAD])
118 HAVE_PWRITE=1; AC_SUBST([HAVE_PWRITE])
116 HAVE_READLINK=1; AC_SUBST([HAVE_READLINK]) 119 HAVE_READLINK=1; AC_SUBST([HAVE_READLINK])
117 HAVE_READLINKAT=1; AC_SUBST([HAVE_READLINKAT]) 120 HAVE_READLINKAT=1; AC_SUBST([HAVE_READLINKAT])
118 HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) 121 HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP])
@@ -140,10 +143,12 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
140 REPLACE_LINKAT=0; AC_SUBST([REPLACE_LINKAT]) 143 REPLACE_LINKAT=0; AC_SUBST([REPLACE_LINKAT])
141 REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK]) 144 REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK])
142 REPLACE_PREAD=0; AC_SUBST([REPLACE_PREAD]) 145 REPLACE_PREAD=0; AC_SUBST([REPLACE_PREAD])
146 REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE])
143 REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) 147 REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK])
144 REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) 148 REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR])
145 REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) 149 REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP])
146 REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) 150 REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK])
151 REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R])
147 REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) 152 REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK])
148 REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) 153 REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT])
149 REPLACE_USLEEP=0; AC_SUBST([REPLACE_USLEEP]) 154 REPLACE_USLEEP=0; AC_SUBST([REPLACE_USLEEP])
diff --git a/gl/m4/vasnprintf.m4 b/gl/m4/vasnprintf.m4
index 50a20cc..ebe3c52 100644
--- a/gl/m4/vasnprintf.m4
+++ b/gl/m4/vasnprintf.m4
@@ -1,4 +1,4 @@
1# vasnprintf.m4 serial 29 1# vasnprintf.m4 serial 31
2dnl Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -54,6 +54,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
54# Prerequisites of lib/vasnprintf.c. 54# Prerequisites of lib/vasnprintf.c.
55AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], 55AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
56[ 56[
57 AC_REQUIRE([AC_C_INLINE])
57 AC_REQUIRE([AC_FUNC_ALLOCA]) 58 AC_REQUIRE([AC_FUNC_ALLOCA])
58 AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) 59 AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
59 AC_REQUIRE([gt_TYPE_WCHAR_T]) 60 AC_REQUIRE([gt_TYPE_WCHAR_T])
@@ -62,6 +63,17 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
62 dnl Use the _snprintf function only if it is declared (because on NetBSD it 63 dnl Use the _snprintf function only if it is declared (because on NetBSD it
63 dnl is defined as a weak alias of snprintf; we prefer to use the latter). 64 dnl is defined as a weak alias of snprintf; we prefer to use the latter).
64 AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>]) 65 AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
66 dnl We can avoid a lot of code by assuming that snprintf's return value
67 dnl conforms to ISO C99. So check that.
68 AC_REQUIRE([gl_SNPRINTF_RETVAL_C99])
69 case "$gl_cv_func_snprintf_retval_c99" in
70 *yes)
71 AC_DEFINE([HAVE_SNPRINTF_RETVAL_C99], [1],
72 [Define if the return value of the snprintf function is the number of
73 of bytes (excluding the terminating NUL) that would have been produced
74 if the buffer had been large enough.])
75 ;;
76 esac
65]) 77])
66 78
67# Extra prerequisites of lib/vasnprintf.c for supporting 'long double' 79# Extra prerequisites of lib/vasnprintf.c for supporting 'long double'
diff --git a/gl/m4/visibility.m4 b/gl/m4/visibility.m4
index 6d3f9c9..077c476 100644
--- a/gl/m4/visibility.m4
+++ b/gl/m4/visibility.m4
@@ -1,4 +1,4 @@
1# visibility.m4 serial 2 (gettext-0.18) 1# visibility.m4 serial 3 (gettext-0.18)
2dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc. 2dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -26,15 +26,37 @@ AC_DEFUN([gl_VISIBILITY],
26 CFLAG_VISIBILITY= 26 CFLAG_VISIBILITY=
27 HAVE_VISIBILITY=0 27 HAVE_VISIBILITY=0
28 if test -n "$GCC"; then 28 if test -n "$GCC"; then
29 dnl First, check whether -Werror can be added to the command line, or
30 dnl whether it leads to an error because of some other option that the
31 dnl user has put into $CC $CFLAGS $CPPFLAGS.
32 AC_MSG_CHECKING([whether the -Werror option is usable])
33 AC_CACHE_VAL([gl_cv_cc_vis_werror], [
34 gl_save_CFLAGS="$CFLAGS"
35 CFLAGS="$CFLAGS -Werror"
36 AC_TRY_COMPILE([], [],
37 [gl_cv_cc_vis_werror=yes],
38 [gl_cv_cc_vis_werror=no])
39 CFLAGS="$gl_save_CFLAGS"])
40 AC_MSG_RESULT([$gl_cv_cc_vis_werror])
41 dnl Now check whether visibility declarations are supported.
29 AC_MSG_CHECKING([for simple visibility declarations]) 42 AC_MSG_CHECKING([for simple visibility declarations])
30 AC_CACHE_VAL([gl_cv_cc_visibility], [ 43 AC_CACHE_VAL([gl_cv_cc_visibility], [
31 gl_save_CFLAGS="$CFLAGS" 44 gl_save_CFLAGS="$CFLAGS"
32 CFLAGS="$CFLAGS -fvisibility=hidden" 45 CFLAGS="$CFLAGS -fvisibility=hidden"
46 dnl We use the option -Werror and a function dummyfunc, because on some
47 dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
48 dnl "visibility attribute not supported in this configuration; ignored"
49 dnl at the first function definition in every compilation unit, and we
50 dnl don't want to use the option in this case.
51 if test $gl_cv_cc_vis_werror = yes; then
52 CFLAGS="$CFLAGS -Werror"
53 fi
33 AC_TRY_COMPILE( 54 AC_TRY_COMPILE(
34 [extern __attribute__((__visibility__("hidden"))) int hiddenvar; 55 [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
35 extern __attribute__((__visibility__("default"))) int exportedvar; 56 extern __attribute__((__visibility__("default"))) int exportedvar;
36 extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); 57 extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
37 extern __attribute__((__visibility__("default"))) int exportedfunc (void);], 58 extern __attribute__((__visibility__("default"))) int exportedfunc (void);
59 void dummyfunc (void) {}],
38 [], 60 [],
39 [gl_cv_cc_visibility=yes], 61 [gl_cv_cc_visibility=yes],
40 [gl_cv_cc_visibility=no]) 62 [gl_cv_cc_visibility=no])