nutcracker 0.3.0.12 → 0.4.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (107) hide show
  1. checksums.yaml +5 -13
  2. data/README.md +3 -3
  3. data/Rakefile +12 -10
  4. data/ext/nutcracker/Makefile.in +215 -162
  5. data/ext/nutcracker/README.md +16 -4
  6. data/ext/nutcracker/aclocal.m4 +432 -254
  7. data/ext/nutcracker/{contrib/yaml-0.1.4/configure → autom4te.cache/output.0} +11367 -4545
  8. data/ext/nutcracker/autom4te.cache/output.1 +19907 -0
  9. data/ext/nutcracker/autom4te.cache/output.2 +19907 -0
  10. data/ext/nutcracker/autom4te.cache/requests +518 -0
  11. data/ext/nutcracker/autom4te.cache/traces.0 +2715 -0
  12. data/ext/nutcracker/autom4te.cache/traces.1 +967 -0
  13. data/ext/nutcracker/autom4te.cache/traces.2 +2715 -0
  14. data/ext/nutcracker/config/compile +347 -0
  15. data/ext/nutcracker/config/config.guess +116 -78
  16. data/ext/nutcracker/config/config.sub +65 -45
  17. data/ext/nutcracker/config/depcomp +295 -192
  18. data/ext/nutcracker/config/install-sh +7 -7
  19. data/ext/nutcracker/config/ltmain.sh +15 -20
  20. data/ext/nutcracker/config/missing +149 -265
  21. data/ext/nutcracker/configure +493 -367
  22. data/ext/nutcracker/contrib/Makefile.in +158 -116
  23. data/ext/nutcracker/extconf.rb +0 -1
  24. data/ext/nutcracker/m4/libtool.m4 +4 -23
  25. data/ext/nutcracker/m4/ltoptions.m4 +0 -0
  26. data/ext/nutcracker/m4/ltsugar.m4 +0 -0
  27. data/ext/nutcracker/m4/ltversion.m4 +0 -0
  28. data/ext/nutcracker/m4/lt~obsolete.m4 +0 -0
  29. data/ext/nutcracker/notes/recommendation.md +1 -1
  30. data/ext/nutcracker/notes/redis.md +35 -3
  31. data/ext/nutcracker/scripts/benchmark-mget.py +43 -0
  32. data/ext/nutcracker/scripts/nutcracker.spec +61 -3
  33. data/ext/nutcracker/scripts/redis-check.sh +43 -0
  34. data/ext/nutcracker/src/Makefile.in +205 -142
  35. data/ext/nutcracker/src/event/Makefile.in +164 -66
  36. data/ext/nutcracker/src/hashkit/Makefile.in +164 -66
  37. data/ext/nutcracker/src/nc_conf.c +2 -0
  38. data/ext/nutcracker/src/nc_connection.c +31 -0
  39. data/ext/nutcracker/src/nc_connection.h +3 -0
  40. data/ext/nutcracker/src/nc_core.c +38 -2
  41. data/ext/nutcracker/src/nc_core.h +11 -0
  42. data/ext/nutcracker/src/nc_log.c +90 -12
  43. data/ext/nutcracker/src/nc_log.h +11 -0
  44. data/ext/nutcracker/src/nc_mbuf.h +1 -1
  45. data/ext/nutcracker/src/nc_message.c +162 -116
  46. data/ext/nutcracker/src/nc_message.h +161 -129
  47. data/ext/nutcracker/src/nc_proxy.c +34 -4
  48. data/ext/nutcracker/src/nc_request.c +158 -32
  49. data/ext/nutcracker/src/nc_server.c +59 -5
  50. data/ext/nutcracker/src/nc_server.h +1 -0
  51. data/ext/nutcracker/src/nc_signal.c +2 -2
  52. data/ext/nutcracker/src/nc_stats.c +21 -0
  53. data/ext/nutcracker/src/nc_stats.h +28 -26
  54. data/ext/nutcracker/src/nc_string.c +176 -1
  55. data/ext/nutcracker/src/nc_string.h +26 -0
  56. data/ext/nutcracker/src/nc_util.c +12 -0
  57. data/ext/nutcracker/src/nc_util.h +1 -0
  58. data/ext/nutcracker/src/proto/Makefile.in +164 -66
  59. data/ext/nutcracker/src/proto/nc_memcache.c +279 -88
  60. data/ext/nutcracker/src/proto/nc_proto.h +3 -4
  61. data/ext/nutcracker/src/proto/nc_redis.c +561 -134
  62. data/lib/nutcracker/version.rb +1 -1
  63. metadata +31 -67
  64. data/ext/nutcracker/contrib/yaml-0.1.4/LICENSE +0 -19
  65. data/ext/nutcracker/contrib/yaml-0.1.4/Makefile.am +0 -20
  66. data/ext/nutcracker/contrib/yaml-0.1.4/Makefile.in +0 -736
  67. data/ext/nutcracker/contrib/yaml-0.1.4/README +0 -27
  68. data/ext/nutcracker/contrib/yaml-0.1.4/aclocal.m4 +0 -956
  69. data/ext/nutcracker/contrib/yaml-0.1.4/config.h.in +0 -80
  70. data/ext/nutcracker/contrib/yaml-0.1.4/config/config.guess +0 -1561
  71. data/ext/nutcracker/contrib/yaml-0.1.4/config/config.sub +0 -1686
  72. data/ext/nutcracker/contrib/yaml-0.1.4/config/depcomp +0 -630
  73. data/ext/nutcracker/contrib/yaml-0.1.4/config/install-sh +0 -520
  74. data/ext/nutcracker/contrib/yaml-0.1.4/config/ltmain.sh +0 -8406
  75. data/ext/nutcracker/contrib/yaml-0.1.4/config/missing +0 -376
  76. data/ext/nutcracker/contrib/yaml-0.1.4/configure.ac +0 -75
  77. data/ext/nutcracker/contrib/yaml-0.1.4/doc/doxygen.cfg +0 -222
  78. data/ext/nutcracker/contrib/yaml-0.1.4/include/yaml.h +0 -1971
  79. data/ext/nutcracker/contrib/yaml-0.1.4/m4/libtool.m4 +0 -7357
  80. data/ext/nutcracker/contrib/yaml-0.1.4/m4/ltoptions.m4 +0 -368
  81. data/ext/nutcracker/contrib/yaml-0.1.4/m4/ltsugar.m4 +0 -123
  82. data/ext/nutcracker/contrib/yaml-0.1.4/m4/ltversion.m4 +0 -23
  83. data/ext/nutcracker/contrib/yaml-0.1.4/m4/lt~obsolete.m4 +0 -92
  84. data/ext/nutcracker/contrib/yaml-0.1.4/src/Makefile.am +0 -4
  85. data/ext/nutcracker/contrib/yaml-0.1.4/src/Makefile.in +0 -484
  86. data/ext/nutcracker/contrib/yaml-0.1.4/src/api.c +0 -1392
  87. data/ext/nutcracker/contrib/yaml-0.1.4/src/dumper.c +0 -394
  88. data/ext/nutcracker/contrib/yaml-0.1.4/src/emitter.c +0 -2329
  89. data/ext/nutcracker/contrib/yaml-0.1.4/src/loader.c +0 -432
  90. data/ext/nutcracker/contrib/yaml-0.1.4/src/parser.c +0 -1374
  91. data/ext/nutcracker/contrib/yaml-0.1.4/src/reader.c +0 -465
  92. data/ext/nutcracker/contrib/yaml-0.1.4/src/scanner.c +0 -3570
  93. data/ext/nutcracker/contrib/yaml-0.1.4/src/writer.c +0 -141
  94. data/ext/nutcracker/contrib/yaml-0.1.4/src/yaml_private.h +0 -640
  95. data/ext/nutcracker/contrib/yaml-0.1.4/tests/Makefile.am +0 -8
  96. data/ext/nutcracker/contrib/yaml-0.1.4/tests/Makefile.in +0 -675
  97. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-deconstructor-alt.c +0 -800
  98. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-deconstructor.c +0 -1130
  99. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-reformatter-alt.c +0 -217
  100. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-reformatter.c +0 -202
  101. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-dumper.c +0 -311
  102. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-emitter.c +0 -327
  103. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-loader.c +0 -63
  104. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-parser.c +0 -63
  105. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-scanner.c +0 -63
  106. data/ext/nutcracker/contrib/yaml-0.1.4/tests/test-reader.c +0 -354
  107. data/ext/nutcracker/contrib/yaml-0.1.4/tests/test-version.c +0 -29
