Mercurial > gnulib

annotate m4/gnulib-common.m4 @ 15562:c73d0845f357

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow the user to override the choice of AR, ARFLAGS, RANLIB. * m4/gnulib-common.m4 (gl_PROG_AR_RANLIB): Don't override the given values of AR, ARFLAGS, RANLIB. Reported by John W. Eaton <jwe@gnu.org> for Octave.
author Bruno Haible <bruno@clisp.org>
date Fri, 02 Sep 2011 22:15:45 +0200
parents 687a4f77c0f3
children d79b27b411b7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15561
687a4f77c0f3 Find 'ar' program that fits with --host argument.
Bruno Haible <bruno@clisp.org>
parents: 15482
diff changeset
1 # gnulib-common.m4 serial 30
14079
97fc9a21a8fb maint: update almost all copyright ranges to include 2011
Jim Meyering <meyering@redhat.com>
parents: 13887
diff changeset
2 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
7788
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3 dnl This file is free software; the Free Software Foundation
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4 dnl gives unlimited permission to copy and/or distribute it,
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
5 dnl with or without modifications, as long as this notice is preserved.
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
6
9887
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
7 # gl_COMMON
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
8 # is expanded unconditionally through gnulib-tool magic.
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
9 AC_DEFUN([gl_COMMON], [
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
10 dnl Use AC_REQUIRE here, so that the code is expanded once only.
11094
5e937a2f5647 Backport improved autoconf semantics of AC_DEFUN_ONCE.
Eric Blake <ebb9@byu.net>
parents: 11053
diff changeset
11 AC_REQUIRE([gl_00GNULIB])
9887
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
12 AC_REQUIRE([gl_COMMON_BODY])
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
13 ])
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
14 AC_DEFUN([gl_COMMON_BODY], [
15391
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
15 AH_VERBATIM([_Noreturn],
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
16 [/* The _Noreturn keyword of draft C1X. */
15411
7b889c2a4a01 _Noreturn: Ignore __STDC_VERSION__; observe _MSC_VER.
Paul Eggert <eggert@cs.ucla.edu>
parents: 15391
diff changeset
17 #ifndef _Noreturn
7b889c2a4a01 _Noreturn: Ignore __STDC_VERSION__; observe _MSC_VER.
Paul Eggert <eggert@cs.ucla.edu>
parents: 15391
diff changeset
18 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
15391
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
19 || 0x5110 <= __SUNPRO_C)
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
20 # define _Noreturn __attribute__ ((__noreturn__))
15411
7b889c2a4a01 _Noreturn: Ignore __STDC_VERSION__; observe _MSC_VER.
Paul Eggert <eggert@cs.ucla.edu>
parents: 15391
diff changeset
21 # elif 1200 <= _MSC_VER
7b889c2a4a01 _Noreturn: Ignore __STDC_VERSION__; observe _MSC_VER.
Paul Eggert <eggert@cs.ucla.edu>
parents: 15391
diff changeset
22 # define _Noreturn __declspec (noreturn)
15391
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
23 # else
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
24 # define _Noreturn
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
25 # endif
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
26 #endif
af02f1770a6a * m4/gnulib-common.m4 (gl_COMMON_BODY): Add _Noreturn.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14894
diff changeset
27 ])
9887
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
28 AH_VERBATIM([isoc99_inline],
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
29 [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
30 the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
31 earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
32 __APPLE__ && __MACH__ test for MacOS X.
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
33 __APPLE_CC__ tests for the Apple compiler and its version.
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
34 __STDC_VERSION__ tests for the C99 mode. */
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
35 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
36 # define __GNUC_STDC_INLINE__ 1
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
37 #endif])
10658
a6a1df49f669 Avoid -Wunused-parameter warnings in public gnulib header files.
Bruno Haible <bruno@clisp.org>
parents: 10066
diff changeset
38 AH_VERBATIM([unused_parameter],
12482
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
39 [/* Define as a marker that can be attached to declarations that might not
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
40 be used. This helps to reduce warnings, such as from
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
41 GCC -Wunused-parameter. */
10658
a6a1df49f669 Avoid -Wunused-parameter warnings in public gnulib header files.
Bruno Haible <bruno@clisp.org>
parents: 10066
diff changeset
42 #if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
12482
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
43 # define _GL_UNUSED __attribute__ ((__unused__))
10658
a6a1df49f669 Avoid -Wunused-parameter warnings in public gnulib header files.
Bruno Haible <bruno@clisp.org>
parents: 10066
diff changeset
44 #else
12482
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
45 # define _GL_UNUSED
10658
a6a1df49f669 Avoid -Wunused-parameter warnings in public gnulib header files.
Bruno Haible <bruno@clisp.org>
parents: 10066
diff changeset
46 #endif
12482
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
47 /* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
48 is a misnomer outside of parameter lists. */
11bc92a9e2bc gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
Eric Blake <ebb9@byu.net>
parents: 12421
diff changeset
49 #define _UNUSED_PARAMETER_ _GL_UNUSED
14873
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
50
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
51 /* The __pure__ attribute was added in gcc 2.96. */
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
52 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
53 # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
54 #else
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
55 # define _GL_ATTRIBUTE_PURE /* empty */
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
56 #endif
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
57
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
58 /* The __const__ attribute was added in gcc 2.95. */
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
59 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
60 # define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
61 #else
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
62 # define _GL_ATTRIBUTE_CONST /* empty */
722fb7942bc8 gnulib-common.m4: add _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE
Jim Meyering <meyering@redhat.com>
parents: 14515
diff changeset
63 #endif
10658
a6a1df49f669 Avoid -Wunused-parameter warnings in public gnulib header files.
Bruno Haible <bruno@clisp.org>
parents: 10066
diff changeset
64 ])
13274
d87472cc6eec gnulib-common.m4: make glibc write diagnostics to stderr, not /dev/tty
Jim Meyering <jim@meyering.net>
parents: 13204
diff changeset
65 dnl Preparation for running test programs:
d87472cc6eec gnulib-common.m4: make glibc write diagnostics to stderr, not /dev/tty
Jim Meyering <jim@meyering.net>
parents: 13204
diff changeset
66 dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
d87472cc6eec gnulib-common.m4: make glibc write diagnostics to stderr, not /dev/tty
Jim Meyering <jim@meyering.net>
parents: 13204
diff changeset
67 dnl to /dev/tty, so they can be redirected to log files. Such diagnostics
d87472cc6eec gnulib-common.m4: make glibc write diagnostics to stderr, not /dev/tty
Jim Meyering <jim@meyering.net>
parents: 13204
diff changeset
68 dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N.
d87472cc6eec gnulib-common.m4: make glibc write diagnostics to stderr, not /dev/tty
Jim Meyering <jim@meyering.net>
parents: 13204
diff changeset
69 LIBC_FATAL_STDERR_=1
d87472cc6eec gnulib-common.m4: make glibc write diagnostics to stderr, not /dev/tty
Jim Meyering <jim@meyering.net>
parents: 13204
diff changeset
70 export LIBC_FATAL_STDERR_
9887
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
71 ])
f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents: 9411
diff changeset
72
13067
0e829091f9c0 Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents: 13066
diff changeset
73 # gl_MODULE_INDICATOR_CONDITION
0e829091f9c0 Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents: 13066
diff changeset
74 # expands to a C preprocessor expression that evaluates to 1 or 0, depending
0e829091f9c0 Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents: 13066
diff changeset
75 # whether a gnulib module that has been requested shall be considered present
0e829091f9c0 Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents: 13066
diff changeset
76 # or not.
14894
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
77 m4_define([gl_MODULE_INDICATOR_CONDITION], [1])
13067
0e829091f9c0 Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents: 13066
diff changeset
78
13066
fc8c984b0733 Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents: 12880
diff changeset
79 # gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
fc8c984b0733 Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents: 12880
diff changeset
80 # sets the shell variable that indicates the presence of the given module to
fc8c984b0733 Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents: 12880
diff changeset
81 # a C preprocessor expression that will evaluate to 1.
fc8c984b0733 Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents: 12880
diff changeset
82 AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
fc8c984b0733 Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents: 12880
diff changeset
83 [
14894
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
84 gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
85 [GNULIB_[]m4_translit([[$1]],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
86 [abcdefghijklmnopqrstuvwxyz./-],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
87 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
88 [gl_MODULE_INDICATOR_CONDITION])
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
89 ])
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
90
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
91 # gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable])
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
92 # modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION.
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
93 # The shell variable's value is a C preprocessor expression that evaluates
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
94 # to 0 or 1.
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
95 AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
96 [
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
97 m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
98 [
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
99 dnl Simplify the expression VALUE || 1 to 1.
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
100 $1=1
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
101 ],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
102 [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
103 [gl_MODULE_INDICATOR_CONDITION])])
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
104 ])
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
105
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
106 # gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition])
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
107 # modifies the shell variable to include the given condition. The shell
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
108 # variable's value is a C preprocessor expression that evaluates to 0 or 1.
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
109 AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR],
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
110 [
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
111 dnl Simplify the expression 1 || CONDITION to 1.
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
112 if test "$[]$1" != 1; then
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
113 dnl Simplify the expression 0 || CONDITION to CONDITION.
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
114 if test "$[]$1" = 0; then
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
115 $1=$2
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
116 else
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
117 $1="($[]$1 || $2)"
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
118 fi
b22360ddefc4 gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents: 14873
diff changeset
119 fi
13066
fc8c984b0733 Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents: 12880
diff changeset
120 ])
fc8c984b0733 Factorize common .m4 code.
Bruno Haible <bruno@clisp.org>
parents: 12880
diff changeset
121
7788
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
122 # gl_MODULE_INDICATOR([modulename])
13071
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
123 # defines a C macro indicating the presence of the given module
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
124 # in a location where it can be used.
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
125 # | Value | Value |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
126 # | in lib/ | in tests/ |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
127 # --------------------------------------------+---------+-----------+
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
128 # Module present among main modules: | 1 | 1 |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
129 # --------------------------------------------+---------+-----------+
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
130 # Module present among tests-related modules: | 0 | 1 |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
131 # --------------------------------------------+---------+-----------+
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
132 # Module not present at all: | 0 | 0 |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
133 # --------------------------------------------+---------+-----------+
7788
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
134 AC_DEFUN([gl_MODULE_INDICATOR],
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
135 [
13096
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
136 AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]],
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
137 [abcdefghijklmnopqrstuvwxyz./-],
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
138 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]),
13071
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
139 [gl_MODULE_INDICATOR_CONDITION],
13096
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
140 [Define to a C preprocessor expression that evaluates to 1 or 0,
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
141 depending whether the gnulib module $1 shall be considered present.])
13071
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
142 ])
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
143
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
144 # gl_MODULE_INDICATOR_FOR_TESTS([modulename])
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
145 # defines a C macro indicating the presence of the given module
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
146 # in lib or tests. This is useful to determine whether the module
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
147 # should be tested.
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
148 # | Value | Value |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
149 # | in lib/ | in tests/ |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
150 # --------------------------------------------+---------+-----------+
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
151 # Module present among main modules: | 1 | 1 |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
152 # --------------------------------------------+---------+-----------+
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
153 # Module present among tests-related modules: | 1 | 1 |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
154 # --------------------------------------------+---------+-----------+
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
155 # Module not present at all: | 0 | 0 |
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
156 # --------------------------------------------+---------+-----------+
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
157 AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS],
b2385e7b332e Distinguish two kinds of module indicators.
Bruno Haible <bruno@clisp.org>
parents: 13067
diff changeset
158 [
13096
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
159 AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]],
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
160 [abcdefghijklmnopqrstuvwxyz./-],
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
161 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
3e1ae5eb7f94 maint: improve module indicators
Eric Blake <eblake@redhat.com>
parents: 13073
diff changeset
162 [Define to 1 when the gnulib module $1 should be tested.])
7788
e3424061171f Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
163 ])
7920
53d558c7086d Add an AC_PROG_MKDIR_P backport.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
164
14221
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
165 # gl_ASSERT_NO_GNULIB_POSIXCHECK
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
166 # asserts that there will never be a need to #define GNULIB_POSIXCHECK.
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
167 # and thereby enables an optimization of configure and config.h.
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
168 # Used by Emacs.
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
169 AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK],
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
170 [
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
171 dnl Override gl_WARN_ON_USE_PREPARE.
14515
b2069b8212d0 Fix bug with gl_WARN_ON_USE_PREPARE, introduced on 2011-01-23.
Bruno Haible <bruno@clisp.org>
parents: 14221
diff changeset
172 dnl But hide this definition from 'aclocal'.
b2069b8212d0 Fix bug with gl_WARN_ON_USE_PREPARE, introduced on 2011-01-23.
Bruno Haible <bruno@clisp.org>
parents: 14221
diff changeset
173 AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
14221
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
174 ])
b2abfb114786 Allow the user to avoid the GNULIB_TEST_* macros.
Paul Eggert <eggert@cs.ucla.edu>
parents: 14188
diff changeset
175
14188
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
176 # gl_ASSERT_NO_GNULIB_TESTS
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
177 # asserts that there will be no gnulib tests in the scope of the configure.ac
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
178 # and thereby enables an optimization of config.h.
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
179 # Used by Emacs.
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
180 AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS],
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
181 [
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
182 dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
183 AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
184 ])
87bb0468d75c Allow the user to avoid the GNULIB_TEST_* macros.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
185
13887
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
186 # Test whether <features.h> exists.
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
187 # Set HAVE_FEATURES_H.
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
188 AC_DEFUN([gl_FEATURES_H],
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
189 [
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
190 AC_CHECK_HEADERS_ONCE([features.h])
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
191 if test $ac_cv_header_features_h = yes; then
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
192 HAVE_FEATURES_H=1
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
193 else
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
194 HAVE_FEATURES_H=0
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
195 fi
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
196 AC_SUBST([HAVE_FEATURES_H])
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
197 ])
ff73aa93842c Ensure that <features.h> is included before __GLIBC__ is tested.
Bruno Haible <bruno@clisp.org>
parents: 13274
diff changeset
198
10066
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
199 # m4_foreach_w
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
200 # is a backport of autoconf-2.59c's m4_foreach_w.
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
201 # Remove this macro when we can assume autoconf >= 2.60.
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
202 m4_ifndef([m4_foreach_w],
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
203 [m4_define([m4_foreach_w],
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
204 [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
205
12735
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
206 # AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
207 # ----------------------------------------------------
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
208 # Backport of autoconf-2.63b's macro.
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
209 # Remove this macro when we can assume autoconf >= 2.64.
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
210 m4_ifndef([AS_VAR_IF],
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
211 [m4_define([AS_VAR_IF],
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
212 [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
77cea116e541 build: guarantee AS_VAR_IF
Simon Josefsson <simon@josefsson.org>
parents: 12559
diff changeset
213
15482
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
214 # gl_PROG_AR_RANLIB
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
215 # Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
15562
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
216 # The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
217 # the values.
15482
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
218 AC_DEFUN([gl_PROG_AR_RANLIB],
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
219 [
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
220 dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
221 dnl as "cc", and GCC as "gcc". They have different object file formats and
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
222 dnl library formats. In particular, the GNU binutils programs ar, ranlib
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
223 dnl produce libraries that work only with gcc, not with cc.
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
224 AC_REQUIRE([AC_PROG_CC])
15562
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
225 AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
15482
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
226 [
15562
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
227 AC_EGREP_CPP([Amsterdam],
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
228 [
15482
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
229 #ifdef __ACK__
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
230 Amsterdam
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
231 #endif
15562
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
232 ],
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
233 [gl_cv_c_amsterdam_compiler=yes],
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
234 [gl_cv_c_amsterdam_compiler=no])
15482
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
235 ])
15562
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
236 if test -z "$AR"; then
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
237 if test $gl_cv_c_amsterdam_compiler = yes; then
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
238 AR='cc -c.a'
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
239 if test -z "$ARFLAGS"; then
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
240 ARFLAGS='-o'
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
241 fi
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
242 else
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
243 dnl Use the Automake-documented default values for AR and ARFLAGS,
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
244 dnl but prefer ${host}-ar over ar (useful for cross-compiling).
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
245 AC_CHECK_TOOL([AR], [ar], [ar])
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
246 if test -z "$ARFLAGS"; then
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
247 ARFLAGS='cru'
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
248 fi
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
249 fi
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
250 else
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
251 if test -z "$ARFLAGS"; then
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
252 ARFLAGS='cru'
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
253 fi
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
254 fi
15482
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
255 AC_SUBST([AR])
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
256 AC_SUBST([ARFLAGS])
15562
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
257 if test -z "$RANLIB"; then
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
258 if test $gl_cv_c_amsterdam_compiler = yes; then
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
259 RANLIB=':'
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
260 else
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
261 dnl Use the ranlib program if it is available.
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
262 AC_PROG_RANLIB
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
263 fi
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
264 fi
c73d0845f357 Allow the user to override the choice of AR, ARFLAGS, RANLIB.
Bruno Haible <bruno@clisp.org>
parents: 15561
diff changeset
265 AC_SUBST([RANLIB])
15482
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
266 ])
74bf515b04ad Add support for Minix with ACK compiler.
Bruno Haible <bruno@clisp.org>
parents: 15411
diff changeset
267
7920
53d558c7086d Add an AC_PROG_MKDIR_P backport.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
268 # AC_PROG_MKDIR_P
12880
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
269 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
270 # for interoperability with automake-1.9.6 from autoconf-2.62.
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
271 # Remove this macro when we can assume autoconf >= 2.62 or
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
272 # autoconf >= 2.60 && automake >= 1.10.
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
273 m4_ifdef([AC_PROG_MKDIR_P], [
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
274 dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
275 m4_define([AC_PROG_MKDIR_P],
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
276 m4_defn([AC_PROG_MKDIR_P])[
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
277 AC_SUBST([MKDIR_P])])], [
0ca4a77ffffb Restore support for automake 1.9.6 with autoconf 2.61.
Bruno Haible <bruno@clisp.org>
parents: 12735
diff changeset
278 dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.
11105
231dfa4dc2c1 fix more require-before-expand issues
Eric Blake <ebb9@byu.net>
parents: 11094
diff changeset
279 AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
7920
53d558c7086d Add an AC_PROG_MKDIR_P backport.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
280 [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
53d558c7086d Add an AC_PROG_MKDIR_P backport.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
281 MKDIR_P='$(mkdir_p)'
53d558c7086d Add an AC_PROG_MKDIR_P backport.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
282 AC_SUBST([MKDIR_P])])])
9411
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
283
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
284 # AC_C_RESTRICT
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
285 # This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
286 # so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
287 # works.
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
288 # This definition can be removed once autoconf >= 2.62 can be assumed.
13204
0802886fcee2 Don't override improved macro from newer autoconf.
Bruno Haible <bruno@clisp.org>
parents: 13096
diff changeset
289 m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
9411
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
290 AC_DEFUN([AC_C_RESTRICT],
11007
f6cba5a556ce many *.m4 files: improve m4 quoting
Jim Meyering <meyering@redhat.com>
parents: 10658
diff changeset
291 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
9411
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
292 [ac_cv_c_restrict=no
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
293 # The order here caters to the fact that C++ does not require restrict.
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
294 for ac_kw in __restrict __restrict__ _Restrict restrict; do
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
295 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
296 [[typedef int * int_ptr;
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11229
diff changeset
297 int foo (int_ptr $ac_kw ip) {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11229
diff changeset
298 return ip[0];
9411
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
299 }]],
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
300 [[int s[1];
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11229
diff changeset
301 int * $ac_kw t = s;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11229
diff changeset
302 t[0] = 0;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11229
diff changeset
303 return foo(t)]])],
9411
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
304 [ac_cv_c_restrict=$ac_kw])
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
305 test "$ac_cv_c_restrict" != no && break
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
306 done
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
307 ])
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
308 AH_VERBATIM([restrict],
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
309 [/* Define to the equivalent of the C99 'restrict' keyword, or to
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
310 nothing if this is not supported. Do not define if restrict is
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
311 supported directly. */
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
312 #undef restrict
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
313 /* Work around a bug in Sun C++: it does not support _Restrict, even
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
314 though the corresponding Sun C compiler does, which causes
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
315 "#define restrict _Restrict" in the previous line. Perhaps some future
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
316 version of Sun C++ will work with _Restrict; if so, it'll probably
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
317 define __RESTRICT, just as Sun C does. */
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
318 #if defined __SUNPRO_CC && !defined __RESTRICT
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
319 # define _Restrict
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
320 #endif])
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
321 case $ac_cv_c_restrict in
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
322 restrict) ;;
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
323 no) AC_DEFINE([restrict], []) ;;
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
324 *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
325 esac
5ea76912f0b5 Borrow an improved version of AC_C_RESTRICT from autoconf.
Bruno Haible <bruno@clisp.org>
parents: 7920
diff changeset
326 ])
13204
0802886fcee2 Don't override improved macro from newer autoconf.
Bruno Haible <bruno@clisp.org>
parents: 13096
diff changeset
327 ])
11053
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
328
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
329 # gl_BIGENDIAN
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
330 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
331 # Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
332 # macros invoke AC_C_BIGENDIAN with arguments.
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
333 AC_DEFUN([gl_BIGENDIAN],
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
334 [
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
335 AC_C_BIGENDIAN
90ea94356c75 Don't use AC_REQUIRE([AC_C_BIGENDIAN]).
Bruno Haible <bruno@clisp.org>
parents: 11007
diff changeset
336 ])
11229
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
337
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
338 # gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
339 # is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
340 # output a spurious "(cached)" mark in the midst of other configure output.
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
341 # This macro should be used instead of AC_CACHE_VAL when it is not surrounded
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
342 # by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
343 AC_DEFUN([gl_CACHE_VAL_SILENT],
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
344 [
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
345 saved_as_echo_n="$as_echo_n"
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
346 as_echo_n=':'
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
347 AC_CACHE_VAL([$1], [$2])
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
348 as_echo_n="$saved_as_echo_n"
6dad92faecd1 Avoid spurious "(cached)" in configure output.
Bruno Haible <bruno@clisp.org>
parents: 11105
diff changeset
349 ])