tnef 1.0.1 → 1.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +7 -0
- data/ext/tnef/ChangeLog +18 -0
- data/ext/tnef/Makefile.in +185 -132
- data/ext/tnef/NEWS +4 -1
- data/ext/tnef/aclocal.m4 +440 -266
- data/ext/tnef/autom4te.cache/output.0 +7001 -0
- data/ext/tnef/autom4te.cache/output.1 +7001 -0
- data/ext/tnef/autom4te.cache/requests +159 -0
- data/ext/tnef/autom4te.cache/traces.0 +545 -0
- data/ext/tnef/autom4te.cache/traces.1 +1036 -0
- data/ext/tnef/compile +347 -0
- data/ext/tnef/config.log +971 -0
- data/ext/tnef/configure +380 -194
- data/ext/tnef/configure.in +1 -1
- data/ext/tnef/contrib/evolution.helper +43 -0
- data/ext/tnef/contrib/evolution.helper.README +11 -0
- data/ext/tnef/contrib/tnef-alpine.perl +91 -0
- data/ext/tnef/contrib/tnef-alpine.perl.README +10 -0
- data/ext/tnef/doc/Makefile +659 -0
- data/ext/tnef/doc/Makefile.in +171 -135
- data/ext/tnef/doc/tnef.1 +185 -0
- data/ext/tnef/doc/tnef.1.in +34 -32
- data/ext/tnef/doc/www/Makefile +585 -0
- data/ext/tnef/doc/www/Makefile.in +158 -115
- data/ext/tnef/doc/www/cgi-bin/Makefile +405 -0
- data/ext/tnef/doc/www/cgi-bin/Makefile.in +83 -18
- data/ext/tnef/doc/www/htdocs/Makefile +405 -0
- data/ext/tnef/doc/www/htdocs/Makefile.in +83 -18
- data/ext/tnef/doc/www/htdocs/index.html +51 -0
- data/ext/tnef/doc/www/htdocs/style.css +13 -0
- data/ext/tnef/src/Makefile.in +193 -135
- data/ext/tnef/src/replace/Makefile.in +148 -55
- data/ext/tnef/src/tnef.c +10 -8
- data/ext/tnef/test-driver +127 -0
- data/ext/tnef/tests/Makefile.in +158 -115
- data/ext/tnef/tests/cmdline/Attic/mime-types.baseline +3 -0
- data/ext/tnef/tests/cmdline/Attic/mime-types.test +11 -0
- data/ext/tnef/tests/cmdline/Makefile.in +441 -110
- data/ext/tnef/tests/cmdline/body-test.html.baseline +95 -95
- data/ext/tnef/tests/cmdline/body.baseline +2 -2
- data/ext/tnef/tests/cmdline/interactive.baseline +0 -0
- data/ext/tnef/tests/cmdline/message.html.baseline +95 -95
- data/ext/tnef/tests/cmdline/version.baseline +2 -2
- data/ext/tnef/tests/files/Makefile.in +515 -205
- data/ext/tnef/tests/files/baselines/Makefile.in +83 -18
- data/ext/tnef/tests/files/datafiles/Makefile.in +83 -18
- data/lib/tnef/version.rb +1 -1
- metadata +34 -18
data/ext/tnef/NEWS
CHANGED
@@ -1,7 +1,10 @@
|
|
1
1
|
TNEF NEWS -- history of user-visible changes. 18 April 2011
|
2
2
|
Copyright (C) 2000-2011 by Mark Simpson
|
3
3
|
|
4
|
-
|
4
|
+
* 1.4.10 [4 November 2013]
|
5
|
+
** Incorporating documentation patch from bentley (github)
|
6
|
+
** Fixing small problems from new versions of automake/gcc
|
7
|
+
|
5
8
|
* 1.4.9 [29 February 2012]
|
6
9
|
** Incorporating patches from Engelke Eschner <tekai@gmx.li>
|
7
10
|
*** (from github: https://github.com/verdammelt/tnef/pull/1)
|
data/ext/tnef/aclocal.m4
CHANGED
@@ -1,8 +1,7 @@
|
|
1
|
-
# generated automatically by aclocal 1.
|
1
|
+
# generated automatically by aclocal 1.14 -*- 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.
|
18
|
-
[m4_warning([this file was generated for autoconf 2.
|
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
|
21
|
+
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
22
22
|
|
23
|
-
# Copyright (C) 2002
|
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.
|
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.
|
38
|
+
m4_if([$1], [1.14], [],
|
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.
|
54
|
+
[AM_AUTOMAKE_VERSION([1.14])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
|
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
|
74
|
-
#
|
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
|
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
|
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
|
-
|
134
|
-
|
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
|
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
|
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", "
|
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
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
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
|
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
|
240
|
-
# Solaris
|
241
|
-
|
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
|
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
|
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
|
-
#
|
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
|
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
|
-
|
326
|
-
--enable-dependency-tracking
|
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
|
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
|
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
|
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
|
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'
|
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
|
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
|
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.
|
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
|
-
[
|
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(
|
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([
|
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
|
-
[
|
511
|
-
|
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
|
-
[
|
515
|
-
|
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
|
-
[
|
519
|
-
|
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
|
-
|
522
|
-
dnl The
|
523
|
-
dnl
|
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
|
-
|
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
|
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
|
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],
|
@@ -603,20 +645,17 @@ AC_SUBST([am__leading_dot])])
|
|
603
645
|
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
|
604
646
|
# From Jim Meyering
|
605
647
|
|
606
|
-
# Copyright (C) 1996
|
607
|
-
# 2011 Free Software Foundation, Inc.
|
648
|
+
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
608
649
|
#
|
609
650
|
# This file is free software; the Free Software Foundation
|
610
651
|
# gives unlimited permission to copy and/or distribute it,
|
611
652
|
# with or without modifications, as long as this notice is preserved.
|
612
653
|
|
613
|
-
# serial 5
|
614
|
-
|
615
654
|
# AM_MAINTAINER_MODE([DEFAULT-MODE])
|
616
655
|
# ----------------------------------
|
617
656
|
# Control maintainer-specific portions of Makefiles.
|
618
|
-
# Default is to disable them, unless
|
619
|
-
# For symmetry,
|
657
|
+
# Default is to disable them, unless 'enable' is passed literally.
|
658
|
+
# For symmetry, 'disable' may be passed as well. Anyway, the user
|
620
659
|
# can override the default with the --enable/--disable switch.
|
621
660
|
AC_DEFUN([AM_MAINTAINER_MODE],
|
622
661
|
[m4_case(m4_default([$1], [disable]),
|
@@ -627,10 +666,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
|
|
627
666
|
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
628
667
|
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
|
629
668
|
AC_ARG_ENABLE([maintainer-mode],
|
630
|
-
[
|
631
|
-
|
632
|
-
|
633
|
-
|
669
|
+
[AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
|
670
|
+
am_maintainer_other[ make rules and dependencies not useful
|
671
|
+
(and sometimes confusing) to the casual installer])],
|
672
|
+
[USE_MAINTAINER_MODE=$enableval],
|
673
|
+
[USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
|
634
674
|
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
|
635
675
|
AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
|
636
676
|
MAINT=$MAINTAINER_MODE_TRUE
|
@@ -638,18 +678,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
|
638
678
|
]
|
639
679
|
)
|
640
680
|
|
641
|
-
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
|
642
|
-
|
643
681
|
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
644
682
|
|
645
|
-
# Copyright (C) 2001
|
683
|
+
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
646
684
|
#
|
647
685
|
# This file is free software; the Free Software Foundation
|
648
686
|
# gives unlimited permission to copy and/or distribute it,
|
649
687
|
# with or without modifications, as long as this notice is preserved.
|
650
688
|
|
651
|
-
# serial 4
|
652
|
-
|
653
689
|
# AM_MAKE_INCLUDE()
|
654
690
|
# -----------------
|
655
691
|
# Check to see how make treats includes.
|
@@ -667,7 +703,7 @@ am__quote=
|
|
667
703
|
_am_result=none
|
668
704
|
# First try GNU make style include.
|
669
705
|
echo "include confinc" > confmf
|
670
|
-
# Ignore all kinds of additional output from
|
706
|
+
# Ignore all kinds of additional output from 'make'.
|
671
707
|
case `$am_make -s -f confmf 2> /dev/null` in #(
|
672
708
|
*the\ am__doit\ target*)
|
673
709
|
am__include=include
|
@@ -694,15 +730,12 @@ rm -f confinc confmf
|
|
694
730
|
|
695
731
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
696
732
|
|
697
|
-
# Copyright (C) 1997
|
698
|
-
# Free Software Foundation, Inc.
|
733
|
+
# Copyright (C) 1997-2013 Free Software Foundation, Inc.
|
699
734
|
#
|
700
735
|
# This file is free software; the Free Software Foundation
|
701
736
|
# gives unlimited permission to copy and/or distribute it,
|
702
737
|
# with or without modifications, as long as this notice is preserved.
|
703
738
|
|
704
|
-
# serial 6
|
705
|
-
|
706
739
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
707
740
|
# ------------------------------
|
708
741
|
AC_DEFUN([AM_MISSING_PROG],
|
@@ -710,11 +743,10 @@ AC_DEFUN([AM_MISSING_PROG],
|
|
710
743
|
$1=${$1-"${am_missing_run}$2"}
|
711
744
|
AC_SUBST($1)])
|
712
745
|
|
713
|
-
|
714
746
|
# AM_MISSING_HAS_RUN
|
715
747
|
# ------------------
|
716
|
-
# Define MISSING if not defined so far and test if it
|
717
|
-
# If it
|
748
|
+
# Define MISSING if not defined so far and test if it is modern enough.
|
749
|
+
# If it is, set am_missing_run to use it, otherwise, to nothing.
|
718
750
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
719
751
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
720
752
|
AC_REQUIRE_AUX_FILE([missing])dnl
|
@@ -727,54 +759,22 @@ if test x"${MISSING+set}" != xset; then
|
|
727
759
|
esac
|
728
760
|
fi
|
729
761
|
# Use eval to expand $SHELL
|
730
|
-
if eval "$MISSING --
|
731
|
-
am_missing_run="$MISSING
|
762
|
+
if eval "$MISSING --is-lightweight"; then
|
763
|
+
am_missing_run="$MISSING "
|
732
764
|
else
|
733
765
|
am_missing_run=
|
734
|
-
AC_MSG_WARN([
|
766
|
+
AC_MSG_WARN(['missing' script is too old or missing])
|
735
767
|
fi
|
736
768
|
])
|
737
769
|
|
738
|
-
# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
|
739
|
-
# Inc.
|
740
|
-
#
|
741
|
-
# This file is free software; the Free Software Foundation
|
742
|
-
# gives unlimited permission to copy and/or distribute it,
|
743
|
-
# with or without modifications, as long as this notice is preserved.
|
744
|
-
|
745
|
-
# serial 1
|
746
|
-
|
747
|
-
# AM_PROG_MKDIR_P
|
748
|
-
# ---------------
|
749
|
-
# Check for `mkdir -p'.
|
750
|
-
AC_DEFUN([AM_PROG_MKDIR_P],
|
751
|
-
[AC_PREREQ([2.60])dnl
|
752
|
-
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
753
|
-
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
|
754
|
-
dnl while keeping a definition of mkdir_p for backward compatibility.
|
755
|
-
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
|
756
|
-
dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
|
757
|
-
dnl Makefile.ins that do not define MKDIR_P, so we do our own
|
758
|
-
dnl adjustment using top_builddir (which is defined more often than
|
759
|
-
dnl MKDIR_P).
|
760
|
-
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
|
761
|
-
case $mkdir_p in
|
762
|
-
[[\\/$]]* | ?:[[\\/]]*) ;;
|
763
|
-
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
|
764
|
-
esac
|
765
|
-
])
|
766
|
-
|
767
770
|
# Helper functions for option handling. -*- Autoconf -*-
|
768
771
|
|
769
|
-
# Copyright (C) 2001
|
770
|
-
# Foundation, Inc.
|
772
|
+
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
771
773
|
#
|
772
774
|
# This file is free software; the Free Software Foundation
|
773
775
|
# gives unlimited permission to copy and/or distribute it,
|
774
776
|
# with or without modifications, as long as this notice is preserved.
|
775
777
|
|
776
|
-
# serial 5
|
777
|
-
|
778
778
|
# _AM_MANGLE_OPTION(NAME)
|
779
779
|
# -----------------------
|
780
780
|
AC_DEFUN([_AM_MANGLE_OPTION],
|
@@ -784,7 +784,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
|
|
784
784
|
# --------------------
|
785
785
|
# Set option NAME. Presently that only means defining a flag for this option.
|
786
786
|
AC_DEFUN([_AM_SET_OPTION],
|
787
|
-
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
|
787
|
+
[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
|
788
788
|
|
789
789
|
# _AM_SET_OPTIONS(OPTIONS)
|
790
790
|
# ------------------------
|
@@ -798,24 +798,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
|
|
798
798
|
AC_DEFUN([_AM_IF_OPTION],
|
799
799
|
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
800
800
|
|
801
|
-
#
|
801
|
+
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
802
|
+
#
|
803
|
+
# This file is free software; the Free Software Foundation
|
804
|
+
# gives unlimited permission to copy and/or distribute it,
|
805
|
+
# with or without modifications, as long as this notice is preserved.
|
806
|
+
|
807
|
+
# _AM_PROG_CC_C_O
|
808
|
+
# ---------------
|
809
|
+
# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
|
810
|
+
# to automatically call this.
|
811
|
+
AC_DEFUN([_AM_PROG_CC_C_O],
|
812
|
+
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
813
|
+
AC_REQUIRE_AUX_FILE([compile])dnl
|
814
|
+
AC_LANG_PUSH([C])dnl
|
815
|
+
AC_CACHE_CHECK(
|
816
|
+
[whether $CC understands -c and -o together],
|
817
|
+
[am_cv_prog_cc_c_o],
|
818
|
+
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
|
819
|
+
# Make sure it works both with $CC and with simple cc.
|
820
|
+
# Following AC_PROG_CC_C_O, we do the test twice because some
|
821
|
+
# compilers refuse to overwrite an existing .o file with -o,
|
822
|
+
# though they will create one.
|
823
|
+
am_cv_prog_cc_c_o=yes
|
824
|
+
for am_i in 1 2; do
|
825
|
+
if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
|
826
|
+
&& test -f conftest2.$ac_objext; then
|
827
|
+
: OK
|
828
|
+
else
|
829
|
+
am_cv_prog_cc_c_o=no
|
830
|
+
break
|
831
|
+
fi
|
832
|
+
done
|
833
|
+
rm -f core conftest*
|
834
|
+
unset am_i])
|
835
|
+
if test "$am_cv_prog_cc_c_o" != yes; then
|
836
|
+
# Losing compiler, so override with the script.
|
837
|
+
# FIXME: It is wrong to rewrite CC.
|
838
|
+
# But if we don't then we get into trouble of one sort or another.
|
839
|
+
# A longer-term fix would be to have automake use am__CC in this case,
|
840
|
+
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
|
841
|
+
CC="$am_aux_dir/compile $CC"
|
842
|
+
fi
|
843
|
+
AC_LANG_POP([C])])
|
844
|
+
|
845
|
+
# For backward compatibility.
|
846
|
+
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
802
847
|
|
803
|
-
# Copyright (C)
|
804
|
-
# Free Software Foundation, Inc.
|
848
|
+
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
805
849
|
#
|
806
850
|
# This file is free software; the Free Software Foundation
|
807
851
|
# gives unlimited permission to copy and/or distribute it,
|
808
852
|
# with or without modifications, as long as this notice is preserved.
|
809
853
|
|
810
|
-
#
|
854
|
+
# AM_RUN_LOG(COMMAND)
|
855
|
+
# -------------------
|
856
|
+
# Run COMMAND, save the exit status in ac_status, and log it.
|
857
|
+
# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
|
858
|
+
AC_DEFUN([AM_RUN_LOG],
|
859
|
+
[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
|
860
|
+
($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
|
861
|
+
ac_status=$?
|
862
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
|
863
|
+
(exit $ac_status); }])
|
864
|
+
|
865
|
+
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
866
|
+
|
867
|
+
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
868
|
+
#
|
869
|
+
# This file is free software; the Free Software Foundation
|
870
|
+
# gives unlimited permission to copy and/or distribute it,
|
871
|
+
# with or without modifications, as long as this notice is preserved.
|
811
872
|
|
812
873
|
# AM_SANITY_CHECK
|
813
874
|
# ---------------
|
814
875
|
AC_DEFUN([AM_SANITY_CHECK],
|
815
876
|
[AC_MSG_CHECKING([whether build environment is sane])
|
816
|
-
# Just in case
|
817
|
-
sleep 1
|
818
|
-
echo timestamp > conftest.file
|
819
877
|
# Reject unsafe characters in $srcdir or the absolute working directory
|
820
878
|
# name. Accept space and tab only in the latter.
|
821
879
|
am_lf='
|
@@ -826,32 +884,40 @@ case `pwd` in
|
|
826
884
|
esac
|
827
885
|
case $srcdir in
|
828
886
|
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
|
829
|
-
AC_MSG_ERROR([unsafe srcdir value:
|
887
|
+
AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
|
830
888
|
esac
|
831
889
|
|
832
|
-
# Do
|
890
|
+
# Do 'set' in a subshell so we don't clobber the current shell's
|
833
891
|
# arguments. Must try -L first in case configure is actually a
|
834
892
|
# symlink; some systems play weird games with the mod time of symlinks
|
835
893
|
# (eg FreeBSD returns the mod time of the symlink's containing
|
836
894
|
# directory).
|
837
895
|
if (
|
838
|
-
|
839
|
-
|
840
|
-
|
841
|
-
|
842
|
-
|
843
|
-
|
844
|
-
|
845
|
-
|
846
|
-
|
847
|
-
|
848
|
-
|
849
|
-
|
850
|
-
|
851
|
-
|
852
|
-
|
853
|
-
|
854
|
-
|
896
|
+
am_has_slept=no
|
897
|
+
for am_try in 1 2; do
|
898
|
+
echo "timestamp, slept: $am_has_slept" > conftest.file
|
899
|
+
set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
900
|
+
if test "$[*]" = "X"; then
|
901
|
+
# -L didn't work.
|
902
|
+
set X `ls -t "$srcdir/configure" conftest.file`
|
903
|
+
fi
|
904
|
+
if test "$[*]" != "X $srcdir/configure conftest.file" \
|
905
|
+
&& test "$[*]" != "X conftest.file $srcdir/configure"; then
|
906
|
+
|
907
|
+
# If neither matched, then we have a broken ls. This can happen
|
908
|
+
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
909
|
+
# broken ls alias from the environment. This has actually
|
910
|
+
# happened. Such a system could not be considered "sane".
|
911
|
+
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
|
912
|
+
alias in your environment])
|
913
|
+
fi
|
914
|
+
if test "$[2]" = conftest.file || test $am_try -eq 2; then
|
915
|
+
break
|
916
|
+
fi
|
917
|
+
# Just in case.
|
918
|
+
sleep 1
|
919
|
+
am_has_slept=yes
|
920
|
+
done
|
855
921
|
test "$[2]" = conftest.file
|
856
922
|
)
|
857
923
|
then
|
@@ -861,46 +927,118 @@ else
|
|
861
927
|
AC_MSG_ERROR([newly created file is older than distributed files!
|
862
928
|
Check your system clock])
|
863
929
|
fi
|
864
|
-
AC_MSG_RESULT(yes
|
930
|
+
AC_MSG_RESULT([yes])
|
931
|
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
|
932
|
+
# generated files are strictly newer.
|
933
|
+
am_sleep_pid=
|
934
|
+
if grep 'slept: no' conftest.file >/dev/null 2>&1; then
|
935
|
+
( sleep 1 ) &
|
936
|
+
am_sleep_pid=$!
|
937
|
+
fi
|
938
|
+
AC_CONFIG_COMMANDS_PRE(
|
939
|
+
[AC_MSG_CHECKING([that generated files are newer than configure])
|
940
|
+
if test -n "$am_sleep_pid"; then
|
941
|
+
# Hide warnings about reused PIDs.
|
942
|
+
wait $am_sleep_pid 2>/dev/null
|
943
|
+
fi
|
944
|
+
AC_MSG_RESULT([done])])
|
945
|
+
rm -f conftest.file
|
946
|
+
])
|
865
947
|
|
866
|
-
# Copyright (C)
|
948
|
+
# Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
867
949
|
#
|
868
950
|
# This file is free software; the Free Software Foundation
|
869
951
|
# gives unlimited permission to copy and/or distribute it,
|
870
952
|
# with or without modifications, as long as this notice is preserved.
|
871
953
|
|
872
|
-
#
|
954
|
+
# AM_SILENT_RULES([DEFAULT])
|
955
|
+
# --------------------------
|
956
|
+
# Enable less verbose build rules; with the default set to DEFAULT
|
957
|
+
# ("yes" being less verbose, "no" or empty being verbose).
|
958
|
+
AC_DEFUN([AM_SILENT_RULES],
|
959
|
+
[AC_ARG_ENABLE([silent-rules], [dnl
|
960
|
+
AS_HELP_STRING(
|
961
|
+
[--enable-silent-rules],
|
962
|
+
[less verbose build output (undo: "make V=1")])
|
963
|
+
AS_HELP_STRING(
|
964
|
+
[--disable-silent-rules],
|
965
|
+
[verbose build output (undo: "make V=0")])dnl
|
966
|
+
])
|
967
|
+
case $enable_silent_rules in @%:@ (((
|
968
|
+
yes) AM_DEFAULT_VERBOSITY=0;;
|
969
|
+
no) AM_DEFAULT_VERBOSITY=1;;
|
970
|
+
*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
|
971
|
+
esac
|
972
|
+
dnl
|
973
|
+
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
|
974
|
+
dnl do not support nested variable expansions.
|
975
|
+
dnl See automake bug#9928 and bug#10237.
|
976
|
+
am_make=${MAKE-make}
|
977
|
+
AC_CACHE_CHECK([whether $am_make supports nested variables],
|
978
|
+
[am_cv_make_support_nested_variables],
|
979
|
+
[if AS_ECHO([['TRUE=$(BAR$(V))
|
980
|
+
BAR0=false
|
981
|
+
BAR1=true
|
982
|
+
V=1
|
983
|
+
am__doit:
|
984
|
+
@$(TRUE)
|
985
|
+
.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
|
986
|
+
am_cv_make_support_nested_variables=yes
|
987
|
+
else
|
988
|
+
am_cv_make_support_nested_variables=no
|
989
|
+
fi])
|
990
|
+
if test $am_cv_make_support_nested_variables = yes; then
|
991
|
+
dnl Using '$V' instead of '$(V)' breaks IRIX make.
|
992
|
+
AM_V='$(V)'
|
993
|
+
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
|
994
|
+
else
|
995
|
+
AM_V=$AM_DEFAULT_VERBOSITY
|
996
|
+
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
|
997
|
+
fi
|
998
|
+
AC_SUBST([AM_V])dnl
|
999
|
+
AM_SUBST_NOTMAKE([AM_V])dnl
|
1000
|
+
AC_SUBST([AM_DEFAULT_V])dnl
|
1001
|
+
AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
|
1002
|
+
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
|
1003
|
+
AM_BACKSLASH='\'
|
1004
|
+
AC_SUBST([AM_BACKSLASH])dnl
|
1005
|
+
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
|
1006
|
+
])
|
1007
|
+
|
1008
|
+
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
1009
|
+
#
|
1010
|
+
# This file is free software; the Free Software Foundation
|
1011
|
+
# gives unlimited permission to copy and/or distribute it,
|
1012
|
+
# with or without modifications, as long as this notice is preserved.
|
873
1013
|
|
874
1014
|
# AM_PROG_INSTALL_STRIP
|
875
1015
|
# ---------------------
|
876
|
-
# One issue with vendor
|
1016
|
+
# One issue with vendor 'install' (even GNU) is that you can't
|
877
1017
|
# specify the program used to strip binaries. This is especially
|
878
1018
|
# annoying in cross-compiling environments, where the build's strip
|
879
1019
|
# is unlikely to handle the host's binaries.
|
880
1020
|
# Fortunately install-sh will honor a STRIPPROG variable, so we
|
881
|
-
# always use install-sh in
|
1021
|
+
# always use install-sh in "make install-strip", and initialize
|
882
1022
|
# STRIPPROG with the value of the STRIP variable (set by the user).
|
883
1023
|
AC_DEFUN([AM_PROG_INSTALL_STRIP],
|
884
1024
|
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
885
|
-
# Installed binaries are usually stripped using
|
886
|
-
# run
|
1025
|
+
# Installed binaries are usually stripped using 'strip' when the user
|
1026
|
+
# run "make install-strip". However 'strip' might not be the right
|
887
1027
|
# tool to use in cross-compilation environments, therefore Automake
|
888
|
-
# will honor the
|
889
|
-
dnl Don't test for $cross_compiling = yes, because it might be
|
1028
|
+
# will honor the 'STRIP' environment variable to overrule this program.
|
1029
|
+
dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
|
890
1030
|
if test "$cross_compiling" != no; then
|
891
1031
|
AC_CHECK_TOOL([STRIP], [strip], :)
|
892
1032
|
fi
|
893
1033
|
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
894
1034
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
895
1035
|
|
896
|
-
# Copyright (C) 2006
|
1036
|
+
# Copyright (C) 2006-2013 Free Software Foundation, Inc.
|
897
1037
|
#
|
898
1038
|
# This file is free software; the Free Software Foundation
|
899
1039
|
# gives unlimited permission to copy and/or distribute it,
|
900
1040
|
# with or without modifications, as long as this notice is preserved.
|
901
1041
|
|
902
|
-
# serial 3
|
903
|
-
|
904
1042
|
# _AM_SUBST_NOTMAKE(VARIABLE)
|
905
1043
|
# ---------------------------
|
906
1044
|
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
|
@@ -914,18 +1052,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
914
1052
|
|
915
1053
|
# Check how to create a tarball. -*- Autoconf -*-
|
916
1054
|
|
917
|
-
# Copyright (C) 2004
|
1055
|
+
# Copyright (C) 2004-2013 Free Software Foundation, Inc.
|
918
1056
|
#
|
919
1057
|
# This file is free software; the Free Software Foundation
|
920
1058
|
# gives unlimited permission to copy and/or distribute it,
|
921
1059
|
# with or without modifications, as long as this notice is preserved.
|
922
1060
|
|
923
|
-
# serial 2
|
924
|
-
|
925
1061
|
# _AM_PROG_TAR(FORMAT)
|
926
1062
|
# --------------------
|
927
1063
|
# Check how to create a tarball in format FORMAT.
|
928
|
-
# FORMAT should be one of
|
1064
|
+
# FORMAT should be one of 'v7', 'ustar', or 'pax'.
|
929
1065
|
#
|
930
1066
|
# Substitute a variable $(am__tar) that is a command
|
931
1067
|
# writing to stdout a FORMAT-tarball containing the directory
|
@@ -935,76 +1071,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
935
1071
|
# Substitute a variable $(am__untar) that extract such
|
936
1072
|
# a tarball read from stdin.
|
937
1073
|
# $(am__untar) < result.tar
|
1074
|
+
#
|
938
1075
|
AC_DEFUN([_AM_PROG_TAR],
|
939
1076
|
[# Always define AMTAR for backward compatibility. Yes, it's still used
|
940
1077
|
# in the wild :-( We should find a proper way to deprecate it ...
|
941
1078
|
AC_SUBST([AMTAR], ['$${TAR-tar}'])
|
942
|
-
|
943
|
-
|
944
|
-
[m4_case([$1], [ustar],, [pax],,
|
945
|
-
[m4_fatal([Unknown tar format])])
|
946
|
-
AC_MSG_CHECKING([how to create a $1 tar archive])
|
947
|
-
# Loop over all known methods to create a tar archive until one works.
|
1079
|
+
|
1080
|
+
# We'll loop over all known methods to create a tar archive until one works.
|
948
1081
|
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
|
949
|
-
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
|
950
|
-
# Do not fold the above two line into one, because Tru64 sh and
|
951
|
-
# Solaris sh will not grok spaces in the rhs of `-'.
|
952
|
-
for _am_tool in $_am_tools
|
953
|
-
do
|
954
|
-
case $_am_tool in
|
955
|
-
gnutar)
|
956
|
-
for _am_tar in tar gnutar gtar;
|
957
|
-
do
|
958
|
-
AM_RUN_LOG([$_am_tar --version]) && break
|
959
|
-
done
|
960
|
-
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
|
961
|
-
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
|
962
|
-
am__untar="$_am_tar -xf -"
|
963
|
-
;;
|
964
|
-
plaintar)
|
965
|
-
# Must skip GNU tar: if it does not support --format= it doesn't create
|
966
|
-
# ustar tarball either.
|
967
|
-
(tar --version) >/dev/null 2>&1 && continue
|
968
|
-
am__tar='tar chf - "$$tardir"'
|
969
|
-
am__tar_='tar chf - "$tardir"'
|
970
|
-
am__untar='tar xf -'
|
971
|
-
;;
|
972
|
-
pax)
|
973
|
-
am__tar='pax -L -x $1 -w "$$tardir"'
|
974
|
-
am__tar_='pax -L -x $1 -w "$tardir"'
|
975
|
-
am__untar='pax -r'
|
976
|
-
;;
|
977
|
-
cpio)
|
978
|
-
am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
|
979
|
-
am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
|
980
|
-
am__untar='cpio -i -H $1 -d'
|
981
|
-
;;
|
982
|
-
none)
|
983
|
-
am__tar=false
|
984
|
-
am__tar_=false
|
985
|
-
am__untar=false
|
986
|
-
;;
|
987
|
-
esac
|
988
1082
|
|
989
|
-
|
990
|
-
|
991
|
-
|
1083
|
+
m4_if([$1], [v7],
|
1084
|
+
[am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
|
1085
|
+
|
1086
|
+
[m4_case([$1],
|
1087
|
+
[ustar],
|
1088
|
+
[# The POSIX 1988 'ustar' format is defined with fixed-size fields.
|
1089
|
+
# There is notably a 21 bits limit for the UID and the GID. In fact,
|
1090
|
+
# the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
|
1091
|
+
# and bug#13588).
|
1092
|
+
am_max_uid=2097151 # 2^21 - 1
|
1093
|
+
am_max_gid=$am_max_uid
|
1094
|
+
# The $UID and $GID variables are not portable, so we need to resort
|
1095
|
+
# to the POSIX-mandated id(1) utility. Errors in the 'id' calls
|
1096
|
+
# below are definitely unexpected, so allow the users to see them
|
1097
|
+
# (that is, avoid stderr redirection).
|
1098
|
+
am_uid=`id -u || echo unknown`
|
1099
|
+
am_gid=`id -g || echo unknown`
|
1100
|
+
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
|
1101
|
+
if test $am_uid -le $am_max_uid; then
|
1102
|
+
AC_MSG_RESULT([yes])
|
1103
|
+
else
|
1104
|
+
AC_MSG_RESULT([no])
|
1105
|
+
_am_tools=none
|
1106
|
+
fi
|
1107
|
+
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
|
1108
|
+
if test $am_gid -le $am_max_gid; then
|
1109
|
+
AC_MSG_RESULT([yes])
|
1110
|
+
else
|
1111
|
+
AC_MSG_RESULT([no])
|
1112
|
+
_am_tools=none
|
1113
|
+
fi],
|
1114
|
+
|
1115
|
+
[pax],
|
1116
|
+
[],
|
1117
|
+
|
1118
|
+
[m4_fatal([Unknown tar format])])
|
1119
|
+
|
1120
|
+
AC_MSG_CHECKING([how to create a $1 tar archive])
|
1121
|
+
|
1122
|
+
# Go ahead even if we have the value already cached. We do so because we
|
1123
|
+
# need to set the values for the 'am__tar' and 'am__untar' variables.
|
1124
|
+
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
|
1125
|
+
|
1126
|
+
for _am_tool in $_am_tools; do
|
1127
|
+
case $_am_tool in
|
1128
|
+
gnutar)
|
1129
|
+
for _am_tar in tar gnutar gtar; do
|
1130
|
+
AM_RUN_LOG([$_am_tar --version]) && break
|
1131
|
+
done
|
1132
|
+
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
|
1133
|
+
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
|
1134
|
+
am__untar="$_am_tar -xf -"
|
1135
|
+
;;
|
1136
|
+
plaintar)
|
1137
|
+
# Must skip GNU tar: if it does not support --format= it doesn't create
|
1138
|
+
# ustar tarball either.
|
1139
|
+
(tar --version) >/dev/null 2>&1 && continue
|
1140
|
+
am__tar='tar chf - "$$tardir"'
|
1141
|
+
am__tar_='tar chf - "$tardir"'
|
1142
|
+
am__untar='tar xf -'
|
1143
|
+
;;
|
1144
|
+
pax)
|
1145
|
+
am__tar='pax -L -x $1 -w "$$tardir"'
|
1146
|
+
am__tar_='pax -L -x $1 -w "$tardir"'
|
1147
|
+
am__untar='pax -r'
|
1148
|
+
;;
|
1149
|
+
cpio)
|
1150
|
+
am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
|
1151
|
+
am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
|
1152
|
+
am__untar='cpio -i -H $1 -d'
|
1153
|
+
;;
|
1154
|
+
none)
|
1155
|
+
am__tar=false
|
1156
|
+
am__tar_=false
|
1157
|
+
am__untar=false
|
1158
|
+
;;
|
1159
|
+
esac
|
992
1160
|
|
993
|
-
|
994
|
-
|
995
|
-
|
996
|
-
|
997
|
-
|
1161
|
+
# If the value was cached, stop now. We just wanted to have am__tar
|
1162
|
+
# and am__untar set.
|
1163
|
+
test -n "${am_cv_prog_tar_$1}" && break
|
1164
|
+
|
1165
|
+
# tar/untar a dummy directory, and stop if the command works.
|
1166
|
+
rm -rf conftest.dir
|
1167
|
+
mkdir conftest.dir
|
1168
|
+
echo GrepMe > conftest.dir/file
|
1169
|
+
AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
|
1170
|
+
rm -rf conftest.dir
|
1171
|
+
if test -s conftest.tar; then
|
1172
|
+
AM_RUN_LOG([$am__untar <conftest.tar])
|
1173
|
+
AM_RUN_LOG([cat conftest.dir/file])
|
1174
|
+
grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
|
1175
|
+
fi
|
1176
|
+
done
|
998
1177
|
rm -rf conftest.dir
|
999
|
-
if test -s conftest.tar; then
|
1000
|
-
AM_RUN_LOG([$am__untar <conftest.tar])
|
1001
|
-
grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
|
1002
|
-
fi
|
1003
|
-
done
|
1004
|
-
rm -rf conftest.dir
|
1005
1178
|
|
1006
|
-
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
|
1007
|
-
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
|
1179
|
+
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
|
1180
|
+
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
|
1181
|
+
|
1008
1182
|
AC_SUBST([am__tar])
|
1009
1183
|
AC_SUBST([am__untar])
|
1010
1184
|
]) # _AM_PROG_TAR
|