@@ -99,7 +99,7 @@ nutcracker can be configured through a YAML file specified by the -c or --conf-f
99
99
  + **server_connections**: The maximum number of connections that can be opened to each server. By default, we open at most 1 server connection.
100
100
  + **auto_eject_hosts**: A boolean value that controls if server should be ejected temporarily when it fails consecutively server_failure_limit times. See [liveness recommendations](notes/recommendation.md#liveness) for information. Defaults to false.
101
101
  + **server_retry_timeout**: The timeout value in msec to wait for before retrying on a temporarily ejected server, when auto_eject_host is set to true. Defaults to 30000 msec.
102
- + **server_failure_limit**: The number of conseutive failures on a server that would leads to it being temporarily ejected when auto_eject_host is set to true. Defaults to 2.
102
+ + **server_failure_limit**: The number of consecutive failures on a server that would lead to it being temporarily ejected when auto_eject_host is set to true. Defaults to 2.
103
103
  + **servers**: A list of server address, port and weight (name:port:weight or ip:port:weight) for this server pool.
104
104
 
105
105
 
@@ -198,7 +198,7 @@ Nutcracker exposes stats at the granularity of server pool and servers per pool
198
198
  server_connections "# active server connections"
199
199
  requests "# requests"
200
200
  request_bytes "total request bytes"
201
- responses "# respones"
201
+ responses "# responses"
202
202
  response_bytes "total response bytes"
203
203
  in_queue "# requests in incoming queue"
204
204
  in_queue_bytes "current request bytes in incoming queue"
@@ -212,7 +212,7 @@ Logging in nutcracker is only available when nutcracker is built with logging en
212
212
 
213
213
  Nutcracker enables proxying multiple client connections onto one or few server connections. This architectural setup makes it ideal for pipelining requests and responses and hence saving on the round trip time.
214
214
 
215
- For example, if nutcracker is proxing three client connections onto a single server and we get requests - 'get key\r\n', 'set key 0 0 3\r\nval\r\n' and 'delete key\r\n' on these three connections respectively, nutcracker would try to batch these requests and send them as a single message onto the server connection as 'get key\r\nset key 0 0 3\r\nval\r\ndelete key\r\n'.
215
+ For example, if nutcracker is proxying three client connections onto a single server and we get requests - 'get key\r\n', 'set key 0 0 3\r\nval\r\n' and 'delete key\r\n' on these three connections respectively, nutcracker would try to batch these requests and send them as a single message onto the server connection as 'get key\r\nset key 0 0 3\r\nval\r\ndelete key\r\n'.
216
216
 
217
217
  Pipelining is the reason why nutcracker ends up doing better in terms of throughput even though it introduces an extra hop between the client and server.
218
218
 
@@ -226,7 +226,11 @@ If you are deploying nutcracker in production, you might consider reading throug
226
226
  + [puppet module](https://github.com/wuakitv/puppet-twemproxy)
227
227
  + [nutcracker-web](https://github.com/kontera-technologies/nutcracker-web)
228
228
  + [munin-plugin](https://github.com/eveiga/contrib/tree/nutcracker/plugins/nutcracker)
229
+ + [collectd-plugin](https://github.com/bewie/collectd-twemproxy)
229
230
  + [redis-twemproxy agent](https://github.com/Stono/redis-twemproxy-agent)
231
+ + [sensu-metrics](https://github.com/sensu/sensu-community-plugins/blob/master/plugins/twemproxy/twemproxy-metrics.rb)
232
+ + [redis-mgr](https://github.com/idning/redis-mgr)
233
+ + [smitty for twemproxy failover](https://github.com/areina/smitty)
230
234
 
231
235
  ## Users
232
236
  + [Pinterest](http://pinterest.com/)
@@ -241,6 +245,11 @@ If you are deploying nutcracker in production, you might consider reading throug
241
245
  + [Bright](http://www.bright.com/)
242
246
  + [56.com](http://www.56.com/)
243
247
  + [Snapchat](http://www.snapchat.com/)
248
+ + [Digg](http://digg.com/)
249
+ + [Gawkermedia](http://advertising.gawker.com/)
250
+ + [3scale.net](http://3scale.net)
251
+ + [Ooyala](http://www.ooyala.com)
252
+ + [Twitch](http://twitch.tv)
244
253
 
245
254
  ## Issues and Support
246
255
 
@@ -248,9 +257,12 @@ Have a bug or a question? Please create an issue here on GitHub!
248
257
 
249
258
  https://github.com/twitter/twemproxy/issues
250
259
 
251
- ## Contributors
260
+ ## Committers
252
261
 
253
262
  * Manju Rajashekhar ([@manju](https://twitter.com/manju))
263
+ * Lin Yang ([@idning](https://github.com/idning))
264
+
265
+ Thank you to all of our [contributors](https://github.com/twitter/twemproxy/graphs/contributors)!
254
266
 
255
267
  ## License
256
268
 
@@ -1,8 +1,7 @@
1
- # generated automatically by aclocal 1.11.3 -*- Autoconf -*-
1
+ # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2
+
3
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
2
4
 
3
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
- # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5
- # Inc.
6
5
  # This file is free software; the Free Software Foundation
7
6
  # gives unlimited permission to copy and/or distribute it,
8
7
  # with or without modifications, as long as this notice is preserved.
@@ -12,33 +11,31 @@
12
11
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13
12
  # PARTICULAR PURPOSE.
14
13
 
14
+ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15
15
  m4_ifndef([AC_AUTOCONF_VERSION],
16
16
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17
- m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
18
- [m4_warning([this file was generated for autoconf 2.68.
17
+ m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18
+ [m4_warning([this file was generated for autoconf 2.69.
19
19
  You have another version of autoconf. It may work, but is not guaranteed to.
20
20
  If you have problems, you may need to regenerate the build system entirely.
21
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
21
+ To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22
22
 
23
- # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
24
- # Foundation, Inc.
23
+ # Copyright (C) 2002-2013 Free Software Foundation, Inc.
25
24
  #
26
25
  # This file is free software; the Free Software Foundation
27
26
  # gives unlimited permission to copy and/or distribute it,
28
27
  # with or without modifications, as long as this notice is preserved.
29
28
 
30
- # serial 1
31
-
32
29
  # AM_AUTOMAKE_VERSION(VERSION)
33
30
  # ----------------------------
34
31
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
35
32
  # generated from the m4 files accompanying Automake X.Y.
36
33
  # (This private macro should not be called outside this file.)
37
34
  AC_DEFUN([AM_AUTOMAKE_VERSION],
38
- [am__api_version='1.11'
35
+ [am__api_version='1.14'
39
36
  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
40
37
  dnl require some minimum version. Point them to the right macro.
41
- m4_if([$1], [1.11.3], [],
38
+ m4_if([$1], [1.14.1], [],
42
39
  [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
43
40
  ])
44
41
 
@@ -54,24 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
54
51
  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
55
52
  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
56
53
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
57
- [AM_AUTOMAKE_VERSION([1.11.3])dnl
54
+ [AM_AUTOMAKE_VERSION([1.14.1])dnl
58
55
  m4_ifndef([AC_AUTOCONF_VERSION],
59
56
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
60
57
  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
61
58
 
62
59
  # AM_AUX_DIR_EXPAND -*- Autoconf -*-
63
60
 
64
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
61
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
65
62
  #
66
63
  # This file is free software; the Free Software Foundation
67
64
  # gives unlimited permission to copy and/or distribute it,
68
65
  # with or without modifications, as long as this notice is preserved.
69
66
 
70
- # serial 1
71
-
72
67
  # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
73
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
74
- # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
68
+ # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
69
+ # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
75
70
  #
76
71
  # Of course, Automake must honor this variable whenever it calls a
77
72
  # tool from the auxiliary directory. The problem is that $srcdir (and
@@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
90
85
  #
91
86
  # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
92
87
  # are both prefixed by $srcdir. In an in-source build this is usually
93
- # harmless because $srcdir is `.', but things will broke when you
88
+ # harmless because $srcdir is '.', but things will broke when you
94
89
  # start a VPATH build or use an absolute $srcdir.
95
90
  #
96
91
  # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -116,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
116
111
 
117
112
  # AM_CONDITIONAL -*- Autoconf -*-
118
113
 
119
- # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
120
- # Free Software Foundation, Inc.
114
+ # Copyright (C) 1997-2013 Free Software Foundation, Inc.
121
115
  #
122
116
  # This file is free software; the Free Software Foundation
123
117
  # gives unlimited permission to copy and/or distribute it,
124
118
  # with or without modifications, as long as this notice is preserved.
125
119
 
126
- # serial 9
127
-
128
120
  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
129
121
  # -------------------------------------
130
122
  # Define a conditional.
131
123
  AC_DEFUN([AM_CONDITIONAL],
132
- [AC_PREREQ(2.52)dnl
133
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
134
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
124
+ [AC_PREREQ([2.52])dnl
125
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
126
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
135
127
  AC_SUBST([$1_TRUE])dnl
136
128
  AC_SUBST([$1_FALSE])dnl
137
129
  _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -150,16 +142,14 @@ AC_CONFIG_COMMANDS_PRE(
150
142
  Usually this means the macro was only invoked conditionally.]])
151
143
  fi])])
152
144
 
153
- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
154
- # 2010, 2011 Free Software Foundation, Inc.
145
+ # Copyright (C) 1999-2013 Free Software Foundation, Inc.
155
146
  #
156
147
  # This file is free software; the Free Software Foundation
157
148
  # gives unlimited permission to copy and/or distribute it,
158
149
  # with or without modifications, as long as this notice is preserved.
159
150
 
160
- # serial 12
161
151
 
162
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
152
+ # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
163
153
  # written in clear, in which case automake, when reading aclocal.m4,
164
154
  # will think it sees a *use*, and therefore will trigger all it's
165
155
  # C support machinery. Also note that it means that autoscan, seeing
@@ -169,7 +159,7 @@ fi])])
169
159
  # _AM_DEPENDENCIES(NAME)
170
160
  # ----------------------
171
161
  # See how the compiler implements dependency checking.
172
- # NAME is "CC", "CXX", "GCJ", or "OBJC".
162
+ # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
173
163
  # We try a few techniques and use that to set a single cache variable.
174
164
  #
175
165
  # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -182,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
182
172
  AC_REQUIRE([AM_MAKE_INCLUDE])dnl
183
173
  AC_REQUIRE([AM_DEP_TRACK])dnl
184
174
 
185
- ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
186
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
187
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
188
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
189
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
190
- [depcc="$$1" am_compiler_list=])
175
+ m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
176
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
177
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
178
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
179
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
180
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
181
+ [depcc="$$1" am_compiler_list=])
191
182
 
192
183
  AC_CACHE_CHECK([dependency style of $depcc],
193
184
  [am_cv_$1_dependencies_compiler_type],
@@ -195,8 +186,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
195
186
  # We make a subdir and do the tests there. Otherwise we can end up
196
187
  # making bogus files that we don't know about and never remove. For
197
188
  # instance it was reported that on HP-UX the gcc test will end up
198
- # making a dummy file named `D' -- because `-MD' means `put the output
199
- # in D'.
189
+ # making a dummy file named 'D' -- because '-MD' means "put the output
190
+ # in D".
200
191
  rm -rf conftest.dir
201
192
  mkdir conftest.dir
202
193
  # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -236,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
236
227
  : > sub/conftest.c
237
228
  for i in 1 2 3 4 5 6; do
238
229
  echo '#include "conftst'$i'.h"' >> sub/conftest.c
239
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
240
- # Solaris 8's {/usr,}/bin/sh.
241
- touch sub/conftst$i.h
230
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
231
+ # Solaris 10 /bin/sh.
232
+ echo '/* dummy */' > sub/conftst$i.h
242
233
  done
243
234
  echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
244
235
 
245
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
236
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
246
237
  # mode. It turns out that the SunPro C++ compiler does not properly
247
- # handle `-M -o', and we need to detect this. Also, some Intel
248
- # versions had trouble with output in subdirs
238
+ # handle '-M -o', and we need to detect this. Also, some Intel
239
+ # versions had trouble with output in subdirs.
249
240
  am__obj=sub/conftest.${OBJEXT-o}
250
241
  am__minus_obj="-o $am__obj"
251
242
  case $depmode in
@@ -254,8 +245,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
254
245
  test "$am__universal" = false || continue
255
246
  ;;
256
247
  nosideeffect)
257
- # after this tag, mechanisms are not by side-effect, so they'll
258
- # only be used when explicitly requested
248
+ # After this tag, mechanisms are not by side-effect, so they'll
249
+ # only be used when explicitly requested.
259
250
  if test "x$enable_dependency_tracking" = xyes; then
260
251
  continue
261
252
  else
@@ -263,7 +254,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
263
254
  fi
264
255
  ;;
265
256
  msvc7 | msvc7msys | msvisualcpp | msvcmsys)
266
- # This compiler won't grok `-c -o', but also, the minuso test has
257
+ # This compiler won't grok '-c -o', but also, the minuso test has
267
258
  # not run yet. These depmodes are late enough in the game, and
268
259
  # so weak that their functioning should not be impacted.
269
260
  am__obj=conftest.${OBJEXT-o}
@@ -311,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [
311
302
  # AM_SET_DEPDIR
312
303
  # -------------
313
304
  # Choose a directory name for dependency files.
314
- # This macro is AC_REQUIREd in _AM_DEPENDENCIES
305
+ # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
315
306
  AC_DEFUN([AM_SET_DEPDIR],
316
307
  [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
317
308
  AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -321,9 +312,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
321
312
  # AM_DEP_TRACK
322
313
  # ------------
323
314
  AC_DEFUN([AM_DEP_TRACK],
324
- [AC_ARG_ENABLE(dependency-tracking,
325
- [ --disable-dependency-tracking speeds up one-time build
326
- --enable-dependency-tracking do not reject slow dependency extractors])
315
+ [AC_ARG_ENABLE([dependency-tracking], [dnl
316
+ AS_HELP_STRING(
317
+ [--enable-dependency-tracking],
318
+ [do not reject slow dependency extractors])
319
+ AS_HELP_STRING(
320
+ [--disable-dependency-tracking],
321
+ [speeds up one-time build])])
327
322
  if test "x$enable_dependency_tracking" != xno; then
328
323
  am_depcomp="$ac_aux_dir/depcomp"
329
324
  AMDEPBACKSLASH='\'
@@ -338,20 +333,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
338
333
 
339
334
  # Generate code to set up dependency tracking. -*- Autoconf -*-
340
335
 
341
- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
342
- # Free Software Foundation, Inc.
336
+ # Copyright (C) 1999-2013 Free Software Foundation, Inc.
343
337
  #
344
338
  # This file is free software; the Free Software Foundation
345
339
  # gives unlimited permission to copy and/or distribute it,
346
340
  # with or without modifications, as long as this notice is preserved.
347
341
 
348
- #serial 5
349
342
 
350
343
  # _AM_OUTPUT_DEPENDENCY_COMMANDS
351
344
  # ------------------------------
352
345
  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
353
346
  [{
354
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
347
+ # Older Autoconf quotes --file arguments for eval, but not when files
355
348
  # are listed without --file. Let's play safe and only enable the eval
356
349
  # if we detect the quoting.
357
350
  case $CONFIG_FILES in
@@ -364,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
364
357
  # Strip MF so we end up with the name of the file.
365
358
  mf=`echo "$mf" | sed -e 's/:.*$//'`
366
359
  # Check whether this is an Automake generated Makefile or not.
367
- # We used to match only the files named `Makefile.in', but
360
+ # We used to match only the files named 'Makefile.in', but
368
361
  # some people rename them; so instead we look at the file content.
369
362
  # Grep'ing the first line is not enough: some people post-process
370
363
  # each Makefile.in and add a new line on top of each file to say so.
@@ -376,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
376
369
  continue
377
370
  fi
378
371
  # Extract the definition of DEPDIR, am__include, and am__quote
379
- # from the Makefile without running `make'.
372
+ # from the Makefile without running 'make'.
380
373
  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
381
374
  test -z "$DEPDIR" && continue
382
375
  am__include=`sed -n 's/^am__include = //p' < "$mf"`
383
- test -z "am__include" && continue
376
+ test -z "$am__include" && continue
384
377
  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
385
- # When using ansi2knr, U may be empty or an underscore; expand it
386
- U=`sed -n 's/^U = //p' < "$mf"`
387
378
  # Find all dependency output files, they are included files with
388
379
  # $(DEPDIR) in their names. We invoke sed twice because it is the
389
380
  # simplest approach to changing $(DEPDIR) to its actual value in the
390
381
  # expansion.
391
382
  for file in `sed -n "
392
383
  s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
393
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
384
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
394
385
  # Make sure the directory exists.
395
386
  test -f "$dirpart/$file" && continue
396
387
  fdir=`AS_DIRNAME(["$file"])`
@@ -408,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
408
399
  # This macro should only be invoked once -- use via AC_REQUIRE.
409
400
  #
410
401
  # This code is only required when automatic dependency tracking
411
- # is enabled. FIXME. This creates each `.P' file that we will
402
+ # is enabled. FIXME. This creates each '.P' file that we will
412
403
  # need in order to bootstrap the dependency handling code.
413
404
  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
414
405
  [AC_CONFIG_COMMANDS([depfiles],
@@ -418,18 +409,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
418
409
 
419
410
  # Do all the work for Automake. -*- Autoconf -*-
420
411
 
421
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
422
- # 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
412
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
423
413
  #
424
414
  # This file is free software; the Free Software Foundation
425
415
  # gives unlimited permission to copy and/or distribute it,
426
416
  # with or without modifications, as long as this notice is preserved.
427
417
 
428
- # serial 16
429
-
430
418
  # This macro actually does too much. Some checks are only needed if
431
419
  # your package does certain things. But this isn't really a big deal.
432
420
 
421
+ dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
422
+ m4_define([AC_PROG_CC],
423
+ m4_defn([AC_PROG_CC])
424
+ [_AM_PROG_CC_C_O
425
+ ])
426
+
433
427
  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
434
428
  # AM_INIT_AUTOMAKE([OPTIONS])
435
429
  # -----------------------------------------------
@@ -442,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
442
436
  # arguments mandatory, and then we can depend on a new Autoconf
443
437
  # release and drop the old call support.
444
438
  AC_DEFUN([AM_INIT_AUTOMAKE],
445
- [AC_PREREQ([2.62])dnl
439
+ [AC_PREREQ([2.65])dnl
446
440
  dnl Autoconf wants to disallow AM_ names. We explicitly allow
447
441
  dnl the ones we care about.
448
442
  m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -471,31 +465,40 @@ AC_SUBST([CYGPATH_W])
471
465
  # Define the identity of the package.
472
466
  dnl Distinguish between old-style and new-style calls.
473
467
  m4_ifval([$2],
474
- [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
468
+ [AC_DIAGNOSE([obsolete],
469
+ [$0: two- and three-arguments forms are deprecated.])
470
+ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
475
471
  AC_SUBST([PACKAGE], [$1])dnl
476
472
  AC_SUBST([VERSION], [$2])],
477
473
  [_AM_SET_OPTIONS([$1])dnl
478
474
  dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
479
- m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
475
+ m4_if(
476
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
477
+ [ok:ok],,
480
478
  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
481
479
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
482
480
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
483
481
 
484
482
  _AM_IF_OPTION([no-define],,
485
- [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
486
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
483
+ [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
484
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
487
485
 
488
486
  # Some tools Automake needs.
489
487
  AC_REQUIRE([AM_SANITY_CHECK])dnl
490
488
  AC_REQUIRE([AC_ARG_PROGRAM])dnl
491
- AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
492
- AM_MISSING_PROG(AUTOCONF, autoconf)
493
- AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
494
- AM_MISSING_PROG(AUTOHEADER, autoheader)
495
- AM_MISSING_PROG(MAKEINFO, makeinfo)
489
+ AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
490
+ AM_MISSING_PROG([AUTOCONF], [autoconf])
491
+ AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
492
+ AM_MISSING_PROG([AUTOHEADER], [autoheader])
493
+ AM_MISSING_PROG([MAKEINFO], [makeinfo])
496
494
  AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
497
495
  AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
498
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl
496
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
497
+ # For better backward compatibility. To be removed once Automake 1.9.x
498
+ # dies out for good. For more background, see:
499
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
500
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
501
+ AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
499
502
  # We need awk for the "check" target. The system "awk" is bad on
500
503
  # some platforms.
501
504
  AC_REQUIRE([AC_PROG_AWK])dnl
@@ -506,34 +509,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
506
509
  [_AM_PROG_TAR([v7])])])
507
510
  _AM_IF_OPTION([no-dependencies],,
508
511
  [AC_PROVIDE_IFELSE([AC_PROG_CC],
509
- [_AM_DEPENDENCIES(CC)],
510
- [define([AC_PROG_CC],
511
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
512
+ [_AM_DEPENDENCIES([CC])],
513
+ [m4_define([AC_PROG_CC],
514
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
512
515
  AC_PROVIDE_IFELSE([AC_PROG_CXX],
513
- [_AM_DEPENDENCIES(CXX)],
514
- [define([AC_PROG_CXX],
515
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
516
+ [_AM_DEPENDENCIES([CXX])],
517
+ [m4_define([AC_PROG_CXX],
518
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
516
519
  AC_PROVIDE_IFELSE([AC_PROG_OBJC],
517
- [_AM_DEPENDENCIES(OBJC)],
518
- [define([AC_PROG_OBJC],
519
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
520
+ [_AM_DEPENDENCIES([OBJC])],
521
+ [m4_define([AC_PROG_OBJC],
522
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
523
+ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
524
+ [_AM_DEPENDENCIES([OBJCXX])],
525
+ [m4_define([AC_PROG_OBJCXX],
526
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
520
527
  ])
521
- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
522
- dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
523
- dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
524
- dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
528
+ AC_REQUIRE([AM_SILENT_RULES])dnl
529
+ dnl The testsuite driver may need to know about EXEEXT, so add the
530
+ dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
531
+ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
525
532
  AC_CONFIG_COMMANDS_PRE(dnl
526
533
  [m4_provide_if([_AM_COMPILER_EXEEXT],
527
534
  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
528
- ])
529
535
 
530
- dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
536
+ # POSIX will say in a future version that running "rm -f" with no argument
537
+ # is OK; and we want to be able to make that assumption in our Makefile
538
+ # recipes. So use an aggressive probe to check that the usage we want is
539
+ # actually supported "in the wild" to an acceptable degree.
540
+ # See automake bug#10828.
541
+ # To make any issue more visible, cause the running configure to be aborted
542
+ # by default if the 'rm' program in use doesn't match our expectations; the
543
+ # user can still override this though.
544
+ if rm -f && rm -fr && rm -rf; then : OK; else
545
+ cat >&2 <<'END'
546
+ Oops!
547
+
548
+ Your 'rm' program seems unable to run without file operands specified
549
+ on the command line, even when the '-f' option is present. This is contrary
550
+ to the behaviour of most rm programs out there, and not conforming with
551
+ the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
552
+
553
+ Please tell bug-automake@gnu.org about your system, including the value
554
+ of your $PATH and any error possibly output before this message. This
555
+ can help us improve future automake versions.
556
+
557
+ END
558
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
559
+ echo 'Configuration will proceed anyway, since you have set the' >&2
560
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
561
+ echo >&2
562
+ else
563
+ cat >&2 <<'END'
564
+ Aborting the configuration process, to ensure you take notice of the issue.
565
+
566
+ You can download and install GNU coreutils to get an 'rm' implementation
567
+ that behaves properly: <http://www.gnu.org/software/coreutils/>.
568
+
569
+ If you want to complete the configuration process using your problematic
570
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
571
+ to "yes", and re-run configure.
572
+
573
+ END
574
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
575
+ fi
576
+ fi])
577
+
578
+ dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
531
579
  dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
532
580
  dnl mangled by Autoconf and run in a shell conditional statement.
533
581
  m4_define([_AC_COMPILER_EXEEXT],
534
582
  m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
535
583
 
536
-
537
584
  # When config.status generates a header, we must update the stamp-h file.
538
585
  # This file resides in the same directory as the config header
539
586
  # that is generated. The stamp files are numbered to have different names.
@@ -555,15 +602,12 @@ for _am_header in $config_headers :; do
555
602
  done
556
603
  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
557
604
 
558
- # Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
559
- # Inc.
605
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
560
606
  #
561
607
  # This file is free software; the Free Software Foundation
562
608
  # gives unlimited permission to copy and/or distribute it,
563
609
  # with or without modifications, as long as this notice is preserved.
564
610
 
565
- # serial 1
566
-
567
611
  # AM_PROG_INSTALL_SH
568
612
  # ------------------
569
613
  # Define $install_sh.
@@ -577,16 +621,14 @@ if test x"${install_sh}" != xset; then
577
621
  install_sh="\${SHELL} $am_aux_dir/install-sh"
578
622
  esac
579
623
  fi
580
- AC_SUBST(install_sh)])
624
+ AC_SUBST([install_sh])])
581
625
 
582
- # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
626
+ # Copyright (C) 2003-2013 Free Software Foundation, Inc.
583
627
  #
584
628
  # This file is free software; the Free Software Foundation
585
629
  # gives unlimited permission to copy and/or distribute it,
586
630
  # with or without modifications, as long as this notice is preserved.
587
631
 
588
- # serial 2
589
-
590
632
  # Check whether the underlying file-system supports filenames
591
633
  # with a leading dot. For instance MS-DOS doesn't.
592
634
  AC_DEFUN([AM_SET_LEADING_DOT],
@@ -602,14 +644,12 @@ AC_SUBST([am__leading_dot])])
602
644
 
603
645
  # Check to see how 'make' treats includes. -*- Autoconf -*-
604
646
 
605
- # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
647
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
606
648
  #
607
649
  # This file is free software; the Free Software Foundation
608
650
  # gives unlimited permission to copy and/or distribute it,
609
651
  # with or without modifications, as long as this notice is preserved.
610
652
 
611
- # serial 4
612
-
613
653
  # AM_MAKE_INCLUDE()
614
654
  # -----------------
615
655
  # Check to see how make treats includes.
@@ -627,7 +667,7 @@ am__quote=
627
667
  _am_result=none
628
668
  # First try GNU make style include.
629
669
  echo "include confinc" > confmf
630
- # Ignore all kinds of additional output from `make'.
670
+ # Ignore all kinds of additional output from 'make'.
631
671
  case `$am_make -s -f confmf 2> /dev/null` in #(
632
672
  *the\ am__doit\ target*)
633
673
  am__include=include
@@ -654,15 +694,12 @@ rm -f confinc confmf
654
694
 
655
695
  # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
656
696
 
657
- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
658
- # Free Software Foundation, Inc.
697
+ # Copyright (C) 1997-2013 Free Software Foundation, Inc.
659
698
  #
660
699
  # This file is free software; the Free Software Foundation
661
700
  # gives unlimited permission to copy and/or distribute it,
662
701
  # with or without modifications, as long as this notice is preserved.
663
702
 
664
- # serial 6
665
-
666
703
  # AM_MISSING_PROG(NAME, PROGRAM)
667
704
  # ------------------------------
668
705
  AC_DEFUN([AM_MISSING_PROG],
@@ -670,11 +707,10 @@ AC_DEFUN([AM_MISSING_PROG],
670
707
  $1=${$1-"${am_missing_run}$2"}
671
708
  AC_SUBST($1)])
672
709
 
673
-
674
710
  # AM_MISSING_HAS_RUN
675
711
  # ------------------
676
- # Define MISSING if not defined so far and test if it supports --run.
677
- # If it does, set am_missing_run to use it, otherwise, to nothing.
712
+ # Define MISSING if not defined so far and test if it is modern enough.
713
+ # If it is, set am_missing_run to use it, otherwise, to nothing.
678
714
  AC_DEFUN([AM_MISSING_HAS_RUN],
679
715
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
680
716
  AC_REQUIRE_AUX_FILE([missing])dnl
@@ -687,54 +723,22 @@ if test x"${MISSING+set}" != xset; then
687
723
  esac
688
724
  fi
689
725
  # Use eval to expand $SHELL
690
- if eval "$MISSING --run true"; then
691
- am_missing_run="$MISSING --run "
726
+ if eval "$MISSING --is-lightweight"; then
727
+ am_missing_run="$MISSING "
692
728
  else
693
729
  am_missing_run=
694
- AC_MSG_WARN([`missing' script is too old or missing])
730
+ AC_MSG_WARN(['missing' script is too old or missing])
695
731
  fi
696
732
  ])
697
733
 
698
- # Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
699
- # Inc.
700
- #
701
- # This file is free software; the Free Software Foundation
702
- # gives unlimited permission to copy and/or distribute it,
703
- # with or without modifications, as long as this notice is preserved.
704
-
705
- # serial 1
706
-
707
- # AM_PROG_MKDIR_P
708
- # ---------------
709
- # Check for `mkdir -p'.
710
- AC_DEFUN([AM_PROG_MKDIR_P],
711
- [AC_PREREQ([2.60])dnl
712
- AC_REQUIRE([AC_PROG_MKDIR_P])dnl
713
- dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
714
- dnl while keeping a definition of mkdir_p for backward compatibility.
715
- dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
716
- dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
717
- dnl Makefile.ins that do not define MKDIR_P, so we do our own
718
- dnl adjustment using top_builddir (which is defined more often than
719
- dnl MKDIR_P).
720
- AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
721
- case $mkdir_p in
722
- [[\\/$]]* | ?:[[\\/]]*) ;;
723
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
724
- esac
725
- ])
726
-
727
734
  # Helper functions for option handling. -*- Autoconf -*-
728
735
 
729
- # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
730
- # Foundation, Inc.
736
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
731
737
  #
732
738
  # This file is free software; the Free Software Foundation
733
739
  # gives unlimited permission to copy and/or distribute it,
734
740
  # with or without modifications, as long as this notice is preserved.
735
741
 
736
- # serial 5
737
-
738
742
  # _AM_MANGLE_OPTION(NAME)
739
743
  # -----------------------
740
744
  AC_DEFUN([_AM_MANGLE_OPTION],
@@ -744,7 +748,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
744
748
  # --------------------
745
749
  # Set option NAME. Presently that only means defining a flag for this option.
746
750
  AC_DEFUN([_AM_SET_OPTION],
747
- [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
751
+ [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
748
752
 
749
753
  # _AM_SET_OPTIONS(OPTIONS)
750
754
  # ------------------------
@@ -758,24 +762,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
758
762
  AC_DEFUN([_AM_IF_OPTION],
759
763
  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
760
764
 
761
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
765
+ # Copyright (C) 1999-2013 Free Software Foundation, Inc.
766
+ #
767
+ # This file is free software; the Free Software Foundation
768
+ # gives unlimited permission to copy and/or distribute it,
769
+ # with or without modifications, as long as this notice is preserved.
770
+
771
+ # _AM_PROG_CC_C_O
772
+ # ---------------
773
+ # Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
774
+ # to automatically call this.
775
+ AC_DEFUN([_AM_PROG_CC_C_O],
776
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
777
+ AC_REQUIRE_AUX_FILE([compile])dnl
778
+ AC_LANG_PUSH([C])dnl
779
+ AC_CACHE_CHECK(
780
+ [whether $CC understands -c and -o together],
781
+ [am_cv_prog_cc_c_o],
782
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
783
+ # Make sure it works both with $CC and with simple cc.
784
+ # Following AC_PROG_CC_C_O, we do the test twice because some
785
+ # compilers refuse to overwrite an existing .o file with -o,
786
+ # though they will create one.
787
+ am_cv_prog_cc_c_o=yes
788
+ for am_i in 1 2; do
789
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
790
+ && test -f conftest2.$ac_objext; then
791
+ : OK
792
+ else
793
+ am_cv_prog_cc_c_o=no
794
+ break
795
+ fi
796
+ done
797
+ rm -f core conftest*
798
+ unset am_i])
799
+ if test "$am_cv_prog_cc_c_o" != yes; then
800
+ # Losing compiler, so override with the script.
801
+ # FIXME: It is wrong to rewrite CC.
802
+ # But if we don't then we get into trouble of one sort or another.
803
+ # A longer-term fix would be to have automake use am__CC in this case,
804
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
805
+ CC="$am_aux_dir/compile $CC"
806
+ fi
807
+ AC_LANG_POP([C])])
808
+
809
+ # For backward compatibility.
810
+ AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
762
811
 
763
- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
764
- # Free Software Foundation, Inc.
812
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
765
813
  #
766
814
  # This file is free software; the Free Software Foundation
767
815
  # gives unlimited permission to copy and/or distribute it,
768
816
  # with or without modifications, as long as this notice is preserved.
769
817
 
770
- # serial 5
818
+ # AM_RUN_LOG(COMMAND)
819
+ # -------------------
820
+ # Run COMMAND, save the exit status in ac_status, and log it.
821
+ # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
822
+ AC_DEFUN([AM_RUN_LOG],
823
+ [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
824
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
825
+ ac_status=$?
826
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
827
+ (exit $ac_status); }])
828
+
829
+ # Check to make sure that the build environment is sane. -*- Autoconf -*-
830
+
831
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
832
+ #
833
+ # This file is free software; the Free Software Foundation
834
+ # gives unlimited permission to copy and/or distribute it,
835
+ # with or without modifications, as long as this notice is preserved.
771
836
 
772
837
  # AM_SANITY_CHECK
773
838
  # ---------------
774
839
  AC_DEFUN([AM_SANITY_CHECK],
775
840
  [AC_MSG_CHECKING([whether build environment is sane])
776
- # Just in case
777
- sleep 1
778
- echo timestamp > conftest.file
779
841
  # Reject unsafe characters in $srcdir or the absolute working directory
780
842
  # name. Accept space and tab only in the latter.
781
843
  am_lf='
@@ -786,32 +848,40 @@ case `pwd` in
786
848
  esac
787
849
  case $srcdir in
788
850
  *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
789
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
851
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
790
852
  esac
791
853
 
792
- # Do `set' in a subshell so we don't clobber the current shell's
854
+ # Do 'set' in a subshell so we don't clobber the current shell's
793
855
  # arguments. Must try -L first in case configure is actually a
794
856
  # symlink; some systems play weird games with the mod time of symlinks
795
857
  # (eg FreeBSD returns the mod time of the symlink's containing
796
858
  # directory).
797
859
  if (
798
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
799
- if test "$[*]" = "X"; then
800
- # -L didn't work.
801
- set X `ls -t "$srcdir/configure" conftest.file`
802
- fi
803
- rm -f conftest.file
804
- if test "$[*]" != "X $srcdir/configure conftest.file" \
805
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
806
-
807
- # If neither matched, then we have a broken ls. This can happen
808
- # if, for instance, CONFIG_SHELL is bash and it inherits a
809
- # broken ls alias from the environment. This has actually
810
- # happened. Such a system could not be considered "sane".
811
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
812
- alias in your environment])
813
- fi
814
-
860
+ am_has_slept=no
861
+ for am_try in 1 2; do
862
+ echo "timestamp, slept: $am_has_slept" > conftest.file
863
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
864
+ if test "$[*]" = "X"; then
865
+ # -L didn't work.
866
+ set X `ls -t "$srcdir/configure" conftest.file`
867
+ fi
868
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
869
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
870
+
871
+ # If neither matched, then we have a broken ls. This can happen
872
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
873
+ # broken ls alias from the environment. This has actually
874
+ # happened. Such a system could not be considered "sane".
875
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
876
+ alias in your environment])
877
+ fi
878
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
879
+ break
880
+ fi
881
+ # Just in case.
882
+ sleep 1
883
+ am_has_slept=yes
884
+ done
815
885
  test "$[2]" = conftest.file
816
886
  )
817
887
  then
@@ -821,46 +891,118 @@ else
821
891
  AC_MSG_ERROR([newly created file is older than distributed files!
822
892
  Check your system clock])
823
893
  fi
824
- AC_MSG_RESULT(yes)])
894
+ AC_MSG_RESULT([yes])
895
+ # If we didn't sleep, we still need to ensure time stamps of config.status and
896
+ # generated files are strictly newer.
897
+ am_sleep_pid=
898
+ if grep 'slept: no' conftest.file >/dev/null 2>&1; then
899
+ ( sleep 1 ) &
900
+ am_sleep_pid=$!
901
+ fi
902
+ AC_CONFIG_COMMANDS_PRE(
903
+ [AC_MSG_CHECKING([that generated files are newer than configure])
904
+ if test -n "$am_sleep_pid"; then
905
+ # Hide warnings about reused PIDs.
906
+ wait $am_sleep_pid 2>/dev/null
907
+ fi
908
+ AC_MSG_RESULT([done])])
909
+ rm -f conftest.file
910
+ ])
825
911
 
826
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
912
+ # Copyright (C) 2009-2013 Free Software Foundation, Inc.
827
913
  #
828
914
  # This file is free software; the Free Software Foundation
829
915
  # gives unlimited permission to copy and/or distribute it,
830
916
  # with or without modifications, as long as this notice is preserved.
831
917
 
832
- # serial 1
918
+ # AM_SILENT_RULES([DEFAULT])
919
+ # --------------------------
920
+ # Enable less verbose build rules; with the default set to DEFAULT
921
+ # ("yes" being less verbose, "no" or empty being verbose).
922
+ AC_DEFUN([AM_SILENT_RULES],
923
+ [AC_ARG_ENABLE([silent-rules], [dnl
924
+ AS_HELP_STRING(
925
+ [--enable-silent-rules],
926
+ [less verbose build output (undo: "make V=1")])
927
+ AS_HELP_STRING(
928
+ [--disable-silent-rules],
929
+ [verbose build output (undo: "make V=0")])dnl
930
+ ])
931
+ case $enable_silent_rules in @%:@ (((
932
+ yes) AM_DEFAULT_VERBOSITY=0;;
933
+ no) AM_DEFAULT_VERBOSITY=1;;
934
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
935
+ esac
936
+ dnl
937
+ dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
938
+ dnl do not support nested variable expansions.
939
+ dnl See automake bug#9928 and bug#10237.
940
+ am_make=${MAKE-make}
941
+ AC_CACHE_CHECK([whether $am_make supports nested variables],
942
+ [am_cv_make_support_nested_variables],
943
+ [if AS_ECHO([['TRUE=$(BAR$(V))
944
+ BAR0=false
945
+ BAR1=true
946
+ V=1
947
+ am__doit:
948
+ @$(TRUE)
949
+ .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
950
+ am_cv_make_support_nested_variables=yes
951
+ else
952
+ am_cv_make_support_nested_variables=no
953
+ fi])
954
+ if test $am_cv_make_support_nested_variables = yes; then
955
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
956
+ AM_V='$(V)'
957
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
958
+ else
959
+ AM_V=$AM_DEFAULT_VERBOSITY
960
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
961
+ fi
962
+ AC_SUBST([AM_V])dnl
963
+ AM_SUBST_NOTMAKE([AM_V])dnl
964
+ AC_SUBST([AM_DEFAULT_V])dnl
965
+ AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
966
+ AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
967
+ AM_BACKSLASH='\'
968
+ AC_SUBST([AM_BACKSLASH])dnl
969
+ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
970
+ ])
971
+
972
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
973
+ #
974
+ # This file is free software; the Free Software Foundation
975
+ # gives unlimited permission to copy and/or distribute it,
976
+ # with or without modifications, as long as this notice is preserved.
833
977
 
834
978
  # AM_PROG_INSTALL_STRIP
835
979
  # ---------------------
836
- # One issue with vendor `install' (even GNU) is that you can't
980
+ # One issue with vendor 'install' (even GNU) is that you can't
837
981
  # specify the program used to strip binaries. This is especially
838
982
  # annoying in cross-compiling environments, where the build's strip
839
983
  # is unlikely to handle the host's binaries.
840
984
  # Fortunately install-sh will honor a STRIPPROG variable, so we
841
- # always use install-sh in `make install-strip', and initialize
985
+ # always use install-sh in "make install-strip", and initialize
842
986
  # STRIPPROG with the value of the STRIP variable (set by the user).
843
987
  AC_DEFUN([AM_PROG_INSTALL_STRIP],
844
988
  [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
845
- # Installed binaries are usually stripped using `strip' when the user
846
- # run `make install-strip'. However `strip' might not be the right
989
+ # Installed binaries are usually stripped using 'strip' when the user
990
+ # run "make install-strip". However 'strip' might not be the right
847
991
  # tool to use in cross-compilation environments, therefore Automake
848
- # will honor the `STRIP' environment variable to overrule this program.
849
- dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
992
+ # will honor the 'STRIP' environment variable to overrule this program.
993
+ dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
850
994
  if test "$cross_compiling" != no; then
851
995
  AC_CHECK_TOOL([STRIP], [strip], :)
852
996
  fi
853
997
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
854
998
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
855
999
 
856
- # Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1000
+ # Copyright (C) 2006-2013 Free Software Foundation, Inc.
857
1001
  #
858
1002
  # This file is free software; the Free Software Foundation
859
1003
  # gives unlimited permission to copy and/or distribute it,
860
1004
  # with or without modifications, as long as this notice is preserved.
861
1005
 
862
- # serial 3
863
-
864
1006
  # _AM_SUBST_NOTMAKE(VARIABLE)
865
1007
  # ---------------------------
866
1008
  # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -874,18 +1016,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
874
1016
 
875
1017
  # Check how to create a tarball. -*- Autoconf -*-
876
1018
 
877
- # Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1019
+ # Copyright (C) 2004-2013 Free Software Foundation, Inc.
878
1020
  #
879
1021
  # This file is free software; the Free Software Foundation
880
1022
  # gives unlimited permission to copy and/or distribute it,
881
1023
  # with or without modifications, as long as this notice is preserved.
882
1024
 
883
- # serial 2
884
-
885
1025
  # _AM_PROG_TAR(FORMAT)
886
1026
  # --------------------
887
1027
  # Check how to create a tarball in format FORMAT.
888
- # FORMAT should be one of `v7', `ustar', or `pax'.
1028
+ # FORMAT should be one of 'v7', 'ustar', or 'pax'.
889
1029
  #
890
1030
  # Substitute a variable $(am__tar) that is a command
891
1031
  # writing to stdout a FORMAT-tarball containing the directory
@@ -895,76 +1035,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
895
1035
  # Substitute a variable $(am__untar) that extract such
896
1036
  # a tarball read from stdin.
897
1037
  # $(am__untar) < result.tar
1038
+ #
898
1039
  AC_DEFUN([_AM_PROG_TAR],
899
1040
  [# Always define AMTAR for backward compatibility. Yes, it's still used
900
1041
  # in the wild :-( We should find a proper way to deprecate it ...
901
1042
  AC_SUBST([AMTAR], ['$${TAR-tar}'])
902
- m4_if([$1], [v7],
903
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
904
- [m4_case([$1], [ustar],, [pax],,
905
- [m4_fatal([Unknown tar format])])
906
- AC_MSG_CHECKING([how to create a $1 tar archive])
907
- # Loop over all known methods to create a tar archive until one works.
1043
+
1044
+ # We'll loop over all known methods to create a tar archive until one works.
908
1045
  _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
909
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
910
- # Do not fold the above two line into one, because Tru64 sh and
911
- # Solaris sh will not grok spaces in the rhs of `-'.
912
- for _am_tool in $_am_tools
913
- do
914
- case $_am_tool in
915
- gnutar)
916
- for _am_tar in tar gnutar gtar;
917
- do
918
- AM_RUN_LOG([$_am_tar --version]) && break
919
- done
920
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
921
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
922
- am__untar="$_am_tar -xf -"
923
- ;;
924
- plaintar)
925
- # Must skip GNU tar: if it does not support --format= it doesn't create
926
- # ustar tarball either.
927
- (tar --version) >/dev/null 2>&1 && continue
928
- am__tar='tar chf - "$$tardir"'
929
- am__tar_='tar chf - "$tardir"'
930
- am__untar='tar xf -'
931
- ;;
932
- pax)
933
- am__tar='pax -L -x $1 -w "$$tardir"'
934
- am__tar_='pax -L -x $1 -w "$tardir"'
935
- am__untar='pax -r'
936
- ;;
937
- cpio)
938
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
939
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
940
- am__untar='cpio -i -H $1 -d'
941
- ;;
942
- none)
943
- am__tar=false
944
- am__tar_=false
945
- am__untar=false
946
- ;;
947
- esac
948
1046
 
949
- # If the value was cached, stop now. We just wanted to have am__tar
950
- # and am__untar set.
951
- test -n "${am_cv_prog_tar_$1}" && break
1047
+ m4_if([$1], [v7],
1048
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1049
+
1050
+ [m4_case([$1],
1051
+ [ustar],
1052
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1053
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
1054
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1055
+ # and bug#13588).
1056
+ am_max_uid=2097151 # 2^21 - 1
1057
+ am_max_gid=$am_max_uid
1058
+ # The $UID and $GID variables are not portable, so we need to resort
1059
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
1060
+ # below are definitely unexpected, so allow the users to see them
1061
+ # (that is, avoid stderr redirection).
1062
+ am_uid=`id -u || echo unknown`
1063
+ am_gid=`id -g || echo unknown`
1064
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1065
+ if test $am_uid -le $am_max_uid; then
1066
+ AC_MSG_RESULT([yes])
1067
+ else
1068
+ AC_MSG_RESULT([no])
1069
+ _am_tools=none
1070
+ fi
1071
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1072
+ if test $am_gid -le $am_max_gid; then
1073
+ AC_MSG_RESULT([yes])
1074
+ else
1075
+ AC_MSG_RESULT([no])
1076
+ _am_tools=none
1077
+ fi],
1078
+
1079
+ [pax],
1080
+ [],
1081
+
1082
+ [m4_fatal([Unknown tar format])])
1083
+
1084
+ AC_MSG_CHECKING([how to create a $1 tar archive])
1085
+
1086
+ # Go ahead even if we have the value already cached. We do so because we
1087
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
1088
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1089
+
1090
+ for _am_tool in $_am_tools; do
1091
+ case $_am_tool in
1092
+ gnutar)
1093
+ for _am_tar in tar gnutar gtar; do
1094
+ AM_RUN_LOG([$_am_tar --version]) && break
1095
+ done
1096
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1097
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1098
+ am__untar="$_am_tar -xf -"
1099
+ ;;
1100
+ plaintar)
1101
+ # Must skip GNU tar: if it does not support --format= it doesn't create
1102
+ # ustar tarball either.
1103
+ (tar --version) >/dev/null 2>&1 && continue
1104
+ am__tar='tar chf - "$$tardir"'
1105
+ am__tar_='tar chf - "$tardir"'
1106
+ am__untar='tar xf -'
1107
+ ;;
1108
+ pax)
1109
+ am__tar='pax -L -x $1 -w "$$tardir"'
1110
+ am__tar_='pax -L -x $1 -w "$tardir"'
1111
+ am__untar='pax -r'
1112
+ ;;
1113
+ cpio)
1114
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1115
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1116
+ am__untar='cpio -i -H $1 -d'
1117
+ ;;
1118
+ none)
1119
+ am__tar=false
1120
+ am__tar_=false
1121
+ am__untar=false
1122
+ ;;
1123
+ esac
952
1124
 
953
- # tar/untar a dummy directory, and stop if the command works
954
- rm -rf conftest.dir
955
- mkdir conftest.dir
956
- echo GrepMe > conftest.dir/file
957
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1125
+ # If the value was cached, stop now. We just wanted to have am__tar
1126
+ # and am__untar set.
1127
+ test -n "${am_cv_prog_tar_$1}" && break
1128
+
1129
+ # tar/untar a dummy directory, and stop if the command works.
1130
+ rm -rf conftest.dir
1131
+ mkdir conftest.dir
1132
+ echo GrepMe > conftest.dir/file
1133
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1134
+ rm -rf conftest.dir
1135
+ if test -s conftest.tar; then
1136
+ AM_RUN_LOG([$am__untar <conftest.tar])
1137
+ AM_RUN_LOG([cat conftest.dir/file])
1138
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1139
+ fi
1140
+ done
958
1141
  rm -rf conftest.dir
959
- if test -s conftest.tar; then
960
- AM_RUN_LOG([$am__untar <conftest.tar])
961
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
962
- fi
963
- done
964
- rm -rf conftest.dir
965
1142
 
966
- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
967
- AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1143
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1144
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1145
+
968
1146
  AC_SUBST([am__tar])
969
1147
  AC_SUBST([am__untar])
970
1148
  ]) # _AM_PROG_TAR