diff options
author | Philip Balister <philip@balister.org> | 2013-01-05 08:46:47 -0500 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-01-09 11:37:15 +0100 |
commit | 441f2cc2c5894f7674dbe6c10e236b31bb9ac608 (patch) | |
tree | aca58a8a3d2d01b830f58d4fcd054ef7ae5b14ab /meta-oe/recipes-support | |
parent | e9afe28896ea4e1066a77f1ee2f7001f5aaa403d (diff) | |
download | meta-openembedded-441f2cc2c5894f7674dbe6c10e236b31bb9ac608.tar.gz |
fftw : Update to version 3.3.3.
* Convert --enable-neon selection to use neon tune feature.
* Drop neon patch since fftw now has direct neon support.
* Remove SRC_URI from each bb file and use only SRC_URI from fftw.inc file.
The old recipe selected neon for all armv7 machines, which was not
entirely correct.
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/fftw/fftw_3.2.2.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/fftw_3.3.3.bb | 7 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/fftwf/vesperix-neon.patch | 31791 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/fftwf_3.2.2.bb | 15 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/fftwf_3.3.3.bb | 10 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/fftwl_3.2.2.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/fftwl_3.3.3.bb | 7 |
7 files changed, 24 insertions, 31822 deletions
diff --git a/meta-oe/recipes-support/fftw/fftw_3.2.2.bb b/meta-oe/recipes-support/fftw/fftw_3.2.2.bb deleted file mode 100644 index 090e00409..000000000 --- a/meta-oe/recipes-support/fftw/fftw_3.2.2.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require fftw.inc | ||
2 | |||
3 | SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz" | ||
4 | |||
5 | EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" | ||
6 | |||
7 | SRC_URI[md5sum] = "b616e5c91218cc778b5aa735fefb61ae" | ||
8 | SRC_URI[sha256sum] = "6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f" | ||
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.3.bb b/meta-oe/recipes-support/fftw/fftw_3.3.3.bb new file mode 100644 index 000000000..03a12746d --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw_3.3.3.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require fftw.inc | ||
2 | |||
3 | EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" | ||
4 | |||
5 | SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2" | ||
6 | SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3" | ||
7 | |||
diff --git a/meta-oe/recipes-support/fftw/fftwf/vesperix-neon.patch b/meta-oe/recipes-support/fftw/fftwf/vesperix-neon.patch deleted file mode 100644 index eb7f13149..000000000 --- a/meta-oe/recipes-support/fftw/fftwf/vesperix-neon.patch +++ /dev/null | |||
@@ -1,31791 +0,0 @@ | |||
1 | Makefile.in | 247 | ||
2 | aclocal.m4 | 323 | ||
3 | api/Makefile.in | 114 | ||
4 | api/version.c | 3 | ||
5 | cell/Makefile.in | 142 | ||
6 | cell/spu/Makefile.in | 80 | ||
7 | config.h.in | 33 | ||
8 | configure |14924 ++++++++++------------------------------ | ||
9 | configure.ac | 49 | ||
10 | dft/Makefile.in | 142 | ||
11 | dft/scalar/Makefile.in | 142 | ||
12 | dft/scalar/codelets/Makefile.in | 75 | ||
13 | dft/simd/Makefile.in | 142 | ||
14 | dft/simd/codelets/Makefile.in | 75 | ||
15 | doc/FAQ/Makefile.in | 43 | ||
16 | doc/Makefile.in | 270 | ||
17 | genfft/Makefile.in | 43 | ||
18 | kernel/Makefile.in | 73 | ||
19 | kernel/cycle.h | 60 | ||
20 | kernel/ifftw.h | 2 | ||
21 | libbench2/Makefile.in | 73 | ||
22 | ltmain.sh | 8 | ||
23 | m4/Makefile.in | 43 | ||
24 | m4/ltversion.m4 | 10 | ||
25 | rdft/Makefile.in | 142 | ||
26 | rdft/scalar/Makefile.in | 142 | ||
27 | rdft/scalar/r2cb/Makefile.in | 75 | ||
28 | rdft/scalar/r2cf/Makefile.in | 75 | ||
29 | rdft/scalar/r2r/Makefile.in | 75 | ||
30 | rdft/simd/Makefile.in | 142 | ||
31 | rdft/simd/codelets/Makefile.in | 75 | ||
32 | reodft/Makefile.in | 142 | ||
33 | simd/Makefile.am | 2 | ||
34 | simd/Makefile.in | 148 | ||
35 | simd/neon.c | 73 | ||
36 | simd/nonportable/Makefile.in | 73 | ||
37 | simd/simd-neon.h | 134 | ||
38 | simd/simd.h | 4 | ||
39 | support/Makefile.in | 43 | ||
40 | tests/Makefile.in | 87 | ||
41 | threads/Makefile.in | 113 | ||
42 | tools/Makefile.in | 278 | ||
43 | 42 files changed, 6722 insertions(+), 12217 deletions(-) | ||
44 | diff -Nurd fftw-3.2.2/aclocal.m4 fftw-3.2.2-arm-beta1/aclocal.m4 | ||
45 | --- fftw-3.2.2/aclocal.m4 2009-07-12 12:36:40.000000000 +0200 | ||
46 | +++ fftw-3.2.2-arm-beta1/aclocal.m4 2011-03-26 22:33:59.000000000 +0100 | ||
47 | @@ -1,7 +1,7 @@ | ||
48 | -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- | ||
49 | +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- | ||
50 | |||
51 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | ||
52 | -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
53 | +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
54 | # This file is free software; the Free Software Foundation | ||
55 | # gives unlimited permission to copy and/or distribute it, | ||
56 | # with or without modifications, as long as this notice is preserved. | ||
57 | @@ -13,8 +13,8 @@ | ||
58 | |||
59 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
60 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
61 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, | ||
62 | -[m4_warning([this file was generated for autoconf 2.63. | ||
63 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, | ||
64 | +[m4_warning([this file was generated for autoconf 2.67. | ||
65 | You have another version of autoconf. It may work, but is not guaranteed to. | ||
66 | If you have problems, you may need to regenerate the build system entirely. | ||
67 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | ||
68 | @@ -31,10 +31,10 @@ | ||
69 | # generated from the m4 files accompanying Automake X.Y. | ||
70 | # (This private macro should not be called outside this file.) | ||
71 | AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
72 | -[am__api_version='1.10' | ||
73 | +[am__api_version='1.11' | ||
74 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | ||
75 | dnl require some minimum version. Point them to the right macro. | ||
76 | -m4_if([$1], [1.10.2], [], | ||
77 | +m4_if([$1], [1.11.1], [], | ||
78 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
79 | ]) | ||
80 | |||
81 | @@ -50,7 +50,7 @@ | ||
82 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
83 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
84 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
85 | -[AM_AUTOMAKE_VERSION([1.10.2])dnl | ||
86 | +[AM_AUTOMAKE_VERSION([1.11.1])dnl | ||
87 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
88 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
89 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
90 | @@ -110,14 +110,14 @@ | ||
91 | |||
92 | # AM_CONDITIONAL -*- Autoconf -*- | ||
93 | |||
94 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 | ||
95 | +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 | ||
96 | # Free Software Foundation, Inc. | ||
97 | # | ||
98 | # This file is free software; the Free Software Foundation | ||
99 | # gives unlimited permission to copy and/or distribute it, | ||
100 | # with or without modifications, as long as this notice is preserved. | ||
101 | |||
102 | -# serial 8 | ||
103 | +# serial 9 | ||
104 | |||
105 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) | ||
106 | # ------------------------------------- | ||
107 | @@ -130,6 +130,7 @@ | ||
108 | AC_SUBST([$1_FALSE])dnl | ||
109 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl | ||
110 | _AM_SUBST_NOTMAKE([$1_FALSE])dnl | ||
111 | +m4_define([_AM_COND_VALUE_$1], [$2])dnl | ||
112 | if $2; then | ||
113 | $1_TRUE= | ||
114 | $1_FALSE='#' | ||
115 | @@ -143,14 +144,14 @@ | ||
116 | Usually this means the macro was only invoked conditionally.]]) | ||
117 | fi])]) | ||
118 | |||
119 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | ||
120 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 | ||
121 | # Free Software Foundation, Inc. | ||
122 | # | ||
123 | # This file is free software; the Free Software Foundation | ||
124 | # gives unlimited permission to copy and/or distribute it, | ||
125 | # with or without modifications, as long as this notice is preserved. | ||
126 | |||
127 | -# serial 9 | ||
128 | +# serial 10 | ||
129 | |||
130 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | ||
131 | # written in clear, in which case automake, when reading aclocal.m4, | ||
132 | @@ -207,6 +208,16 @@ | ||
133 | if test "$am_compiler_list" = ""; then | ||
134 | am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` | ||
135 | fi | ||
136 | + am__universal=false | ||
137 | + m4_case([$1], [CC], | ||
138 | + [case " $depcc " in #( | ||
139 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; | ||
140 | + esac], | ||
141 | + [CXX], | ||
142 | + [case " $depcc " in #( | ||
143 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; | ||
144 | + esac]) | ||
145 | + | ||
146 | for depmode in $am_compiler_list; do | ||
147 | # Setup a source with many dependencies, because some compilers | ||
148 | # like to wrap large dependency lists on column 80 (with \), and | ||
149 | @@ -224,7 +235,17 @@ | ||
150 | done | ||
151 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | ||
152 | |||
153 | + # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
154 | + # mode. It turns out that the SunPro C++ compiler does not properly | ||
155 | + # handle `-M -o', and we need to detect this. Also, some Intel | ||
156 | + # versions had trouble with output in subdirs | ||
157 | + am__obj=sub/conftest.${OBJEXT-o} | ||
158 | + am__minus_obj="-o $am__obj" | ||
159 | case $depmode in | ||
160 | + gcc) | ||
161 | + # This depmode causes a compiler race in universal mode. | ||
162 | + test "$am__universal" = false || continue | ||
163 | + ;; | ||
164 | nosideeffect) | ||
165 | # after this tag, mechanisms are not by side-effect, so they'll | ||
166 | # only be used when explicitly requested | ||
167 | @@ -234,19 +255,23 @@ | ||
168 | break | ||
169 | fi | ||
170 | ;; | ||
171 | + msvisualcpp | msvcmsys) | ||
172 | + # This compiler won't grok `-c -o', but also, the minuso test has | ||
173 | + # not run yet. These depmodes are late enough in the game, and | ||
174 | + # so weak that their functioning should not be impacted. | ||
175 | + am__obj=conftest.${OBJEXT-o} | ||
176 | + am__minus_obj= | ||
177 | + ;; | ||
178 | none) break ;; | ||
179 | esac | ||
180 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
181 | - # mode. It turns out that the SunPro C++ compiler does not properly | ||
182 | - # handle `-M -o', and we need to detect this. | ||
183 | if depmode=$depmode \ | ||
184 | - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ | ||
185 | + source=sub/conftest.c object=$am__obj \ | ||
186 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | ||
187 | - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | ||
188 | + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ | ||
189 | >/dev/null 2>conftest.err && | ||
190 | grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | ||
191 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | ||
192 | - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | ||
193 | + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && | ||
194 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | ||
195 | # icc doesn't choke on unknown options, it will just issue warnings | ||
196 | # or remarks (even with -Werror). So we grep stderr for any message | ||
197 | @@ -310,59 +335,61 @@ | ||
198 | # gives unlimited permission to copy and/or distribute it, | ||
199 | # with or without modifications, as long as this notice is preserved. | ||
200 | |||
201 | -#serial 4 | ||
202 | +#serial 5 | ||
203 | |||
204 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
205 | # ------------------------------ | ||
206 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
207 | -[# Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
208 | -# are listed without --file. Let's play safe and only enable the eval | ||
209 | -# if we detect the quoting. | ||
210 | -case $CONFIG_FILES in | ||
211 | -*\'*) eval set x "$CONFIG_FILES" ;; | ||
212 | -*) set x $CONFIG_FILES ;; | ||
213 | -esac | ||
214 | -shift | ||
215 | -for mf | ||
216 | -do | ||
217 | - # Strip MF so we end up with the name of the file. | ||
218 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
219 | - # Check whether this is an Automake generated Makefile or not. | ||
220 | - # We used to match only the files named `Makefile.in', but | ||
221 | - # some people rename them; so instead we look at the file content. | ||
222 | - # Grep'ing the first line is not enough: some people post-process | ||
223 | - # each Makefile.in and add a new line on top of each file to say so. | ||
224 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
225 | - # limit of 2048, but all sed's we know have understand at least 4000. | ||
226 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
227 | - dirpart=`AS_DIRNAME("$mf")` | ||
228 | - else | ||
229 | - continue | ||
230 | - fi | ||
231 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
232 | - # from the Makefile without running `make'. | ||
233 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
234 | - test -z "$DEPDIR" && continue | ||
235 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
236 | - test -z "am__include" && continue | ||
237 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
238 | - # When using ansi2knr, U may be empty or an underscore; expand it | ||
239 | - U=`sed -n 's/^U = //p' < "$mf"` | ||
240 | - # Find all dependency output files, they are included files with | ||
241 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
242 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
243 | - # expansion. | ||
244 | - for file in `sed -n " | ||
245 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
246 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
247 | - # Make sure the directory exists. | ||
248 | - test -f "$dirpart/$file" && continue | ||
249 | - fdir=`AS_DIRNAME(["$file"])` | ||
250 | - AS_MKDIR_P([$dirpart/$fdir]) | ||
251 | - # echo "creating $dirpart/$file" | ||
252 | - echo '# dummy' > "$dirpart/$file" | ||
253 | +[{ | ||
254 | + # Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
255 | + # are listed without --file. Let's play safe and only enable the eval | ||
256 | + # if we detect the quoting. | ||
257 | + case $CONFIG_FILES in | ||
258 | + *\'*) eval set x "$CONFIG_FILES" ;; | ||
259 | + *) set x $CONFIG_FILES ;; | ||
260 | + esac | ||
261 | + shift | ||
262 | + for mf | ||
263 | + do | ||
264 | + # Strip MF so we end up with the name of the file. | ||
265 | + mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
266 | + # Check whether this is an Automake generated Makefile or not. | ||
267 | + # We used to match only the files named `Makefile.in', but | ||
268 | + # some people rename them; so instead we look at the file content. | ||
269 | + # Grep'ing the first line is not enough: some people post-process | ||
270 | + # each Makefile.in and add a new line on top of each file to say so. | ||
271 | + # Grep'ing the whole file is not good either: AIX grep has a line | ||
272 | + # limit of 2048, but all sed's we know have understand at least 4000. | ||
273 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
274 | + dirpart=`AS_DIRNAME("$mf")` | ||
275 | + else | ||
276 | + continue | ||
277 | + fi | ||
278 | + # Extract the definition of DEPDIR, am__include, and am__quote | ||
279 | + # from the Makefile without running `make'. | ||
280 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
281 | + test -z "$DEPDIR" && continue | ||
282 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
283 | + test -z "am__include" && continue | ||
284 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
285 | + # When using ansi2knr, U may be empty or an underscore; expand it | ||
286 | + U=`sed -n 's/^U = //p' < "$mf"` | ||
287 | + # Find all dependency output files, they are included files with | ||
288 | + # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
289 | + # simplest approach to changing $(DEPDIR) to its actual value in the | ||
290 | + # expansion. | ||
291 | + for file in `sed -n " | ||
292 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
293 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
294 | + # Make sure the directory exists. | ||
295 | + test -f "$dirpart/$file" && continue | ||
296 | + fdir=`AS_DIRNAME(["$file"])` | ||
297 | + AS_MKDIR_P([$dirpart/$fdir]) | ||
298 | + # echo "creating $dirpart/$file" | ||
299 | + echo '# dummy' > "$dirpart/$file" | ||
300 | + done | ||
301 | done | ||
302 | -done | ||
303 | +} | ||
304 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
305 | |||
306 | |||
307 | @@ -394,13 +421,13 @@ | ||
308 | # Do all the work for Automake. -*- Autoconf -*- | ||
309 | |||
310 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | ||
311 | -# 2005, 2006, 2008 Free Software Foundation, Inc. | ||
312 | +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. | ||
313 | # | ||
314 | # This file is free software; the Free Software Foundation | ||
315 | # gives unlimited permission to copy and/or distribute it, | ||
316 | # with or without modifications, as long as this notice is preserved. | ||
317 | |||
318 | -# serial 13 | ||
319 | +# serial 16 | ||
320 | |||
321 | # This macro actually does too much. Some checks are only needed if | ||
322 | # your package does certain things. But this isn't really a big deal. | ||
323 | @@ -417,7 +444,7 @@ | ||
324 | # arguments mandatory, and then we can depend on a new Autoconf | ||
325 | # release and drop the old call support. | ||
326 | AC_DEFUN([AM_INIT_AUTOMAKE], | ||
327 | -[AC_PREREQ([2.60])dnl | ||
328 | +[AC_PREREQ([2.62])dnl | ||
329 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | ||
330 | dnl the ones we care about. | ||
331 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | ||
332 | @@ -468,8 +495,8 @@ | ||
333 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) | ||
334 | AM_MISSING_PROG(AUTOHEADER, autoheader) | ||
335 | AM_MISSING_PROG(MAKEINFO, makeinfo) | ||
336 | -AM_PROG_INSTALL_SH | ||
337 | -AM_PROG_INSTALL_STRIP | ||
338 | +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | ||
339 | +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | ||
340 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl | ||
341 | # We need awk for the "check" target. The system "awk" is bad on | ||
342 | # some platforms. | ||
343 | @@ -477,24 +504,37 @@ | ||
344 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | ||
345 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl | ||
346 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], | ||
347 | - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | ||
348 | - [_AM_PROG_TAR([v7])])]) | ||
349 | + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | ||
350 | + [_AM_PROG_TAR([v7])])]) | ||
351 | _AM_IF_OPTION([no-dependencies],, | ||
352 | [AC_PROVIDE_IFELSE([AC_PROG_CC], | ||
353 | - [_AM_DEPENDENCIES(CC)], | ||
354 | - [define([AC_PROG_CC], | ||
355 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl | ||
356 | + [_AM_DEPENDENCIES(CC)], | ||
357 | + [define([AC_PROG_CC], | ||
358 | + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl | ||
359 | AC_PROVIDE_IFELSE([AC_PROG_CXX], | ||
360 | - [_AM_DEPENDENCIES(CXX)], | ||
361 | - [define([AC_PROG_CXX], | ||
362 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | ||
363 | + [_AM_DEPENDENCIES(CXX)], | ||
364 | + [define([AC_PROG_CXX], | ||
365 | + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | ||
366 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], | ||
367 | - [_AM_DEPENDENCIES(OBJC)], | ||
368 | - [define([AC_PROG_OBJC], | ||
369 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | ||
370 | + [_AM_DEPENDENCIES(OBJC)], | ||
371 | + [define([AC_PROG_OBJC], | ||
372 | + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | ||
373 | ]) | ||
374 | +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl | ||
375 | +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the | ||
376 | +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | ||
377 | +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. | ||
378 | +AC_CONFIG_COMMANDS_PRE(dnl | ||
379 | +[m4_provide_if([_AM_COMPILER_EXEEXT], | ||
380 | + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | ||
381 | ]) | ||
382 | |||
383 | +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | ||
384 | +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | ||
385 | +dnl mangled by Autoconf and run in a shell conditional statement. | ||
386 | +m4_define([_AC_COMPILER_EXEEXT], | ||
387 | +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | ||
388 | + | ||
389 | |||
390 | # When config.status generates a header, we must update the stamp-h file. | ||
391 | # This file resides in the same directory as the config header | ||
392 | @@ -517,7 +557,7 @@ | ||
393 | done | ||
394 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | ||
395 | |||
396 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | ||
397 | +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. | ||
398 | # | ||
399 | # This file is free software; the Free Software Foundation | ||
400 | # gives unlimited permission to copy and/or distribute it, | ||
401 | @@ -528,7 +568,14 @@ | ||
402 | # Define $install_sh. | ||
403 | AC_DEFUN([AM_PROG_INSTALL_SH], | ||
404 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
405 | -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} | ||
406 | +if test x"${install_sh}" != xset; then | ||
407 | + case $am_aux_dir in | ||
408 | + *\ * | *\ *) | ||
409 | + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | ||
410 | + *) | ||
411 | + install_sh="\${SHELL} $am_aux_dir/install-sh" | ||
412 | + esac | ||
413 | +fi | ||
414 | AC_SUBST(install_sh)]) | ||
415 | |||
416 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. | ||
417 | @@ -555,27 +602,38 @@ | ||
418 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | ||
419 | # From Jim Meyering | ||
420 | |||
421 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 | ||
422 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | ||
423 | # Free Software Foundation, Inc. | ||
424 | # | ||
425 | # This file is free software; the Free Software Foundation | ||
426 | # gives unlimited permission to copy and/or distribute it, | ||
427 | # with or without modifications, as long as this notice is preserved. | ||
428 | |||
429 | -# serial 4 | ||
430 | +# serial 5 | ||
431 | |||
432 | +# AM_MAINTAINER_MODE([DEFAULT-MODE]) | ||
433 | +# ---------------------------------- | ||
434 | +# Control maintainer-specific portions of Makefiles. | ||
435 | +# Default is to disable them, unless `enable' is passed literally. | ||
436 | +# For symmetry, `disable' may be passed as well. Anyway, the user | ||
437 | +# can override the default with the --enable/--disable switch. | ||
438 | AC_DEFUN([AM_MAINTAINER_MODE], | ||
439 | -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
440 | - dnl maintainer-mode is disabled by default | ||
441 | - AC_ARG_ENABLE(maintainer-mode, | ||
442 | -[ --enable-maintainer-mode enable make rules and dependencies not useful | ||
443 | +[m4_case(m4_default([$1], [disable]), | ||
444 | + [enable], [m4_define([am_maintainer_other], [disable])], | ||
445 | + [disable], [m4_define([am_maintainer_other], [enable])], | ||
446 | + [m4_define([am_maintainer_other], [enable]) | ||
447 | + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) | ||
448 | +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) | ||
449 | + dnl maintainer-mode's default is 'disable' unless 'enable' is passed | ||
450 | + AC_ARG_ENABLE([maintainer-mode], | ||
451 | +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful | ||
452 | (and sometimes confusing) to the casual installer], | ||
453 | - USE_MAINTAINER_MODE=$enableval, | ||
454 | - USE_MAINTAINER_MODE=no) | ||
455 | + [USE_MAINTAINER_MODE=$enableval], | ||
456 | + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | ||
457 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | ||
458 | - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) | ||
459 | + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) | ||
460 | MAINT=$MAINTAINER_MODE_TRUE | ||
461 | - AC_SUBST(MAINT)dnl | ||
462 | + AC_SUBST([MAINT])dnl | ||
463 | ] | ||
464 | ) | ||
465 | |||
466 | @@ -583,13 +641,13 @@ | ||
467 | |||
468 | # Check to see how 'make' treats includes. -*- Autoconf -*- | ||
469 | |||
470 | -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. | ||
471 | +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. | ||
472 | # | ||
473 | # This file is free software; the Free Software Foundation | ||
474 | # gives unlimited permission to copy and/or distribute it, | ||
475 | # with or without modifications, as long as this notice is preserved. | ||
476 | |||
477 | -# serial 3 | ||
478 | +# serial 4 | ||
479 | |||
480 | # AM_MAKE_INCLUDE() | ||
481 | # ----------------- | ||
482 | @@ -598,7 +656,7 @@ | ||
483 | [am_make=${MAKE-make} | ||
484 | cat > confinc << 'END' | ||
485 | am__doit: | ||
486 | - @echo done | ||
487 | + @echo this is the am__doit target | ||
488 | .PHONY: am__doit | ||
489 | END | ||
490 | # If we don't find an include directive, just comment out the code. | ||
491 | @@ -608,24 +666,24 @@ | ||
492 | _am_result=none | ||
493 | # First try GNU make style include. | ||
494 | echo "include confinc" > confmf | ||
495 | -# We grep out `Entering directory' and `Leaving directory' | ||
496 | -# messages which can occur if `w' ends up in MAKEFLAGS. | ||
497 | -# In particular we don't look at `^make:' because GNU make might | ||
498 | -# be invoked under some other name (usually "gmake"), in which | ||
499 | -# case it prints its new name instead of `make'. | ||
500 | -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then | ||
501 | - am__include=include | ||
502 | - am__quote= | ||
503 | - _am_result=GNU | ||
504 | -fi | ||
505 | +# Ignore all kinds of additional output from `make'. | ||
506 | +case `$am_make -s -f confmf 2> /dev/null` in #( | ||
507 | +*the\ am__doit\ target*) | ||
508 | + am__include=include | ||
509 | + am__quote= | ||
510 | + _am_result=GNU | ||
511 | + ;; | ||
512 | +esac | ||
513 | # Now try BSD make style include. | ||
514 | if test "$am__include" = "#"; then | ||
515 | echo '.include "confinc"' > confmf | ||
516 | - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then | ||
517 | - am__include=.include | ||
518 | - am__quote="\"" | ||
519 | - _am_result=BSD | ||
520 | - fi | ||
521 | + case `$am_make -s -f confmf 2> /dev/null` in #( | ||
522 | + *the\ am__doit\ target*) | ||
523 | + am__include=.include | ||
524 | + am__quote="\"" | ||
525 | + _am_result=BSD | ||
526 | + ;; | ||
527 | + esac | ||
528 | fi | ||
529 | AC_SUBST([am__include]) | ||
530 | AC_SUBST([am__quote]) | ||
531 | @@ -635,14 +693,14 @@ | ||
532 | |||
533 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | ||
534 | |||
535 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 | ||
536 | +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 | ||
537 | # Free Software Foundation, Inc. | ||
538 | # | ||
539 | # This file is free software; the Free Software Foundation | ||
540 | # gives unlimited permission to copy and/or distribute it, | ||
541 | # with or without modifications, as long as this notice is preserved. | ||
542 | |||
543 | -# serial 5 | ||
544 | +# serial 6 | ||
545 | |||
546 | # AM_MISSING_PROG(NAME, PROGRAM) | ||
547 | # ------------------------------ | ||
548 | @@ -659,7 +717,14 @@ | ||
549 | AC_DEFUN([AM_MISSING_HAS_RUN], | ||
550 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
551 | AC_REQUIRE_AUX_FILE([missing])dnl | ||
552 | -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" | ||
553 | +if test x"${MISSING+set}" != xset; then | ||
554 | + case $am_aux_dir in | ||
555 | + *\ * | *\ *) | ||
556 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
557 | + *) | ||
558 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
559 | + esac | ||
560 | +fi | ||
561 | # Use eval to expand $SHELL | ||
562 | if eval "$MISSING --run true"; then | ||
563 | am_missing_run="$MISSING --run " | ||
564 | @@ -730,14 +795,14 @@ | ||
565 | |||
566 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | ||
567 | |||
568 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 | ||
569 | +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 | ||
570 | # Free Software Foundation, Inc. | ||
571 | # | ||
572 | # This file is free software; the Free Software Foundation | ||
573 | # gives unlimited permission to copy and/or distribute it, | ||
574 | # with or without modifications, as long as this notice is preserved. | ||
575 | |||
576 | -# serial 4 | ||
577 | +# serial 5 | ||
578 | |||
579 | # AM_SANITY_CHECK | ||
580 | # --------------- | ||
581 | @@ -746,16 +811,29 @@ | ||
582 | # Just in case | ||
583 | sleep 1 | ||
584 | echo timestamp > conftest.file | ||
585 | +# Reject unsafe characters in $srcdir or the absolute working directory | ||
586 | +# name. Accept space and tab only in the latter. | ||
587 | +am_lf=' | ||
588 | +' | ||
589 | +case `pwd` in | ||
590 | + *[[\\\"\#\$\&\'\`$am_lf]]*) | ||
591 | + AC_MSG_ERROR([unsafe absolute working directory name]);; | ||
592 | +esac | ||
593 | +case $srcdir in | ||
594 | + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) | ||
595 | + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; | ||
596 | +esac | ||
597 | + | ||
598 | # Do `set' in a subshell so we don't clobber the current shell's | ||
599 | # arguments. Must try -L first in case configure is actually a | ||
600 | # symlink; some systems play weird games with the mod time of symlinks | ||
601 | # (eg FreeBSD returns the mod time of the symlink's containing | ||
602 | # directory). | ||
603 | if ( | ||
604 | - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` | ||
605 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | ||
606 | if test "$[*]" = "X"; then | ||
607 | # -L didn't work. | ||
608 | - set X `ls -t $srcdir/configure conftest.file` | ||
609 | + set X `ls -t "$srcdir/configure" conftest.file` | ||
610 | fi | ||
611 | rm -f conftest.file | ||
612 | if test "$[*]" != "X $srcdir/configure conftest.file" \ | ||
613 | @@ -808,18 +886,25 @@ | ||
614 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
615 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
616 | |||
617 | -# Copyright (C) 2006 Free Software Foundation, Inc. | ||
618 | +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. | ||
619 | # | ||
620 | # This file is free software; the Free Software Foundation | ||
621 | # gives unlimited permission to copy and/or distribute it, | ||
622 | # with or without modifications, as long as this notice is preserved. | ||
623 | |||
624 | +# serial 2 | ||
625 | + | ||
626 | # _AM_SUBST_NOTMAKE(VARIABLE) | ||
627 | # --------------------------- | ||
628 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | ||
629 | # This macro is traced by Automake. | ||
630 | AC_DEFUN([_AM_SUBST_NOTMAKE]) | ||
631 | |||
632 | +# AM_SUBST_NOTMAKE(VARIABLE) | ||
633 | +# --------------------------- | ||
634 | +# Public sister of _AM_SUBST_NOTMAKE. | ||
635 | +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
636 | + | ||
637 | # Check how to create a tarball. -*- Autoconf -*- | ||
638 | |||
639 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. | ||
640 | diff -Nurd fftw-3.2.2/api/Makefile.in fftw-3.2.2-arm-beta1/api/Makefile.in | ||
641 | --- fftw-3.2.2/api/Makefile.in 2009-07-12 12:36:46.000000000 +0200 | ||
642 | +++ fftw-3.2.2-arm-beta1/api/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
643 | @@ -1,8 +1,9 @@ | ||
644 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
645 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
646 | # @configure_input@ | ||
647 | |||
648 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
649 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
650 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
651 | +# Inc. | ||
652 | # This Makefile.in is free software; the Free Software Foundation | ||
653 | # gives unlimited permission to copy and/or distribute it, | ||
654 | # with or without modifications, as long as this notice is preserved. | ||
655 | @@ -17,8 +18,9 @@ | ||
656 | |||
657 | VPATH = @srcdir@ | ||
658 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
659 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
660 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
661 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
662 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
663 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
664 | install_sh_DATA = $(install_sh) -c -m 644 | ||
665 | install_sh_PROGRAM = $(install_sh) -c | ||
666 | @@ -55,6 +57,7 @@ | ||
667 | mkinstalldirs = $(install_sh) -d | ||
668 | CONFIG_HEADER = $(top_builddir)/config.h | ||
669 | CONFIG_CLEAN_FILES = | ||
670 | +CONFIG_CLEAN_VPATH_FILES = | ||
671 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
672 | libapi_la_LIBADD = | ||
673 | am_libapi_la_OBJECTS = apiplan.lo configure.lo execute-dft-c2r.lo \ | ||
674 | @@ -84,6 +87,7 @@ | ||
675 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
676 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
677 | am__depfiles_maybe = depfiles | ||
678 | +am__mv = mv -f | ||
679 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
680 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
681 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
682 | @@ -100,9 +104,23 @@ | ||
683 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
684 | *) f=$$p;; \ | ||
685 | esac; | ||
686 | -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
687 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
688 | +am__install_max = 40 | ||
689 | +am__nobase_strip_setup = \ | ||
690 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
691 | +am__nobase_strip = \ | ||
692 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
693 | +am__nobase_list = $(am__nobase_strip_setup); \ | ||
694 | + for p in $$list; do echo "$$p $$p"; done | \ | ||
695 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
696 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
697 | + if (++n[$$2] == $(am__install_max)) \ | ||
698 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
699 | + END { for (dir in files) print dir, files[dir] }' | ||
700 | +am__base_list = \ | ||
701 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
702 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
703 | am__installdirs = "$(DESTDIR)$(includedir)" | ||
704 | -includeHEADERS_INSTALL = $(INSTALL_HEADER) | ||
705 | HEADERS = $(include_HEADERS) | ||
706 | ETAGS = etags | ||
707 | CTAGS = ctags | ||
708 | @@ -177,6 +195,7 @@ | ||
709 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
710 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
711 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
712 | +PACKAGE_URL = @PACKAGE_URL@ | ||
713 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
714 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
715 | POW_LIB = @POW_LIB@ | ||
716 | @@ -298,9 +317,9 @@ | ||
717 | exit 1;; \ | ||
718 | esac; \ | ||
719 | done; \ | ||
720 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu api/Makefile'; \ | ||
721 | - cd $(top_srcdir) && \ | ||
722 | - $(AUTOMAKE) --gnu api/Makefile | ||
723 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu api/Makefile'; \ | ||
724 | + $(am__cd) $(top_srcdir) && \ | ||
725 | + $(AUTOMAKE) --gnu api/Makefile | ||
726 | .PRECIOUS: Makefile | ||
727 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
728 | @case '$?' in \ | ||
729 | @@ -318,6 +337,7 @@ | ||
730 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
731 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
732 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
733 | +$(am__aclocal_m4_deps): | ||
734 | |||
735 | clean-noinstLTLIBRARIES: | ||
736 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
737 | @@ -404,21 +424,21 @@ | ||
738 | |||
739 | .c.o: | ||
740 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
741 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
742 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
743 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
744 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
745 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
746 | |||
747 | .c.obj: | ||
748 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
749 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
750 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
751 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
752 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
753 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
754 | |||
755 | .c.lo: | ||
756 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
757 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
758 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
759 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
760 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
761 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
762 | @@ -431,20 +451,23 @@ | ||
763 | install-includeHEADERS: $(include_HEADERS) | ||
764 | @$(NORMAL_INSTALL) | ||
765 | test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" | ||
766 | - @list='$(include_HEADERS)'; for p in $$list; do \ | ||
767 | + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ | ||
768 | + for p in $$list; do \ | ||
769 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
770 | - f=$(am__strip_dir) \ | ||
771 | - echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ | ||
772 | - $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ | ||
773 | + echo "$$d$$p"; \ | ||
774 | + done | $(am__base_list) | \ | ||
775 | + while read files; do \ | ||
776 | + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ | ||
777 | + $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ | ||
778 | done | ||
779 | |||
780 | uninstall-includeHEADERS: | ||
781 | @$(NORMAL_UNINSTALL) | ||
782 | - @list='$(include_HEADERS)'; for p in $$list; do \ | ||
783 | - f=$(am__strip_dir) \ | ||
784 | - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ | ||
785 | - rm -f "$(DESTDIR)$(includedir)/$$f"; \ | ||
786 | - done | ||
787 | + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ | ||
788 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
789 | + test -n "$$files" || exit 0; \ | ||
790 | + echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ | ||
791 | + cd "$(DESTDIR)$(includedir)" && rm -f $$files | ||
792 | |||
793 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
794 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
795 | @@ -458,7 +481,7 @@ | ||
796 | |||
797 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
798 | $(TAGS_FILES) $(LISP) | ||
799 | - tags=; \ | ||
800 | + set x; \ | ||
801 | here=`pwd`; \ | ||
802 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
803 | unique=`for i in $$list; do \ | ||
804 | @@ -466,29 +489,34 @@ | ||
805 | done | \ | ||
806 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
807 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
808 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
809 | + shift; \ | ||
810 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
811 | test -n "$$unique" || unique=$$empty_fix; \ | ||
812 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
813 | - $$tags $$unique; \ | ||
814 | + if test $$# -gt 0; then \ | ||
815 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
816 | + "$$@" $$unique; \ | ||
817 | + else \ | ||
818 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
819 | + $$unique; \ | ||
820 | + fi; \ | ||
821 | fi | ||
822 | ctags: CTAGS | ||
823 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
824 | $(TAGS_FILES) $(LISP) | ||
825 | - tags=; \ | ||
826 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
827 | unique=`for i in $$list; do \ | ||
828 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
829 | done | \ | ||
830 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
831 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
832 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
833 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
834 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
835 | - $$tags $$unique | ||
836 | + $$unique | ||
837 | |||
838 | GTAGS: | ||
839 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
840 | - && cd $(top_srcdir) \ | ||
841 | - && gtags -i $(GTAGS_ARGS) $$here | ||
842 | + && $(am__cd) $(top_srcdir) \ | ||
843 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
844 | |||
845 | distclean-tags: | ||
846 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
847 | @@ -509,13 +537,17 @@ | ||
848 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
849 | if test -d $$d/$$file; then \ | ||
850 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
851 | + if test -d "$(distdir)/$$file"; then \ | ||
852 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
853 | + fi; \ | ||
854 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
855 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
856 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
857 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
858 | fi; \ | ||
859 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
860 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
861 | else \ | ||
862 | - test -f $(distdir)/$$file \ | ||
863 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
864 | + test -f "$(distdir)/$$file" \ | ||
865 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
866 | || exit 1; \ | ||
867 | fi; \ | ||
868 | done | ||
869 | @@ -548,6 +580,7 @@ | ||
870 | |||
871 | distclean-generic: | ||
872 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
873 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
874 | |||
875 | maintainer-clean-generic: | ||
876 | @echo "This command is intended for maintainers to use" | ||
877 | @@ -570,6 +603,8 @@ | ||
878 | |||
879 | html: html-am | ||
880 | |||
881 | +html-am: | ||
882 | + | ||
883 | info: info-am | ||
884 | |||
885 | info-am: | ||
886 | @@ -578,18 +613,28 @@ | ||
887 | |||
888 | install-dvi: install-dvi-am | ||
889 | |||
890 | +install-dvi-am: | ||
891 | + | ||
892 | install-exec-am: | ||
893 | |||
894 | install-html: install-html-am | ||
895 | |||
896 | +install-html-am: | ||
897 | + | ||
898 | install-info: install-info-am | ||
899 | |||
900 | +install-info-am: | ||
901 | + | ||
902 | install-man: | ||
903 | |||
904 | install-pdf: install-pdf-am | ||
905 | |||
906 | +install-pdf-am: | ||
907 | + | ||
908 | install-ps: install-ps-am | ||
909 | |||
910 | +install-ps-am: | ||
911 | + | ||
912 | installcheck-am: | ||
913 | |||
914 | maintainer-clean: maintainer-clean-am | ||
915 | @@ -612,7 +657,7 @@ | ||
916 | |||
917 | uninstall-am: uninstall-includeHEADERS | ||
918 | |||
919 | -.MAKE: install-am install-strip | ||
920 | +.MAKE: all check install install-am install-strip | ||
921 | |||
922 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
923 | clean-libtool clean-noinstLTLIBRARIES ctags distclean \ | ||
924 | @@ -635,6 +680,7 @@ | ||
925 | @MAINTAINER_MODE_TRUE@ perl -pe 's/([A-Z0-9_]+)=([0-9]+)/\n INTEGER \1\n PARAMETER (\1=\2)\n/g' $< |egrep 'PARAMETER|INTEGER' > $@ | ||
926 | @MAINTAINER_MODE_TRUE@ perl -pe 's/#define +([A-Z0-9_]+) +\(([+-]?[0-9]+)U?\)/\n INTEGER \1\n PARAMETER (\1=\2)\n/g' $< |egrep 'PARAMETER|INTEGER' >> $@ | ||
927 | @MAINTAINER_MODE_TRUE@ perl -pe 'if (/#define +([A-Z0-9_]+) +\(([0-9]+)U? *<< *([0-9]+)\)/) { print "\n INTEGER $$1\n PARAMETER ($$1=",$$2 << $$3,")\n"; }' $< |egrep 'PARAMETER|INTEGER' >> $@ | ||
928 | + | ||
929 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
930 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
931 | .NOEXPORT: | ||
932 | diff -Nurd fftw-3.2.2/api/version.c fftw-3.2.2-arm-beta1/api/version.c | ||
933 | --- fftw-3.2.2/api/version.c 2009-07-12 12:35:49.000000000 +0200 | ||
934 | +++ fftw-3.2.2-arm-beta1/api/version.c 2011-03-26 20:20:11.000000000 +0100 | ||
935 | @@ -42,4 +42,7 @@ | ||
936 | "-altivec" | ||
937 | #endif | ||
938 | |||
939 | +#if HAVE_NEON | ||
940 | + "-neon" | ||
941 | +#endif | ||
942 | ; | ||
943 | diff -Nurd fftw-3.2.2/cell/Makefile.in fftw-3.2.2-arm-beta1/cell/Makefile.in | ||
944 | --- fftw-3.2.2/cell/Makefile.in 2009-07-12 12:36:46.000000000 +0200 | ||
945 | +++ fftw-3.2.2-arm-beta1/cell/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
946 | @@ -1,8 +1,9 @@ | ||
947 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
948 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
949 | # @configure_input@ | ||
950 | |||
951 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
952 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
953 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
954 | +# Inc. | ||
955 | # This Makefile.in is free software; the Free Software Foundation | ||
956 | # gives unlimited permission to copy and/or distribute it, | ||
957 | # with or without modifications, as long as this notice is preserved. | ||
958 | @@ -16,8 +17,9 @@ | ||
959 | |||
960 | VPATH = @srcdir@ | ||
961 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
962 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
963 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
964 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
965 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
966 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
967 | install_sh_DATA = $(install_sh) -c -m 644 | ||
968 | install_sh_PROGRAM = $(install_sh) -c | ||
969 | @@ -53,6 +55,7 @@ | ||
970 | mkinstalldirs = $(install_sh) -d | ||
971 | CONFIG_HEADER = $(top_builddir)/config.h | ||
972 | CONFIG_CLEAN_FILES = | ||
973 | +CONFIG_CLEAN_VPATH_FILES = | ||
974 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
975 | libcell_la_DEPENDENCIES = $(SPU_STUB) | ||
976 | am__libcell_la_SOURCES_DIST = cell.c conf.c copy.c dft-direct-cell.c \ | ||
977 | @@ -65,6 +68,7 @@ | ||
978 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
979 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
980 | am__depfiles_maybe = depfiles | ||
981 | +am__mv = mv -f | ||
982 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
983 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
984 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
985 | @@ -85,10 +89,38 @@ | ||
986 | ps-recursive uninstall-recursive | ||
987 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
988 | distclean-recursive maintainer-clean-recursive | ||
989 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
990 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
991 | + distdir | ||
992 | ETAGS = etags | ||
993 | CTAGS = ctags | ||
994 | DIST_SUBDIRS = spu | ||
995 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
996 | +am__relativize = \ | ||
997 | + dir0=`pwd`; \ | ||
998 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
999 | + sed_rest='s,^[^/]*/*,,'; \ | ||
1000 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
1001 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
1002 | + while test -n "$$dir1"; do \ | ||
1003 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
1004 | + if test "$$first" != "."; then \ | ||
1005 | + if test "$$first" = ".."; then \ | ||
1006 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
1007 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
1008 | + else \ | ||
1009 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
1010 | + if test "$$first2" = "$$first"; then \ | ||
1011 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
1012 | + else \ | ||
1013 | + dir2="../$$dir2"; \ | ||
1014 | + fi; \ | ||
1015 | + dir0="$$dir0"/"$$first"; \ | ||
1016 | + fi; \ | ||
1017 | + fi; \ | ||
1018 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
1019 | + done; \ | ||
1020 | + reldir="$$dir2" | ||
1021 | ACLOCAL = @ACLOCAL@ | ||
1022 | ALLOCA = @ALLOCA@ | ||
1023 | AMTAR = @AMTAR@ | ||
1024 | @@ -159,6 +191,7 @@ | ||
1025 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
1026 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
1027 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
1028 | +PACKAGE_URL = @PACKAGE_URL@ | ||
1029 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
1030 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
1031 | POW_LIB = @POW_LIB@ | ||
1032 | @@ -260,9 +293,9 @@ | ||
1033 | exit 1;; \ | ||
1034 | esac; \ | ||
1035 | done; \ | ||
1036 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cell/Makefile'; \ | ||
1037 | - cd $(top_srcdir) && \ | ||
1038 | - $(AUTOMAKE) --gnu cell/Makefile | ||
1039 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cell/Makefile'; \ | ||
1040 | + $(am__cd) $(top_srcdir) && \ | ||
1041 | + $(AUTOMAKE) --gnu cell/Makefile | ||
1042 | .PRECIOUS: Makefile | ||
1043 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
1044 | @case '$?' in \ | ||
1045 | @@ -280,6 +313,7 @@ | ||
1046 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
1047 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
1048 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
1049 | +$(am__aclocal_m4_deps): | ||
1050 | |||
1051 | clean-noinstLTLIBRARIES: | ||
1052 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
1053 | @@ -308,21 +342,21 @@ | ||
1054 | |||
1055 | .c.o: | ||
1056 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
1057 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
1058 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
1059 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
1060 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1061 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
1062 | |||
1063 | .c.obj: | ||
1064 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
1065 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
1066 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
1067 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
1068 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1069 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
1070 | |||
1071 | .c.lo: | ||
1072 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
1073 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
1074 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
1075 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
1076 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1077 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
1078 | @@ -340,7 +374,7 @@ | ||
1079 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
1080 | # (2) otherwise, pass the desired values on the `make' command line. | ||
1081 | $(RECURSIVE_TARGETS): | ||
1082 | - @failcom='exit 1'; \ | ||
1083 | + @fail= failcom='exit 1'; \ | ||
1084 | for f in x $$MAKEFLAGS; do \ | ||
1085 | case $$f in \ | ||
1086 | *=* | --[!k]*);; \ | ||
1087 | @@ -357,7 +391,7 @@ | ||
1088 | else \ | ||
1089 | local_target="$$target"; \ | ||
1090 | fi; \ | ||
1091 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
1092 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
1093 | || eval $$failcom; \ | ||
1094 | done; \ | ||
1095 | if test "$$dot_seen" = "no"; then \ | ||
1096 | @@ -365,7 +399,7 @@ | ||
1097 | fi; test -z "$$fail" | ||
1098 | |||
1099 | $(RECURSIVE_CLEAN_TARGETS): | ||
1100 | - @failcom='exit 1'; \ | ||
1101 | + @fail= failcom='exit 1'; \ | ||
1102 | for f in x $$MAKEFLAGS; do \ | ||
1103 | case $$f in \ | ||
1104 | *=* | --[!k]*);; \ | ||
1105 | @@ -391,16 +425,16 @@ | ||
1106 | else \ | ||
1107 | local_target="$$target"; \ | ||
1108 | fi; \ | ||
1109 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
1110 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
1111 | || eval $$failcom; \ | ||
1112 | done && test -z "$$fail" | ||
1113 | tags-recursive: | ||
1114 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
1115 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
1116 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
1117 | done | ||
1118 | ctags-recursive: | ||
1119 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
1120 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
1121 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
1122 | done | ||
1123 | |||
1124 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
1125 | @@ -415,7 +449,7 @@ | ||
1126 | |||
1127 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
1128 | $(TAGS_FILES) $(LISP) | ||
1129 | - tags=; \ | ||
1130 | + set x; \ | ||
1131 | here=`pwd`; \ | ||
1132 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
1133 | include_option=--etags-include; \ | ||
1134 | @@ -427,7 +461,7 @@ | ||
1135 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
1136 | if test "$$subdir" = .; then :; else \ | ||
1137 | test ! -f $$subdir/TAGS || \ | ||
1138 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
1139 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
1140 | fi; \ | ||
1141 | done; \ | ||
1142 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
1143 | @@ -436,29 +470,34 @@ | ||
1144 | done | \ | ||
1145 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
1146 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
1147 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
1148 | + shift; \ | ||
1149 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
1150 | test -n "$$unique" || unique=$$empty_fix; \ | ||
1151 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
1152 | - $$tags $$unique; \ | ||
1153 | + if test $$# -gt 0; then \ | ||
1154 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
1155 | + "$$@" $$unique; \ | ||
1156 | + else \ | ||
1157 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
1158 | + $$unique; \ | ||
1159 | + fi; \ | ||
1160 | fi | ||
1161 | ctags: CTAGS | ||
1162 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
1163 | $(TAGS_FILES) $(LISP) | ||
1164 | - tags=; \ | ||
1165 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
1166 | unique=`for i in $$list; do \ | ||
1167 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
1168 | done | \ | ||
1169 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
1170 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
1171 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
1172 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
1173 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
1174 | - $$tags $$unique | ||
1175 | + $$unique | ||
1176 | |||
1177 | GTAGS: | ||
1178 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
1179 | - && cd $(top_srcdir) \ | ||
1180 | - && gtags -i $(GTAGS_ARGS) $$here | ||
1181 | + && $(am__cd) $(top_srcdir) \ | ||
1182 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
1183 | |||
1184 | distclean-tags: | ||
1185 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
1186 | @@ -479,29 +518,44 @@ | ||
1187 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
1188 | if test -d $$d/$$file; then \ | ||
1189 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
1190 | + if test -d "$(distdir)/$$file"; then \ | ||
1191 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
1192 | + fi; \ | ||
1193 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
1194 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
1195 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
1196 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
1197 | fi; \ | ||
1198 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
1199 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
1200 | else \ | ||
1201 | - test -f $(distdir)/$$file \ | ||
1202 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
1203 | + test -f "$(distdir)/$$file" \ | ||
1204 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
1205 | || exit 1; \ | ||
1206 | fi; \ | ||
1207 | done | ||
1208 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
1209 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
1210 | if test "$$subdir" = .; then :; else \ | ||
1211 | test -d "$(distdir)/$$subdir" \ | ||
1212 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
1213 | || exit 1; \ | ||
1214 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
1215 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
1216 | - (cd $$subdir && \ | ||
1217 | + fi; \ | ||
1218 | + done | ||
1219 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
1220 | + if test "$$subdir" = .; then :; else \ | ||
1221 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
1222 | + $(am__relativize); \ | ||
1223 | + new_distdir=$$reldir; \ | ||
1224 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
1225 | + $(am__relativize); \ | ||
1226 | + new_top_distdir=$$reldir; \ | ||
1227 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
1228 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
1229 | + ($(am__cd) $$subdir && \ | ||
1230 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
1231 | - top_distdir="$$top_distdir" \ | ||
1232 | - distdir="$$distdir/$$subdir" \ | ||
1233 | + top_distdir="$$new_top_distdir" \ | ||
1234 | + distdir="$$new_distdir" \ | ||
1235 | am__remove_distdir=: \ | ||
1236 | am__skip_length_check=: \ | ||
1237 | + am__skip_mode_fix=: \ | ||
1238 | distdir) \ | ||
1239 | || exit 1; \ | ||
1240 | fi; \ | ||
1241 | @@ -531,6 +585,7 @@ | ||
1242 | |||
1243 | distclean-generic: | ||
1244 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
1245 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
1246 | |||
1247 | maintainer-clean-generic: | ||
1248 | @echo "This command is intended for maintainers to use" | ||
1249 | @@ -552,6 +607,8 @@ | ||
1250 | |||
1251 | html: html-recursive | ||
1252 | |||
1253 | +html-am: | ||
1254 | + | ||
1255 | info: info-recursive | ||
1256 | |||
1257 | info-am: | ||
1258 | @@ -560,18 +617,28 @@ | ||
1259 | |||
1260 | install-dvi: install-dvi-recursive | ||
1261 | |||
1262 | +install-dvi-am: | ||
1263 | + | ||
1264 | install-exec-am: | ||
1265 | |||
1266 | install-html: install-html-recursive | ||
1267 | |||
1268 | +install-html-am: | ||
1269 | + | ||
1270 | install-info: install-info-recursive | ||
1271 | |||
1272 | +install-info-am: | ||
1273 | + | ||
1274 | install-man: | ||
1275 | |||
1276 | install-pdf: install-pdf-recursive | ||
1277 | |||
1278 | +install-pdf-am: | ||
1279 | + | ||
1280 | install-ps: install-ps-recursive | ||
1281 | |||
1282 | +install-ps-am: | ||
1283 | + | ||
1284 | installcheck-am: | ||
1285 | |||
1286 | maintainer-clean: maintainer-clean-recursive | ||
1287 | @@ -594,8 +661,8 @@ | ||
1288 | |||
1289 | uninstall-am: | ||
1290 | |||
1291 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
1292 | - install-strip | ||
1293 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
1294 | + install-am install-strip tags-recursive | ||
1295 | |||
1296 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
1297 | all all-am check check-am clean clean-generic clean-libtool \ | ||
1298 | @@ -615,6 +682,7 @@ | ||
1299 | |||
1300 | spufftw-embed.lo: spufftw-embed.S spu/spufftw | ||
1301 | $(LTCOMPILE) -c -x assembler-with-cpp -o $@ $< | ||
1302 | + | ||
1303 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
1304 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
1305 | .NOEXPORT: | ||
1306 | diff -Nurd fftw-3.2.2/cell/spu/Makefile.in fftw-3.2.2-arm-beta1/cell/spu/Makefile.in | ||
1307 | --- fftw-3.2.2/cell/spu/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
1308 | +++ fftw-3.2.2-arm-beta1/cell/spu/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
1309 | @@ -1,8 +1,9 @@ | ||
1310 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
1311 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
1312 | # @configure_input@ | ||
1313 | |||
1314 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
1315 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
1316 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
1317 | +# Inc. | ||
1318 | # This Makefile.in is free software; the Free Software Foundation | ||
1319 | # gives unlimited permission to copy and/or distribute it, | ||
1320 | # with or without modifications, as long as this notice is preserved. | ||
1321 | @@ -20,8 +21,9 @@ | ||
1322 | |||
1323 | VPATH = @srcdir@ | ||
1324 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
1325 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
1326 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
1327 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
1328 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
1329 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
1330 | install_sh_DATA = $(install_sh) -c -m 644 | ||
1331 | install_sh_PROGRAM = $(install_sh) -c | ||
1332 | @@ -59,6 +61,7 @@ | ||
1333 | mkinstalldirs = $(install_sh) -d | ||
1334 | CONFIG_HEADER = $(top_builddir)/config.h | ||
1335 | CONFIG_CLEAN_FILES = | ||
1336 | +CONFIG_CLEAN_VPATH_FILES = | ||
1337 | PROGRAMS = $(noinst_PROGRAMS) | ||
1338 | am__planner_SOURCES_DIST = planner.spuc execute.spuc spu_n2fv_2.spuc \ | ||
1339 | spu_n2fv_4.spuc spu_n2fv_6.spuc spu_n2fv_8.spuc \ | ||
1340 | @@ -191,6 +194,7 @@ | ||
1341 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
1342 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
1343 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
1344 | +PACKAGE_URL = @PACKAGE_URL@ | ||
1345 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
1346 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
1347 | POW_LIB = @POW_LIB@ | ||
1348 | @@ -349,9 +353,9 @@ | ||
1349 | exit 1;; \ | ||
1350 | esac; \ | ||
1351 | done; \ | ||
1352 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cell/spu/Makefile'; \ | ||
1353 | - cd $(top_srcdir) && \ | ||
1354 | - $(AUTOMAKE) --gnu cell/spu/Makefile | ||
1355 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cell/spu/Makefile'; \ | ||
1356 | + $(am__cd) $(top_srcdir) && \ | ||
1357 | + $(AUTOMAKE) --gnu cell/spu/Makefile | ||
1358 | .PRECIOUS: Makefile | ||
1359 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
1360 | @case '$?' in \ | ||
1361 | @@ -369,13 +373,16 @@ | ||
1362 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
1363 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
1364 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
1365 | +$(am__aclocal_m4_deps): | ||
1366 | |||
1367 | clean-noinstPROGRAMS: | ||
1368 | - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ | ||
1369 | - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ | ||
1370 | - echo " rm -f $$p $$f"; \ | ||
1371 | - rm -f $$p $$f ; \ | ||
1372 | - done | ||
1373 | + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
1374 | + echo " rm -f" $$list; \ | ||
1375 | + rm -f $$list || exit $$?; \ | ||
1376 | + test -n "$(EXEEXT)" || exit 0; \ | ||
1377 | + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
1378 | + echo " rm -f" $$list; \ | ||
1379 | + rm -f $$list | ||
1380 | planner$(EXEEXT): $(planner_OBJECTS) $(planner_DEPENDENCIES) | ||
1381 | @rm -f planner$(EXEEXT) | ||
1382 | $(planner_LINK) $(planner_OBJECTS) $(planner_LDADD) $(LIBS) | ||
1383 | @@ -407,7 +414,7 @@ | ||
1384 | |||
1385 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
1386 | $(TAGS_FILES) $(LISP) | ||
1387 | - tags=; \ | ||
1388 | + set x; \ | ||
1389 | here=`pwd`; \ | ||
1390 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
1391 | unique=`for i in $$list; do \ | ||
1392 | @@ -415,29 +422,34 @@ | ||
1393 | done | \ | ||
1394 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
1395 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
1396 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
1397 | + shift; \ | ||
1398 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
1399 | test -n "$$unique" || unique=$$empty_fix; \ | ||
1400 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
1401 | - $$tags $$unique; \ | ||
1402 | + if test $$# -gt 0; then \ | ||
1403 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
1404 | + "$$@" $$unique; \ | ||
1405 | + else \ | ||
1406 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
1407 | + $$unique; \ | ||
1408 | + fi; \ | ||
1409 | fi | ||
1410 | ctags: CTAGS | ||
1411 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
1412 | $(TAGS_FILES) $(LISP) | ||
1413 | - tags=; \ | ||
1414 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
1415 | unique=`for i in $$list; do \ | ||
1416 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
1417 | done | \ | ||
1418 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
1419 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
1420 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
1421 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
1422 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
1423 | - $$tags $$unique | ||
1424 | + $$unique | ||
1425 | |||
1426 | GTAGS: | ||
1427 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
1428 | - && cd $(top_srcdir) \ | ||
1429 | - && gtags -i $(GTAGS_ARGS) $$here | ||
1430 | + && $(am__cd) $(top_srcdir) \ | ||
1431 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
1432 | |||
1433 | distclean-tags: | ||
1434 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
1435 | @@ -458,13 +470,17 @@ | ||
1436 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
1437 | if test -d $$d/$$file; then \ | ||
1438 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
1439 | + if test -d "$(distdir)/$$file"; then \ | ||
1440 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
1441 | + fi; \ | ||
1442 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
1443 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
1444 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
1445 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
1446 | fi; \ | ||
1447 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
1448 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
1449 | else \ | ||
1450 | - test -f $(distdir)/$$file \ | ||
1451 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
1452 | + test -f "$(distdir)/$$file" \ | ||
1453 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
1454 | || exit 1; \ | ||
1455 | fi; \ | ||
1456 | done | ||
1457 | @@ -494,6 +510,7 @@ | ||
1458 | |||
1459 | distclean-generic: | ||
1460 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
1461 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
1462 | |||
1463 | maintainer-clean-generic: | ||
1464 | @echo "This command is intended for maintainers to use" | ||
1465 | @@ -515,6 +532,8 @@ | ||
1466 | |||
1467 | html: html-am | ||
1468 | |||
1469 | +html-am: | ||
1470 | + | ||
1471 | info: info-am | ||
1472 | |||
1473 | info-am: | ||
1474 | @@ -523,18 +542,28 @@ | ||
1475 | |||
1476 | install-dvi: install-dvi-am | ||
1477 | |||
1478 | +install-dvi-am: | ||
1479 | + | ||
1480 | install-exec-am: | ||
1481 | |||
1482 | install-html: install-html-am | ||
1483 | |||
1484 | +install-html-am: | ||
1485 | + | ||
1486 | install-info: install-info-am | ||
1487 | |||
1488 | +install-info-am: | ||
1489 | + | ||
1490 | install-man: | ||
1491 | |||
1492 | install-pdf: install-pdf-am | ||
1493 | |||
1494 | +install-pdf-am: | ||
1495 | + | ||
1496 | install-ps: install-ps-am | ||
1497 | |||
1498 | +install-ps-am: | ||
1499 | + | ||
1500 | installcheck-am: | ||
1501 | |||
1502 | maintainer-clean: maintainer-clean-am | ||
1503 | @@ -557,7 +586,7 @@ | ||
1504 | |||
1505 | uninstall-am: | ||
1506 | |||
1507 | -.MAKE: install-am install-strip | ||
1508 | +.MAKE: all check install install-am install-strip | ||
1509 | |||
1510 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
1511 | clean-libtool clean-noinstPROGRAMS ctags distclean \ | ||
1512 | @@ -624,6 +653,7 @@ | ||
1513 | |||
1514 | @MAINTAINER_MODE_TRUE@spu_t1fv_%.spuc: $(CODELET_DEPS) $(GEN_TWIDDLE_C) | ||
1515 | @MAINTAINER_MODE_TRUE@ ($(PRELUDE_COMMANDS); $(GEN_TWIDDLE_C) $(FLAGS_T) -n $* -name "X(spu_t1fv_$*)") | $(ADD_DATE) | $(INDENT) >$@ | ||
1516 | + | ||
1517 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
1518 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
1519 | .NOEXPORT: | ||
1520 | diff -Nurd fftw-3.2.2/config.h.in fftw-3.2.2-arm-beta1/config.h.in | ||
1521 | --- fftw-3.2.2/config.h.in 2009-07-12 12:36:46.000000000 +0200 | ||
1522 | +++ fftw-3.2.2-arm-beta1/config.h.in 2011-03-26 22:34:04.000000000 +0100 | ||
1523 | @@ -74,6 +74,12 @@ | ||
1524 | /* Define to 1 if you have the <altivec.h> header file. */ | ||
1525 | #undef HAVE_ALTIVEC_H | ||
1526 | |||
1527 | +/* Define to enable use of the ARM v7a cycle counter. */ | ||
1528 | +#undef HAVE_ARM_CYCLE_COUNTER | ||
1529 | + | ||
1530 | +/* Define to 1 if you have the <arm_neon.h> header file. */ | ||
1531 | +#undef HAVE_ARM_NEON_H | ||
1532 | + | ||
1533 | /* Define to 1 if you have the `BSDgettimeofday' function. */ | ||
1534 | #undef HAVE_BSDGETTIMEOFDAY | ||
1535 | |||
1536 | @@ -154,6 +160,9 @@ | ||
1537 | /* Define to 1 if you have the <limits.h> header file. */ | ||
1538 | #undef HAVE_LIMITS_H | ||
1539 | |||
1540 | +/* Define to 1 if you have the <linux/perf_event.h> header file. */ | ||
1541 | +#undef HAVE_LINUX_PERF_EVENT_H | ||
1542 | + | ||
1543 | /* Define to 1 if the compiler supports `long double' */ | ||
1544 | #undef HAVE_LONG_DOUBLE | ||
1545 | |||
1546 | @@ -184,9 +193,15 @@ | ||
1547 | /* Define if you have the MPI library. */ | ||
1548 | #undef HAVE_MPI | ||
1549 | |||
1550 | +/* Define to enable NEON optimizations. */ | ||
1551 | +#undef HAVE_NEON | ||
1552 | + | ||
1553 | /* Define to enable OpenMP */ | ||
1554 | #undef HAVE_OPENMP | ||
1555 | |||
1556 | +/* Define to enable use of the Linux perf events system for cycle counting. */ | ||
1557 | +#undef HAVE_PERF_EVENTS | ||
1558 | + | ||
1559 | /* Define to 1 if you have the `posix_memalign' function. */ | ||
1560 | #undef HAVE_POSIX_MEMALIGN | ||
1561 | |||
1562 | @@ -232,6 +247,9 @@ | ||
1563 | /* Define to 1 if you have the <sys/stat.h> header file. */ | ||
1564 | #undef HAVE_SYS_STAT_H | ||
1565 | |||
1566 | +/* Define to 1 if you have the <sys/syscall.h> header file. */ | ||
1567 | +#undef HAVE_SYS_SYSCALL_H | ||
1568 | + | ||
1569 | /* Define to 1 if you have the <sys/sysctl.h> header file. */ | ||
1570 | #undef HAVE_SYS_SYSCTL_H | ||
1571 | |||
1572 | @@ -290,6 +308,9 @@ | ||
1573 | /* Define to the one symbol short name of this package. */ | ||
1574 | #undef PACKAGE_TARNAME | ||
1575 | |||
1576 | +/* Define to the home page for this package. */ | ||
1577 | +#undef PACKAGE_URL | ||
1578 | + | ||
1579 | /* Define to the version of this package. */ | ||
1580 | #undef PACKAGE_VERSION | ||
1581 | |||
1582 | @@ -367,6 +388,18 @@ | ||
1583 | /* Use low-precision timers, making planner very slow */ | ||
1584 | #undef WITH_SLOW_TIMER | ||
1585 | |||
1586 | +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most | ||
1587 | + significant byte first (like Motorola and SPARC, unlike Intel). */ | ||
1588 | +#if defined AC_APPLE_UNIVERSAL_BUILD | ||
1589 | +# if defined __BIG_ENDIAN__ | ||
1590 | +# define WORDS_BIGENDIAN 1 | ||
1591 | +# endif | ||
1592 | +#else | ||
1593 | +# ifndef WORDS_BIGENDIAN | ||
1594 | +# undef WORDS_BIGENDIAN | ||
1595 | +# endif | ||
1596 | +#endif | ||
1597 | + | ||
1598 | /* Define to empty if `const' does not conform to ANSI C. */ | ||
1599 | #undef const | ||
1600 | |||
1601 | diff -Nurd fftw-3.2.2/configure fftw-3.2.2-arm-beta1/configure | ||
1602 | --- fftw-3.2.2/configure 2009-07-12 12:36:42.000000000 +0200 | ||
1603 | +++ fftw-3.2.2-arm-beta1/configure 2011-03-26 22:34:04.000000000 +0100 | ||
1604 | @@ -1,20 +1,24 @@ | ||
1605 | #! /bin/sh | ||
1606 | # Guess values for system-dependent variables and create Makefiles. | ||
1607 | -# Generated by GNU Autoconf 2.63 for fftw 3.2.2. | ||
1608 | +# Generated by GNU Autoconf 2.67 for fftw 3.2.2. | ||
1609 | # | ||
1610 | # Report bugs to <fftw@fftw.org>. | ||
1611 | # | ||
1612 | +# | ||
1613 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | ||
1614 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
1615 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software | ||
1616 | +# Foundation, Inc. | ||
1617 | +# | ||
1618 | +# | ||
1619 | # This configure script is free software; the Free Software Foundation | ||
1620 | # gives unlimited permission to copy, distribute and modify it. | ||
1621 | -## --------------------- ## | ||
1622 | -## M4sh Initialization. ## | ||
1623 | -## --------------------- ## | ||
1624 | +## -------------------- ## | ||
1625 | +## M4sh Initialization. ## | ||
1626 | +## -------------------- ## | ||
1627 | |||
1628 | # Be more Bourne compatible | ||
1629 | DUALCASE=1; export DUALCASE # for MKS sh | ||
1630 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
1631 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : | ||
1632 | emulate sh | ||
1633 | NULLCMD=: | ||
1634 | # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | ||
1635 | @@ -22,23 +26,15 @@ | ||
1636 | alias -g '${1+"$@"}'='"$@"' | ||
1637 | setopt NO_GLOB_SUBST | ||
1638 | else | ||
1639 | - case `(set -o) 2>/dev/null` in | ||
1640 | - *posix*) set -o posix ;; | ||
1641 | + case `(set -o) 2>/dev/null` in #( | ||
1642 | + *posix*) : | ||
1643 | + set -o posix ;; #( | ||
1644 | + *) : | ||
1645 | + ;; | ||
1646 | esac | ||
1647 | - | ||
1648 | fi | ||
1649 | |||
1650 | |||
1651 | - | ||
1652 | - | ||
1653 | -# PATH needs CR | ||
1654 | -# Avoid depending upon Character Ranges. | ||
1655 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
1656 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
1657 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
1658 | -as_cr_digits='0123456789' | ||
1659 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
1660 | - | ||
1661 | as_nl=' | ||
1662 | ' | ||
1663 | export as_nl | ||
1664 | @@ -46,7 +42,13 @@ | ||
1665 | as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | ||
1666 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo | ||
1667 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo | ||
1668 | -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
1669 | +# Prefer a ksh shell builtin over an external printf program on Solaris, | ||
1670 | +# but without wasting forks for bash or zsh. | ||
1671 | +if test -z "$BASH_VERSION$ZSH_VERSION" \ | ||
1672 | + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
1673 | + as_echo='print -r --' | ||
1674 | + as_echo_n='print -rn --' | ||
1675 | +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
1676 | as_echo='printf %s\n' | ||
1677 | as_echo_n='printf %s' | ||
1678 | else | ||
1679 | @@ -57,7 +59,7 @@ | ||
1680 | as_echo_body='eval expr "X$1" : "X\\(.*\\)"' | ||
1681 | as_echo_n_body='eval | ||
1682 | arg=$1; | ||
1683 | - case $arg in | ||
1684 | + case $arg in #( | ||
1685 | *"$as_nl"*) | ||
1686 | expr "X$arg" : "X\\(.*\\)$as_nl"; | ||
1687 | arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; | ||
1688 | @@ -80,13 +82,6 @@ | ||
1689 | } | ||
1690 | fi | ||
1691 | |||
1692 | -# Support unset when possible. | ||
1693 | -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
1694 | - as_unset=unset | ||
1695 | -else | ||
1696 | - as_unset=false | ||
1697 | -fi | ||
1698 | - | ||
1699 | |||
1700 | # IFS | ||
1701 | # We need space, tab and new line, in precisely that order. Quoting is | ||
1702 | @@ -96,15 +91,15 @@ | ||
1703 | IFS=" "" $as_nl" | ||
1704 | |||
1705 | # Find who we are. Look in the path if we contain no directory separator. | ||
1706 | -case $0 in | ||
1707 | +case $0 in #(( | ||
1708 | *[\\/]* ) as_myself=$0 ;; | ||
1709 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1710 | for as_dir in $PATH | ||
1711 | do | ||
1712 | IFS=$as_save_IFS | ||
1713 | test -z "$as_dir" && as_dir=. | ||
1714 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
1715 | -done | ||
1716 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
1717 | + done | ||
1718 | IFS=$as_save_IFS | ||
1719 | |||
1720 | ;; | ||
1721 | @@ -116,12 +111,16 @@ | ||
1722 | fi | ||
1723 | if test ! -f "$as_myself"; then | ||
1724 | $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
1725 | - { (exit 1); exit 1; } | ||
1726 | + exit 1 | ||
1727 | fi | ||
1728 | |||
1729 | -# Work around bugs in pre-3.0 UWIN ksh. | ||
1730 | -for as_var in ENV MAIL MAILPATH | ||
1731 | -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
1732 | +# Unset variables that we do not need and which cause bugs (e.g. in | ||
1733 | +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" | ||
1734 | +# suppresses any "Segmentation fault" message there. '((' could | ||
1735 | +# trigger a bug in pdksh 5.2.14. | ||
1736 | +for as_var in BASH_ENV ENV MAIL MAILPATH | ||
1737 | +do eval test x\${$as_var+set} = xset \ | ||
1738 | + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : | ||
1739 | done | ||
1740 | PS1='$ ' | ||
1741 | PS2='> ' | ||
1742 | @@ -133,330 +132,300 @@ | ||
1743 | LANGUAGE=C | ||
1744 | export LANGUAGE | ||
1745 | |||
1746 | -# Required to use basename. | ||
1747 | -if expr a : '\(a\)' >/dev/null 2>&1 && | ||
1748 | - test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
1749 | - as_expr=expr | ||
1750 | -else | ||
1751 | - as_expr=false | ||
1752 | -fi | ||
1753 | - | ||
1754 | -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | ||
1755 | - as_basename=basename | ||
1756 | -else | ||
1757 | - as_basename=false | ||
1758 | -fi | ||
1759 | - | ||
1760 | - | ||
1761 | -# Name of the executable. | ||
1762 | -as_me=`$as_basename -- "$0" || | ||
1763 | -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
1764 | - X"$0" : 'X\(//\)$' \| \ | ||
1765 | - X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
1766 | -$as_echo X/"$0" | | ||
1767 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
1768 | - s//\1/ | ||
1769 | - q | ||
1770 | - } | ||
1771 | - /^X\/\(\/\/\)$/{ | ||
1772 | - s//\1/ | ||
1773 | - q | ||
1774 | - } | ||
1775 | - /^X\/\(\/\).*/{ | ||
1776 | - s//\1/ | ||
1777 | - q | ||
1778 | - } | ||
1779 | - s/.*/./; q'` | ||
1780 | - | ||
1781 | # CDPATH. | ||
1782 | -$as_unset CDPATH | ||
1783 | - | ||
1784 | +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
1785 | |||
1786 | if test "x$CONFIG_SHELL" = x; then | ||
1787 | - if (eval ":") 2>/dev/null; then | ||
1788 | - as_have_required=yes | ||
1789 | + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : | ||
1790 | + emulate sh | ||
1791 | + NULLCMD=: | ||
1792 | + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which | ||
1793 | + # is contrary to our usage. Disable this feature. | ||
1794 | + alias -g '\${1+\"\$@\"}'='\"\$@\"' | ||
1795 | + setopt NO_GLOB_SUBST | ||
1796 | else | ||
1797 | - as_have_required=no | ||
1798 | + case \`(set -o) 2>/dev/null\` in #( | ||
1799 | + *posix*) : | ||
1800 | + set -o posix ;; #( | ||
1801 | + *) : | ||
1802 | + ;; | ||
1803 | +esac | ||
1804 | fi | ||
1805 | - | ||
1806 | - if test $as_have_required = yes && (eval ": | ||
1807 | -(as_func_return () { | ||
1808 | - (exit \$1) | ||
1809 | -} | ||
1810 | -as_func_success () { | ||
1811 | - as_func_return 0 | ||
1812 | -} | ||
1813 | -as_func_failure () { | ||
1814 | - as_func_return 1 | ||
1815 | -} | ||
1816 | -as_func_ret_success () { | ||
1817 | - return 0 | ||
1818 | -} | ||
1819 | -as_func_ret_failure () { | ||
1820 | - return 1 | ||
1821 | -} | ||
1822 | +" | ||
1823 | + as_required="as_fn_return () { (exit \$1); } | ||
1824 | +as_fn_success () { as_fn_return 0; } | ||
1825 | +as_fn_failure () { as_fn_return 1; } | ||
1826 | +as_fn_ret_success () { return 0; } | ||
1827 | +as_fn_ret_failure () { return 1; } | ||
1828 | |||
1829 | exitcode=0 | ||
1830 | -if as_func_success; then | ||
1831 | - : | ||
1832 | -else | ||
1833 | - exitcode=1 | ||
1834 | - echo as_func_success failed. | ||
1835 | -fi | ||
1836 | - | ||
1837 | -if as_func_failure; then | ||
1838 | - exitcode=1 | ||
1839 | - echo as_func_failure succeeded. | ||
1840 | -fi | ||
1841 | +as_fn_success || { exitcode=1; echo as_fn_success failed.; } | ||
1842 | +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } | ||
1843 | +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } | ||
1844 | +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } | ||
1845 | +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : | ||
1846 | |||
1847 | -if as_func_ret_success; then | ||
1848 | - : | ||
1849 | else | ||
1850 | - exitcode=1 | ||
1851 | - echo as_func_ret_success failed. | ||
1852 | -fi | ||
1853 | - | ||
1854 | -if as_func_ret_failure; then | ||
1855 | - exitcode=1 | ||
1856 | - echo as_func_ret_failure succeeded. | ||
1857 | + exitcode=1; echo positional parameters were not saved. | ||
1858 | fi | ||
1859 | - | ||
1860 | -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
1861 | - : | ||
1862 | +test x\$exitcode = x0 || exit 1" | ||
1863 | + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO | ||
1864 | + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO | ||
1865 | + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && | ||
1866 | + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 | ||
1867 | +test \$(( 1 + 1 )) = 2 || exit 1" | ||
1868 | + if (eval "$as_required") 2>/dev/null; then : | ||
1869 | + as_have_required=yes | ||
1870 | else | ||
1871 | - exitcode=1 | ||
1872 | - echo positional parameters were not saved. | ||
1873 | + as_have_required=no | ||
1874 | fi | ||
1875 | + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : | ||
1876 | |||
1877 | -test \$exitcode = 0) || { (exit 1); exit 1; } | ||
1878 | - | ||
1879 | -( | ||
1880 | - as_lineno_1=\$LINENO | ||
1881 | - as_lineno_2=\$LINENO | ||
1882 | - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && | ||
1883 | - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } | ||
1884 | -") 2> /dev/null; then | ||
1885 | - : | ||
1886 | else | ||
1887 | - as_candidate_shells= | ||
1888 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1889 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1890 | +as_found=false | ||
1891 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
1892 | do | ||
1893 | IFS=$as_save_IFS | ||
1894 | test -z "$as_dir" && as_dir=. | ||
1895 | - case $as_dir in | ||
1896 | + as_found=: | ||
1897 | + case $as_dir in #( | ||
1898 | /*) | ||
1899 | for as_base in sh bash ksh sh5; do | ||
1900 | - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" | ||
1901 | + # Try only shells that exist, to save several forks. | ||
1902 | + as_shell=$as_dir/$as_base | ||
1903 | + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | ||
1904 | + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : | ||
1905 | + CONFIG_SHELL=$as_shell as_have_required=yes | ||
1906 | + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : | ||
1907 | + break 2 | ||
1908 | +fi | ||
1909 | +fi | ||
1910 | done;; | ||
1911 | esac | ||
1912 | + as_found=false | ||
1913 | done | ||
1914 | +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && | ||
1915 | + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : | ||
1916 | + CONFIG_SHELL=$SHELL as_have_required=yes | ||
1917 | +fi; } | ||
1918 | IFS=$as_save_IFS | ||
1919 | |||
1920 | |||
1921 | - for as_shell in $as_candidate_shells $SHELL; do | ||
1922 | - # Try only shells that exist, to save several forks. | ||
1923 | - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | ||
1924 | - { ("$as_shell") 2> /dev/null <<\_ASEOF | ||
1925 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
1926 | - emulate sh | ||
1927 | - NULLCMD=: | ||
1928 | - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | ||
1929 | - # is contrary to our usage. Disable this feature. | ||
1930 | - alias -g '${1+"$@"}'='"$@"' | ||
1931 | - setopt NO_GLOB_SUBST | ||
1932 | -else | ||
1933 | - case `(set -o) 2>/dev/null` in | ||
1934 | - *posix*) set -o posix ;; | ||
1935 | -esac | ||
1936 | - | ||
1937 | -fi | ||
1938 | - | ||
1939 | - | ||
1940 | -: | ||
1941 | -_ASEOF | ||
1942 | -}; then | ||
1943 | - CONFIG_SHELL=$as_shell | ||
1944 | - as_have_required=yes | ||
1945 | - if { "$as_shell" 2> /dev/null <<\_ASEOF | ||
1946 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
1947 | - emulate sh | ||
1948 | - NULLCMD=: | ||
1949 | - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | ||
1950 | - # is contrary to our usage. Disable this feature. | ||
1951 | - alias -g '${1+"$@"}'='"$@"' | ||
1952 | - setopt NO_GLOB_SUBST | ||
1953 | -else | ||
1954 | - case `(set -o) 2>/dev/null` in | ||
1955 | - *posix*) set -o posix ;; | ||
1956 | -esac | ||
1957 | - | ||
1958 | -fi | ||
1959 | - | ||
1960 | - | ||
1961 | -: | ||
1962 | -(as_func_return () { | ||
1963 | - (exit $1) | ||
1964 | -} | ||
1965 | -as_func_success () { | ||
1966 | - as_func_return 0 | ||
1967 | -} | ||
1968 | -as_func_failure () { | ||
1969 | - as_func_return 1 | ||
1970 | -} | ||
1971 | -as_func_ret_success () { | ||
1972 | - return 0 | ||
1973 | -} | ||
1974 | -as_func_ret_failure () { | ||
1975 | - return 1 | ||
1976 | -} | ||
1977 | - | ||
1978 | -exitcode=0 | ||
1979 | -if as_func_success; then | ||
1980 | - : | ||
1981 | -else | ||
1982 | - exitcode=1 | ||
1983 | - echo as_func_success failed. | ||
1984 | -fi | ||
1985 | - | ||
1986 | -if as_func_failure; then | ||
1987 | - exitcode=1 | ||
1988 | - echo as_func_failure succeeded. | ||
1989 | -fi | ||
1990 | - | ||
1991 | -if as_func_ret_success; then | ||
1992 | - : | ||
1993 | -else | ||
1994 | - exitcode=1 | ||
1995 | - echo as_func_ret_success failed. | ||
1996 | -fi | ||
1997 | - | ||
1998 | -if as_func_ret_failure; then | ||
1999 | - exitcode=1 | ||
2000 | - echo as_func_ret_failure succeeded. | ||
2001 | + if test "x$CONFIG_SHELL" != x; then : | ||
2002 | + # We cannot yet assume a decent shell, so we have to provide a | ||
2003 | + # neutralization value for shells without unset; and this also | ||
2004 | + # works around shells that cannot unset nonexistent variables. | ||
2005 | + BASH_ENV=/dev/null | ||
2006 | + ENV=/dev/null | ||
2007 | + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | ||
2008 | + export CONFIG_SHELL | ||
2009 | + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | ||
2010 | fi | ||
2011 | |||
2012 | -if ( set x; as_func_ret_success y && test x = "$1" ); then | ||
2013 | - : | ||
2014 | -else | ||
2015 | - exitcode=1 | ||
2016 | - echo positional parameters were not saved. | ||
2017 | + if test x$as_have_required = xno; then : | ||
2018 | + $as_echo "$0: This script requires a shell more modern than all" | ||
2019 | + $as_echo "$0: the shells that I found on your system." | ||
2020 | + if test x${ZSH_VERSION+set} = xset ; then | ||
2021 | + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" | ||
2022 | + $as_echo "$0: be upgraded to zsh 4.3.4 or later." | ||
2023 | + else | ||
2024 | + $as_echo "$0: Please tell bug-autoconf@gnu.org and fftw@fftw.org | ||
2025 | +$0: about your system, including any error possibly output | ||
2026 | +$0: before this message. Then install a modern shell, or | ||
2027 | +$0: manually run the script under such a shell if you do | ||
2028 | +$0: have one." | ||
2029 | + fi | ||
2030 | + exit 1 | ||
2031 | fi | ||
2032 | - | ||
2033 | -test $exitcode = 0) || { (exit 1); exit 1; } | ||
2034 | - | ||
2035 | -( | ||
2036 | - as_lineno_1=$LINENO | ||
2037 | - as_lineno_2=$LINENO | ||
2038 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
2039 | - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } | ||
2040 | - | ||
2041 | -_ASEOF | ||
2042 | -}; then | ||
2043 | - break | ||
2044 | fi | ||
2045 | - | ||
2046 | fi | ||
2047 | +SHELL=${CONFIG_SHELL-/bin/sh} | ||
2048 | +export SHELL | ||
2049 | +# Unset more variables known to interfere with behavior of common tools. | ||
2050 | +CLICOLOR_FORCE= GREP_OPTIONS= | ||
2051 | +unset CLICOLOR_FORCE GREP_OPTIONS | ||
2052 | |||
2053 | - done | ||
2054 | +## --------------------- ## | ||
2055 | +## M4sh Shell Functions. ## | ||
2056 | +## --------------------- ## | ||
2057 | +# as_fn_unset VAR | ||
2058 | +# --------------- | ||
2059 | +# Portably unset VAR. | ||
2060 | +as_fn_unset () | ||
2061 | +{ | ||
2062 | + { eval $1=; unset $1;} | ||
2063 | +} | ||
2064 | +as_unset=as_fn_unset | ||
2065 | |||
2066 | - if test "x$CONFIG_SHELL" != x; then | ||
2067 | - for as_var in BASH_ENV ENV | ||
2068 | - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
2069 | - done | ||
2070 | - export CONFIG_SHELL | ||
2071 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | ||
2072 | -fi | ||
2073 | +# as_fn_set_status STATUS | ||
2074 | +# ----------------------- | ||
2075 | +# Set $? to STATUS, without forking. | ||
2076 | +as_fn_set_status () | ||
2077 | +{ | ||
2078 | + return $1 | ||
2079 | +} # as_fn_set_status | ||
2080 | |||
2081 | +# as_fn_exit STATUS | ||
2082 | +# ----------------- | ||
2083 | +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. | ||
2084 | +as_fn_exit () | ||
2085 | +{ | ||
2086 | + set +e | ||
2087 | + as_fn_set_status $1 | ||
2088 | + exit $1 | ||
2089 | +} # as_fn_exit | ||
2090 | |||
2091 | - if test $as_have_required = no; then | ||
2092 | - echo This script requires a shell more modern than all the | ||
2093 | - echo shells that I found on your system. Please install a | ||
2094 | - echo modern shell, or manually run the script under such a | ||
2095 | - echo shell if you do have one. | ||
2096 | - { (exit 1); exit 1; } | ||
2097 | -fi | ||
2098 | +# as_fn_mkdir_p | ||
2099 | +# ------------- | ||
2100 | +# Create "$as_dir" as a directory, including parents if necessary. | ||
2101 | +as_fn_mkdir_p () | ||
2102 | +{ | ||
2103 | |||
2104 | + case $as_dir in #( | ||
2105 | + -*) as_dir=./$as_dir;; | ||
2106 | + esac | ||
2107 | + test -d "$as_dir" || eval $as_mkdir_p || { | ||
2108 | + as_dirs= | ||
2109 | + while :; do | ||
2110 | + case $as_dir in #( | ||
2111 | + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | ||
2112 | + *) as_qdir=$as_dir;; | ||
2113 | + esac | ||
2114 | + as_dirs="'$as_qdir' $as_dirs" | ||
2115 | + as_dir=`$as_dirname -- "$as_dir" || | ||
2116 | +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
2117 | + X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
2118 | + X"$as_dir" : 'X\(//\)$' \| \ | ||
2119 | + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
2120 | +$as_echo X"$as_dir" | | ||
2121 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
2122 | + s//\1/ | ||
2123 | + q | ||
2124 | + } | ||
2125 | + /^X\(\/\/\)[^/].*/{ | ||
2126 | + s//\1/ | ||
2127 | + q | ||
2128 | + } | ||
2129 | + /^X\(\/\/\)$/{ | ||
2130 | + s//\1/ | ||
2131 | + q | ||
2132 | + } | ||
2133 | + /^X\(\/\).*/{ | ||
2134 | + s//\1/ | ||
2135 | + q | ||
2136 | + } | ||
2137 | + s/.*/./; q'` | ||
2138 | + test -d "$as_dir" && break | ||
2139 | + done | ||
2140 | + test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
2141 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" | ||
2142 | |||
2143 | -fi | ||
2144 | |||
2145 | -fi | ||
2146 | +} # as_fn_mkdir_p | ||
2147 | +# as_fn_append VAR VALUE | ||
2148 | +# ---------------------- | ||
2149 | +# Append the text in VALUE to the end of the definition contained in VAR. Take | ||
2150 | +# advantage of any shell optimizations that allow amortized linear growth over | ||
2151 | +# repeated appends, instead of the typical quadratic growth present in naive | ||
2152 | +# implementations. | ||
2153 | +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : | ||
2154 | + eval 'as_fn_append () | ||
2155 | + { | ||
2156 | + eval $1+=\$2 | ||
2157 | + }' | ||
2158 | +else | ||
2159 | + as_fn_append () | ||
2160 | + { | ||
2161 | + eval $1=\$$1\$2 | ||
2162 | + } | ||
2163 | +fi # as_fn_append | ||
2164 | |||
2165 | +# as_fn_arith ARG... | ||
2166 | +# ------------------ | ||
2167 | +# Perform arithmetic evaluation on the ARGs, and store the result in the | ||
2168 | +# global $as_val. Take advantage of shells that can avoid forks. The arguments | ||
2169 | +# must be portable across $(()) and expr. | ||
2170 | +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : | ||
2171 | + eval 'as_fn_arith () | ||
2172 | + { | ||
2173 | + as_val=$(( $* )) | ||
2174 | + }' | ||
2175 | +else | ||
2176 | + as_fn_arith () | ||
2177 | + { | ||
2178 | + as_val=`expr "$@" || test $? -eq 1` | ||
2179 | + } | ||
2180 | +fi # as_fn_arith | ||
2181 | |||
2182 | |||
2183 | -(eval "as_func_return () { | ||
2184 | - (exit \$1) | ||
2185 | -} | ||
2186 | -as_func_success () { | ||
2187 | - as_func_return 0 | ||
2188 | -} | ||
2189 | -as_func_failure () { | ||
2190 | - as_func_return 1 | ||
2191 | -} | ||
2192 | -as_func_ret_success () { | ||
2193 | - return 0 | ||
2194 | -} | ||
2195 | -as_func_ret_failure () { | ||
2196 | - return 1 | ||
2197 | -} | ||
2198 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] | ||
2199 | +# ---------------------------------------- | ||
2200 | +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are | ||
2201 | +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the | ||
2202 | +# script with STATUS, using 1 if that was 0. | ||
2203 | +as_fn_error () | ||
2204 | +{ | ||
2205 | + as_status=$1; test $as_status -eq 0 && as_status=1 | ||
2206 | + if test "$4"; then | ||
2207 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2208 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 | ||
2209 | + fi | ||
2210 | + $as_echo "$as_me: error: $2" >&2 | ||
2211 | + as_fn_exit $as_status | ||
2212 | +} # as_fn_error | ||
2213 | |||
2214 | -exitcode=0 | ||
2215 | -if as_func_success; then | ||
2216 | - : | ||
2217 | +if expr a : '\(a\)' >/dev/null 2>&1 && | ||
2218 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
2219 | + as_expr=expr | ||
2220 | else | ||
2221 | - exitcode=1 | ||
2222 | - echo as_func_success failed. | ||
2223 | -fi | ||
2224 | - | ||
2225 | -if as_func_failure; then | ||
2226 | - exitcode=1 | ||
2227 | - echo as_func_failure succeeded. | ||
2228 | + as_expr=false | ||
2229 | fi | ||
2230 | |||
2231 | -if as_func_ret_success; then | ||
2232 | - : | ||
2233 | +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | ||
2234 | + as_basename=basename | ||
2235 | else | ||
2236 | - exitcode=1 | ||
2237 | - echo as_func_ret_success failed. | ||
2238 | -fi | ||
2239 | - | ||
2240 | -if as_func_ret_failure; then | ||
2241 | - exitcode=1 | ||
2242 | - echo as_func_ret_failure succeeded. | ||
2243 | + as_basename=false | ||
2244 | fi | ||
2245 | |||
2246 | -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
2247 | - : | ||
2248 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
2249 | + as_dirname=dirname | ||
2250 | else | ||
2251 | - exitcode=1 | ||
2252 | - echo positional parameters were not saved. | ||
2253 | + as_dirname=false | ||
2254 | fi | ||
2255 | |||
2256 | -test \$exitcode = 0") || { | ||
2257 | - echo No shell found that supports shell functions. | ||
2258 | - echo Please tell bug-autoconf@gnu.org about your system, | ||
2259 | - echo including any error possibly output before this message. | ||
2260 | - echo This can help us improve future autoconf versions. | ||
2261 | - echo Configuration will now proceed without shell functions. | ||
2262 | -} | ||
2263 | - | ||
2264 | +as_me=`$as_basename -- "$0" || | ||
2265 | +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
2266 | + X"$0" : 'X\(//\)$' \| \ | ||
2267 | + X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
2268 | +$as_echo X/"$0" | | ||
2269 | + sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
2270 | + s//\1/ | ||
2271 | + q | ||
2272 | + } | ||
2273 | + /^X\/\(\/\/\)$/{ | ||
2274 | + s//\1/ | ||
2275 | + q | ||
2276 | + } | ||
2277 | + /^X\/\(\/\).*/{ | ||
2278 | + s//\1/ | ||
2279 | + q | ||
2280 | + } | ||
2281 | + s/.*/./; q'` | ||
2282 | |||
2283 | +# Avoid depending upon Character Ranges. | ||
2284 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
2285 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
2286 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
2287 | +as_cr_digits='0123456789' | ||
2288 | +as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
2289 | |||
2290 | - as_lineno_1=$LINENO | ||
2291 | - as_lineno_2=$LINENO | ||
2292 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
2293 | - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | ||
2294 | |||
2295 | - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
2296 | - # uniformly replaced by the line number. The first 'sed' inserts a | ||
2297 | - # line-number line after each line using $LINENO; the second 'sed' | ||
2298 | - # does the real work. The second script uses 'N' to pair each | ||
2299 | - # line-number line with the line containing $LINENO, and appends | ||
2300 | - # trailing '-' during substitution so that $LINENO is not a special | ||
2301 | - # case at line end. | ||
2302 | - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
2303 | - # scripts with optimization help from Paolo Bonzini. Blame Lee | ||
2304 | - # E. McMahon (1931-1989) for sed's syntax. :-) | ||
2305 | + as_lineno_1=$LINENO as_lineno_1a=$LINENO | ||
2306 | + as_lineno_2=$LINENO as_lineno_2a=$LINENO | ||
2307 | + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && | ||
2308 | + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { | ||
2309 | + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) | ||
2310 | sed -n ' | ||
2311 | p | ||
2312 | /[$]LINENO/= | ||
2313 | @@ -473,8 +442,7 @@ | ||
2314 | s/-\n.*// | ||
2315 | ' >$as_me.lineno && | ||
2316 | chmod +x "$as_me.lineno" || | ||
2317 | - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
2318 | - { (exit 1); exit 1; }; } | ||
2319 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } | ||
2320 | |||
2321 | # Don't try to exec as it changes $[0], causing all sort of problems | ||
2322 | # (the dirname of $[0] is not the place where we might find the | ||
2323 | @@ -484,29 +452,18 @@ | ||
2324 | exit | ||
2325 | } | ||
2326 | |||
2327 | - | ||
2328 | -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
2329 | - as_dirname=dirname | ||
2330 | -else | ||
2331 | - as_dirname=false | ||
2332 | -fi | ||
2333 | - | ||
2334 | ECHO_C= ECHO_N= ECHO_T= | ||
2335 | -case `echo -n x` in | ||
2336 | +case `echo -n x` in #((((( | ||
2337 | -n*) | ||
2338 | - case `echo 'x\c'` in | ||
2339 | + case `echo 'xy\c'` in | ||
2340 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
2341 | - *) ECHO_C='\c';; | ||
2342 | + xy) ECHO_C='\c';; | ||
2343 | + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null | ||
2344 | + ECHO_T=' ';; | ||
2345 | esac;; | ||
2346 | *) | ||
2347 | ECHO_N='-n';; | ||
2348 | esac | ||
2349 | -if expr a : '\(a\)' >/dev/null 2>&1 && | ||
2350 | - test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
2351 | - as_expr=expr | ||
2352 | -else | ||
2353 | - as_expr=false | ||
2354 | -fi | ||
2355 | |||
2356 | rm -f conf$$ conf$$.exe conf$$.file | ||
2357 | if test -d conf$$.dir; then | ||
2358 | @@ -536,7 +493,7 @@ | ||
2359 | rmdir conf$$.dir 2>/dev/null | ||
2360 | |||
2361 | if mkdir -p . 2>/dev/null; then | ||
2362 | - as_mkdir_p=: | ||
2363 | + as_mkdir_p='mkdir -p "$as_dir"' | ||
2364 | else | ||
2365 | test -d ./-p && rmdir ./-p | ||
2366 | as_mkdir_p=false | ||
2367 | @@ -555,10 +512,10 @@ | ||
2368 | if test -d "$1"; then | ||
2369 | test -d "$1/."; | ||
2370 | else | ||
2371 | - case $1 in | ||
2372 | + case $1 in #( | ||
2373 | -*)set "./$1";; | ||
2374 | esac; | ||
2375 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | ||
2376 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
2377 | ???[sx]*):;;*)false;;esac;fi | ||
2378 | '\'' sh | ||
2379 | ' | ||
2380 | @@ -573,7 +530,6 @@ | ||
2381 | |||
2382 | |||
2383 | |||
2384 | - | ||
2385 | # Check that we are running under the correct shell. | ||
2386 | SHELL=${CONFIG_SHELL-/bin/sh} | ||
2387 | |||
2388 | @@ -722,10 +678,11 @@ | ||
2389 | |||
2390 | |||
2391 | |||
2392 | -exec 7<&0 </dev/null 6>&1 | ||
2393 | +test -n "$DJDIR" || exec 7<&0 </dev/null | ||
2394 | +exec 6>&1 | ||
2395 | |||
2396 | # Name of the host. | ||
2397 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | ||
2398 | +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, | ||
2399 | # so uname gets run too. | ||
2400 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | ||
2401 | |||
2402 | @@ -740,7 +697,6 @@ | ||
2403 | subdirs= | ||
2404 | MFLAGS= | ||
2405 | MAKEFLAGS= | ||
2406 | -SHELL=${CONFIG_SHELL-/bin/sh} | ||
2407 | |||
2408 | # Identity of this package. | ||
2409 | PACKAGE_NAME='fftw' | ||
2410 | @@ -748,6 +704,7 @@ | ||
2411 | PACKAGE_VERSION='3.2.2' | ||
2412 | PACKAGE_STRING='fftw 3.2.2' | ||
2413 | PACKAGE_BUGREPORT='fftw@fftw.org' | ||
2414 | +PACKAGE_URL='' | ||
2415 | |||
2416 | ac_unique_file="kernel/ifftw.h" | ||
2417 | # Factoring default headers for most tests. | ||
2418 | @@ -786,7 +743,9 @@ | ||
2419 | # include <unistd.h> | ||
2420 | #endif" | ||
2421 | |||
2422 | -ac_subst_vars='LTLIBOBJS | ||
2423 | +ac_subst_vars='am__EXEEXT_FALSE | ||
2424 | +am__EXEEXT_TRUE | ||
2425 | +LTLIBOBJS | ||
2426 | COMBINED_THREADS_FALSE | ||
2427 | COMBINED_THREADS_TRUE | ||
2428 | SMP_FALSE | ||
2429 | @@ -936,6 +895,7 @@ | ||
2430 | program_transform_name | ||
2431 | prefix | ||
2432 | exec_prefix | ||
2433 | +PACKAGE_URL | ||
2434 | PACKAGE_BUGREPORT | ||
2435 | PACKAGE_STRING | ||
2436 | PACKAGE_VERSION | ||
2437 | @@ -959,10 +919,13 @@ | ||
2438 | enable_sse | ||
2439 | enable_sse2 | ||
2440 | enable_altivec | ||
2441 | +enable_neon | ||
2442 | enable_mips_ps | ||
2443 | enable_cell | ||
2444 | with_slow_timer | ||
2445 | enable_mips_zbus_timer | ||
2446 | +enable_armv7a_cycle_counter | ||
2447 | +enable_perf_events | ||
2448 | with_our_malloc16 | ||
2449 | with_windows_f77_mangling | ||
2450 | enable_dependency_tracking | ||
2451 | @@ -1054,8 +1017,9 @@ | ||
2452 | fi | ||
2453 | |||
2454 | case $ac_option in | ||
2455 | - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | ||
2456 | - *) ac_optarg=yes ;; | ||
2457 | + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | ||
2458 | + *=) ac_optarg= ;; | ||
2459 | + *) ac_optarg=yes ;; | ||
2460 | esac | ||
2461 | |||
2462 | # Accept the important Cygnus configure options, so we can diagnose typos. | ||
2463 | @@ -1100,8 +1064,7 @@ | ||
2464 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | ||
2465 | # Reject names that are not valid shell variable names. | ||
2466 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
2467 | - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 | ||
2468 | - { (exit 1); exit 1; }; } | ||
2469 | + as_fn_error $? "invalid feature name: $ac_useropt" | ||
2470 | ac_useropt_orig=$ac_useropt | ||
2471 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
2472 | case $ac_user_opts in | ||
2473 | @@ -1127,8 +1090,7 @@ | ||
2474 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | ||
2475 | # Reject names that are not valid shell variable names. | ||
2476 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
2477 | - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 | ||
2478 | - { (exit 1); exit 1; }; } | ||
2479 | + as_fn_error $? "invalid feature name: $ac_useropt" | ||
2480 | ac_useropt_orig=$ac_useropt | ||
2481 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
2482 | case $ac_user_opts in | ||
2483 | @@ -1332,8 +1294,7 @@ | ||
2484 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | ||
2485 | # Reject names that are not valid shell variable names. | ||
2486 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
2487 | - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 | ||
2488 | - { (exit 1); exit 1; }; } | ||
2489 | + as_fn_error $? "invalid package name: $ac_useropt" | ||
2490 | ac_useropt_orig=$ac_useropt | ||
2491 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
2492 | case $ac_user_opts in | ||
2493 | @@ -1349,8 +1310,7 @@ | ||
2494 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` | ||
2495 | # Reject names that are not valid shell variable names. | ||
2496 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
2497 | - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 | ||
2498 | - { (exit 1); exit 1; }; } | ||
2499 | + as_fn_error $? "invalid package name: $ac_useropt" | ||
2500 | ac_useropt_orig=$ac_useropt | ||
2501 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
2502 | case $ac_user_opts in | ||
2503 | @@ -1380,17 +1340,17 @@ | ||
2504 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | ||
2505 | x_libraries=$ac_optarg ;; | ||
2506 | |||
2507 | - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option | ||
2508 | -Try \`$0 --help' for more information." >&2 | ||
2509 | - { (exit 1); exit 1; }; } | ||
2510 | + -*) as_fn_error $? "unrecognized option: \`$ac_option' | ||
2511 | +Try \`$0 --help' for more information" | ||
2512 | ;; | ||
2513 | |||
2514 | *=*) | ||
2515 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` | ||
2516 | # Reject names that are not valid shell variable names. | ||
2517 | - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | ||
2518 | - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | ||
2519 | - { (exit 1); exit 1; }; } | ||
2520 | + case $ac_envvar in #( | ||
2521 | + '' | [0-9]* | *[!_$as_cr_alnum]* ) | ||
2522 | + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; | ||
2523 | + esac | ||
2524 | eval $ac_envvar=\$ac_optarg | ||
2525 | export $ac_envvar ;; | ||
2526 | |||
2527 | @@ -1407,15 +1367,13 @@ | ||
2528 | |||
2529 | if test -n "$ac_prev"; then | ||
2530 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` | ||
2531 | - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 | ||
2532 | - { (exit 1); exit 1; }; } | ||
2533 | + as_fn_error $? "missing argument to $ac_option" | ||
2534 | fi | ||
2535 | |||
2536 | if test -n "$ac_unrecognized_opts"; then | ||
2537 | case $enable_option_checking in | ||
2538 | no) ;; | ||
2539 | - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 | ||
2540 | - { (exit 1); exit 1; }; } ;; | ||
2541 | + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; | ||
2542 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; | ||
2543 | esac | ||
2544 | fi | ||
2545 | @@ -1438,8 +1396,7 @@ | ||
2546 | [\\/$]* | ?:[\\/]* ) continue;; | ||
2547 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | ||
2548 | esac | ||
2549 | - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
2550 | - { (exit 1); exit 1; }; } | ||
2551 | + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" | ||
2552 | done | ||
2553 | |||
2554 | # There might be people who depend on the old broken behavior: `$host' | ||
2555 | @@ -1453,8 +1410,8 @@ | ||
2556 | if test "x$host_alias" != x; then | ||
2557 | if test "x$build_alias" = x; then | ||
2558 | cross_compiling=maybe | ||
2559 | - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | ||
2560 | - If a cross compiler is detected then cross compile mode will be used." >&2 | ||
2561 | + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. | ||
2562 | + If a cross compiler is detected then cross compile mode will be used" >&2 | ||
2563 | elif test "x$build_alias" != "x$host_alias"; then | ||
2564 | cross_compiling=yes | ||
2565 | fi | ||
2566 | @@ -1469,11 +1426,9 @@ | ||
2567 | ac_pwd=`pwd` && test -n "$ac_pwd" && | ||
2568 | ac_ls_di=`ls -di .` && | ||
2569 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | ||
2570 | - { $as_echo "$as_me: error: working directory cannot be determined" >&2 | ||
2571 | - { (exit 1); exit 1; }; } | ||
2572 | + as_fn_error $? "working directory cannot be determined" | ||
2573 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | ||
2574 | - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 | ||
2575 | - { (exit 1); exit 1; }; } | ||
2576 | + as_fn_error $? "pwd does not report name of working directory" | ||
2577 | |||
2578 | |||
2579 | # Find the source files, if location was not specified. | ||
2580 | @@ -1512,13 +1467,11 @@ | ||
2581 | fi | ||
2582 | if test ! -r "$srcdir/$ac_unique_file"; then | ||
2583 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | ||
2584 | - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | ||
2585 | - { (exit 1); exit 1; }; } | ||
2586 | + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" | ||
2587 | fi | ||
2588 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | ||
2589 | ac_abs_confdir=`( | ||
2590 | - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 | ||
2591 | - { (exit 1); exit 1; }; } | ||
2592 | + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" | ||
2593 | pwd)` | ||
2594 | # When building in place, set srcdir=. | ||
2595 | if test "$ac_abs_confdir" = "$ac_pwd"; then | ||
2596 | @@ -1558,7 +1511,7 @@ | ||
2597 | --help=short display options specific to this package | ||
2598 | --help=recursive display the short help of all the included packages | ||
2599 | -V, --version display version information and exit | ||
2600 | - -q, --quiet, --silent do not print \`checking...' messages | ||
2601 | + -q, --quiet, --silent do not print \`checking ...' messages | ||
2602 | --cache-file=FILE cache test results in FILE [disabled] | ||
2603 | -C, --config-cache alias for \`--cache-file=config.cache' | ||
2604 | -n, --no-create do not create output files | ||
2605 | @@ -1639,10 +1592,14 @@ | ||
2606 | --enable-sse enable SSE optimizations | ||
2607 | --enable-sse2 enable SSE2 optimizations | ||
2608 | --enable-altivec enable Altivec optimizations | ||
2609 | + --enable-neon enable NEON optimizations | ||
2610 | --enable-mips-ps enable MIPS pair-single optimizations | ||
2611 | --enable-cell enable optimizations for the Cell Broadband Engine | ||
2612 | --enable-mips-zbus-timer | ||
2613 | use MIPS ZBus cycle-counter | ||
2614 | + --enable-armv7a-cycle-counter | ||
2615 | + use ARM cycle counter | ||
2616 | + --enable-perf-events use the Linux perf events system for cycle counting | ||
2617 | --disable-dependency-tracking speeds up one-time build | ||
2618 | --enable-dependency-tracking do not reject slow dependency extractors | ||
2619 | --enable-static[=PKGS] build static libraries [default=yes] | ||
2620 | @@ -1680,7 +1637,7 @@ | ||
2621 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | ||
2622 | nonstandard directory <lib dir> | ||
2623 | LIBS libraries to pass to the linker, e.g. -l<library> | ||
2624 | - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | ||
2625 | + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if | ||
2626 | you have headers in a nonstandard directory <include dir> | ||
2627 | CPP C preprocessor | ||
2628 | MPICC MPI C compiler command | ||
2629 | @@ -1754,21 +1711,738 @@ | ||
2630 | if $ac_init_version; then | ||
2631 | cat <<\_ACEOF | ||
2632 | fftw configure 3.2.2 | ||
2633 | -generated by GNU Autoconf 2.63 | ||
2634 | +generated by GNU Autoconf 2.67 | ||
2635 | |||
2636 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | ||
2637 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
2638 | +Copyright (C) 2010 Free Software Foundation, Inc. | ||
2639 | This configure script is free software; the Free Software Foundation | ||
2640 | gives unlimited permission to copy, distribute and modify it. | ||
2641 | _ACEOF | ||
2642 | exit | ||
2643 | fi | ||
2644 | + | ||
2645 | +## ------------------------ ## | ||
2646 | +## Autoconf initialization. ## | ||
2647 | +## ------------------------ ## | ||
2648 | + | ||
2649 | +# ac_fn_c_try_compile LINENO | ||
2650 | +# -------------------------- | ||
2651 | +# Try to compile conftest.$ac_ext, and return whether this succeeded. | ||
2652 | +ac_fn_c_try_compile () | ||
2653 | +{ | ||
2654 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2655 | + rm -f conftest.$ac_objext | ||
2656 | + if { { ac_try="$ac_compile" | ||
2657 | +case "(($ac_try" in | ||
2658 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2659 | + *) ac_try_echo=$ac_try;; | ||
2660 | +esac | ||
2661 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
2662 | +$as_echo "$ac_try_echo"; } >&5 | ||
2663 | + (eval "$ac_compile") 2>conftest.err | ||
2664 | + ac_status=$? | ||
2665 | + if test -s conftest.err; then | ||
2666 | + grep -v '^ *+' conftest.err >conftest.er1 | ||
2667 | + cat conftest.er1 >&5 | ||
2668 | + mv -f conftest.er1 conftest.err | ||
2669 | + fi | ||
2670 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2671 | + test $ac_status = 0; } && { | ||
2672 | + test -z "$ac_c_werror_flag" || | ||
2673 | + test ! -s conftest.err | ||
2674 | + } && test -s conftest.$ac_objext; then : | ||
2675 | + ac_retval=0 | ||
2676 | +else | ||
2677 | + $as_echo "$as_me: failed program was:" >&5 | ||
2678 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
2679 | + | ||
2680 | + ac_retval=1 | ||
2681 | +fi | ||
2682 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2683 | + as_fn_set_status $ac_retval | ||
2684 | + | ||
2685 | +} # ac_fn_c_try_compile | ||
2686 | + | ||
2687 | +# ac_fn_c_try_link LINENO | ||
2688 | +# ----------------------- | ||
2689 | +# Try to link conftest.$ac_ext, and return whether this succeeded. | ||
2690 | +ac_fn_c_try_link () | ||
2691 | +{ | ||
2692 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2693 | + rm -f conftest.$ac_objext conftest$ac_exeext | ||
2694 | + if { { ac_try="$ac_link" | ||
2695 | +case "(($ac_try" in | ||
2696 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2697 | + *) ac_try_echo=$ac_try;; | ||
2698 | +esac | ||
2699 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
2700 | +$as_echo "$ac_try_echo"; } >&5 | ||
2701 | + (eval "$ac_link") 2>conftest.err | ||
2702 | + ac_status=$? | ||
2703 | + if test -s conftest.err; then | ||
2704 | + grep -v '^ *+' conftest.err >conftest.er1 | ||
2705 | + cat conftest.er1 >&5 | ||
2706 | + mv -f conftest.er1 conftest.err | ||
2707 | + fi | ||
2708 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2709 | + test $ac_status = 0; } && { | ||
2710 | + test -z "$ac_c_werror_flag" || | ||
2711 | + test ! -s conftest.err | ||
2712 | + } && test -s conftest$ac_exeext && { | ||
2713 | + test "$cross_compiling" = yes || | ||
2714 | + $as_test_x conftest$ac_exeext | ||
2715 | + }; then : | ||
2716 | + ac_retval=0 | ||
2717 | +else | ||
2718 | + $as_echo "$as_me: failed program was:" >&5 | ||
2719 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
2720 | + | ||
2721 | + ac_retval=1 | ||
2722 | +fi | ||
2723 | + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information | ||
2724 | + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would | ||
2725 | + # interfere with the next link command; also delete a directory that is | ||
2726 | + # left behind by Apple's compiler. We do this before executing the actions. | ||
2727 | + rm -rf conftest.dSYM conftest_ipa8_conftest.oo | ||
2728 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2729 | + as_fn_set_status $ac_retval | ||
2730 | + | ||
2731 | +} # ac_fn_c_try_link | ||
2732 | + | ||
2733 | +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES | ||
2734 | +# ------------------------------------------------------- | ||
2735 | +# Tests whether HEADER exists and can be compiled using the include files in | ||
2736 | +# INCLUDES, setting the cache variable VAR accordingly. | ||
2737 | +ac_fn_c_check_header_compile () | ||
2738 | +{ | ||
2739 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2740 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2741 | +$as_echo_n "checking for $2... " >&6; } | ||
2742 | +if eval "test \"\${$3+set}\"" = set; then : | ||
2743 | + $as_echo_n "(cached) " >&6 | ||
2744 | +else | ||
2745 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2746 | +/* end confdefs.h. */ | ||
2747 | +$4 | ||
2748 | +#include <$2> | ||
2749 | +_ACEOF | ||
2750 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
2751 | + eval "$3=yes" | ||
2752 | +else | ||
2753 | + eval "$3=no" | ||
2754 | +fi | ||
2755 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2756 | +fi | ||
2757 | +eval ac_res=\$$3 | ||
2758 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2759 | +$as_echo "$ac_res" >&6; } | ||
2760 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2761 | + | ||
2762 | +} # ac_fn_c_check_header_compile | ||
2763 | + | ||
2764 | +# ac_fn_c_try_cpp LINENO | ||
2765 | +# ---------------------- | ||
2766 | +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. | ||
2767 | +ac_fn_c_try_cpp () | ||
2768 | +{ | ||
2769 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2770 | + if { { ac_try="$ac_cpp conftest.$ac_ext" | ||
2771 | +case "(($ac_try" in | ||
2772 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2773 | + *) ac_try_echo=$ac_try;; | ||
2774 | +esac | ||
2775 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
2776 | +$as_echo "$ac_try_echo"; } >&5 | ||
2777 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err | ||
2778 | + ac_status=$? | ||
2779 | + if test -s conftest.err; then | ||
2780 | + grep -v '^ *+' conftest.err >conftest.er1 | ||
2781 | + cat conftest.er1 >&5 | ||
2782 | + mv -f conftest.er1 conftest.err | ||
2783 | + fi | ||
2784 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2785 | + test $ac_status = 0; } > conftest.i && { | ||
2786 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
2787 | + test ! -s conftest.err | ||
2788 | + }; then : | ||
2789 | + ac_retval=0 | ||
2790 | +else | ||
2791 | + $as_echo "$as_me: failed program was:" >&5 | ||
2792 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
2793 | + | ||
2794 | + ac_retval=1 | ||
2795 | +fi | ||
2796 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2797 | + as_fn_set_status $ac_retval | ||
2798 | + | ||
2799 | +} # ac_fn_c_try_cpp | ||
2800 | + | ||
2801 | +# ac_fn_c_try_run LINENO | ||
2802 | +# ---------------------- | ||
2803 | +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes | ||
2804 | +# that executables *can* be run. | ||
2805 | +ac_fn_c_try_run () | ||
2806 | +{ | ||
2807 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2808 | + if { { ac_try="$ac_link" | ||
2809 | +case "(($ac_try" in | ||
2810 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2811 | + *) ac_try_echo=$ac_try;; | ||
2812 | +esac | ||
2813 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
2814 | +$as_echo "$ac_try_echo"; } >&5 | ||
2815 | + (eval "$ac_link") 2>&5 | ||
2816 | + ac_status=$? | ||
2817 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2818 | + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' | ||
2819 | + { { case "(($ac_try" in | ||
2820 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2821 | + *) ac_try_echo=$ac_try;; | ||
2822 | +esac | ||
2823 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
2824 | +$as_echo "$ac_try_echo"; } >&5 | ||
2825 | + (eval "$ac_try") 2>&5 | ||
2826 | + ac_status=$? | ||
2827 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2828 | + test $ac_status = 0; }; }; then : | ||
2829 | + ac_retval=0 | ||
2830 | +else | ||
2831 | + $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
2832 | + $as_echo "$as_me: failed program was:" >&5 | ||
2833 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
2834 | + | ||
2835 | + ac_retval=$ac_status | ||
2836 | +fi | ||
2837 | + rm -rf conftest.dSYM conftest_ipa8_conftest.oo | ||
2838 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2839 | + as_fn_set_status $ac_retval | ||
2840 | + | ||
2841 | +} # ac_fn_c_try_run | ||
2842 | + | ||
2843 | +# ac_fn_c_check_func LINENO FUNC VAR | ||
2844 | +# ---------------------------------- | ||
2845 | +# Tests whether FUNC exists, setting the cache variable VAR accordingly | ||
2846 | +ac_fn_c_check_func () | ||
2847 | +{ | ||
2848 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2849 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2850 | +$as_echo_n "checking for $2... " >&6; } | ||
2851 | +if eval "test \"\${$3+set}\"" = set; then : | ||
2852 | + $as_echo_n "(cached) " >&6 | ||
2853 | +else | ||
2854 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2855 | +/* end confdefs.h. */ | ||
2856 | +/* Define $2 to an innocuous variant, in case <limits.h> declares $2. | ||
2857 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
2858 | +#define $2 innocuous_$2 | ||
2859 | + | ||
2860 | +/* System header to define __stub macros and hopefully few prototypes, | ||
2861 | + which can conflict with char $2 (); below. | ||
2862 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
2863 | + <limits.h> exists even on freestanding compilers. */ | ||
2864 | + | ||
2865 | +#ifdef __STDC__ | ||
2866 | +# include <limits.h> | ||
2867 | +#else | ||
2868 | +# include <assert.h> | ||
2869 | +#endif | ||
2870 | + | ||
2871 | +#undef $2 | ||
2872 | + | ||
2873 | +/* Override any GCC internal prototype to avoid an error. | ||
2874 | + Use char because int might match the return type of a GCC | ||
2875 | + builtin and then its argument prototype would still apply. */ | ||
2876 | +#ifdef __cplusplus | ||
2877 | +extern "C" | ||
2878 | +#endif | ||
2879 | +char $2 (); | ||
2880 | +/* The GNU C library defines this for functions which it implements | ||
2881 | + to always fail with ENOSYS. Some functions are actually named | ||
2882 | + something starting with __ and the normal name is an alias. */ | ||
2883 | +#if defined __stub_$2 || defined __stub___$2 | ||
2884 | +choke me | ||
2885 | +#endif | ||
2886 | + | ||
2887 | +int | ||
2888 | +main () | ||
2889 | +{ | ||
2890 | +return $2 (); | ||
2891 | + ; | ||
2892 | + return 0; | ||
2893 | +} | ||
2894 | +_ACEOF | ||
2895 | +if ac_fn_c_try_link "$LINENO"; then : | ||
2896 | + eval "$3=yes" | ||
2897 | +else | ||
2898 | + eval "$3=no" | ||
2899 | +fi | ||
2900 | +rm -f core conftest.err conftest.$ac_objext \ | ||
2901 | + conftest$ac_exeext conftest.$ac_ext | ||
2902 | +fi | ||
2903 | +eval ac_res=\$$3 | ||
2904 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2905 | +$as_echo "$ac_res" >&6; } | ||
2906 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2907 | + | ||
2908 | +} # ac_fn_c_check_func | ||
2909 | + | ||
2910 | +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES | ||
2911 | +# ------------------------------------------------------- | ||
2912 | +# Tests whether HEADER exists, giving a warning if it cannot be compiled using | ||
2913 | +# the include files in INCLUDES and setting the cache variable VAR | ||
2914 | +# accordingly. | ||
2915 | +ac_fn_c_check_header_mongrel () | ||
2916 | +{ | ||
2917 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2918 | + if eval "test \"\${$3+set}\"" = set; then : | ||
2919 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2920 | +$as_echo_n "checking for $2... " >&6; } | ||
2921 | +if eval "test \"\${$3+set}\"" = set; then : | ||
2922 | + $as_echo_n "(cached) " >&6 | ||
2923 | +fi | ||
2924 | +eval ac_res=\$$3 | ||
2925 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2926 | +$as_echo "$ac_res" >&6; } | ||
2927 | +else | ||
2928 | + # Is the header compilable? | ||
2929 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 | ||
2930 | +$as_echo_n "checking $2 usability... " >&6; } | ||
2931 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2932 | +/* end confdefs.h. */ | ||
2933 | +$4 | ||
2934 | +#include <$2> | ||
2935 | +_ACEOF | ||
2936 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
2937 | + ac_header_compiler=yes | ||
2938 | +else | ||
2939 | + ac_header_compiler=no | ||
2940 | +fi | ||
2941 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2942 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 | ||
2943 | +$as_echo "$ac_header_compiler" >&6; } | ||
2944 | + | ||
2945 | +# Is the header present? | ||
2946 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 | ||
2947 | +$as_echo_n "checking $2 presence... " >&6; } | ||
2948 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2949 | +/* end confdefs.h. */ | ||
2950 | +#include <$2> | ||
2951 | +_ACEOF | ||
2952 | +if ac_fn_c_try_cpp "$LINENO"; then : | ||
2953 | + ac_header_preproc=yes | ||
2954 | +else | ||
2955 | + ac_header_preproc=no | ||
2956 | +fi | ||
2957 | +rm -f conftest.err conftest.i conftest.$ac_ext | ||
2958 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 | ||
2959 | +$as_echo "$ac_header_preproc" >&6; } | ||
2960 | + | ||
2961 | +# So? What about this header? | ||
2962 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( | ||
2963 | + yes:no: ) | ||
2964 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
2965 | +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
2966 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
2967 | +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
2968 | + ;; | ||
2969 | + no:yes:* ) | ||
2970 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 | ||
2971 | +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} | ||
2972 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 | ||
2973 | +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} | ||
2974 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 | ||
2975 | +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} | ||
2976 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 | ||
2977 | +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} | ||
2978 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
2979 | +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
2980 | +( $as_echo "## ---------------------------- ## | ||
2981 | +## Report this to fftw@fftw.org ## | ||
2982 | +## ---------------------------- ##" | ||
2983 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
2984 | + ;; | ||
2985 | +esac | ||
2986 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2987 | +$as_echo_n "checking for $2... " >&6; } | ||
2988 | +if eval "test \"\${$3+set}\"" = set; then : | ||
2989 | + $as_echo_n "(cached) " >&6 | ||
2990 | +else | ||
2991 | + eval "$3=\$ac_header_compiler" | ||
2992 | +fi | ||
2993 | +eval ac_res=\$$3 | ||
2994 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2995 | +$as_echo "$ac_res" >&6; } | ||
2996 | +fi | ||
2997 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2998 | + | ||
2999 | +} # ac_fn_c_check_header_mongrel | ||
3000 | + | ||
3001 | +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES | ||
3002 | +# ------------------------------------------- | ||
3003 | +# Tests whether TYPE exists after having included INCLUDES, setting cache | ||
3004 | +# variable VAR accordingly. | ||
3005 | +ac_fn_c_check_type () | ||
3006 | +{ | ||
3007 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
3008 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
3009 | +$as_echo_n "checking for $2... " >&6; } | ||
3010 | +if eval "test \"\${$3+set}\"" = set; then : | ||
3011 | + $as_echo_n "(cached) " >&6 | ||
3012 | +else | ||
3013 | + eval "$3=no" | ||
3014 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3015 | +/* end confdefs.h. */ | ||
3016 | +$4 | ||
3017 | +int | ||
3018 | +main () | ||
3019 | +{ | ||
3020 | +if (sizeof ($2)) | ||
3021 | + return 0; | ||
3022 | + ; | ||
3023 | + return 0; | ||
3024 | +} | ||
3025 | +_ACEOF | ||
3026 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3027 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3028 | +/* end confdefs.h. */ | ||
3029 | +$4 | ||
3030 | +int | ||
3031 | +main () | ||
3032 | +{ | ||
3033 | +if (sizeof (($2))) | ||
3034 | + return 0; | ||
3035 | + ; | ||
3036 | + return 0; | ||
3037 | +} | ||
3038 | +_ACEOF | ||
3039 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3040 | + | ||
3041 | +else | ||
3042 | + eval "$3=yes" | ||
3043 | +fi | ||
3044 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3045 | +fi | ||
3046 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3047 | +fi | ||
3048 | +eval ac_res=\$$3 | ||
3049 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
3050 | +$as_echo "$ac_res" >&6; } | ||
3051 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
3052 | + | ||
3053 | +} # ac_fn_c_check_type | ||
3054 | + | ||
3055 | +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES | ||
3056 | +# -------------------------------------------- | ||
3057 | +# Tries to find the compile-time value of EXPR in a program that includes | ||
3058 | +# INCLUDES, setting VAR accordingly. Returns whether the value could be | ||
3059 | +# computed | ||
3060 | +ac_fn_c_compute_int () | ||
3061 | +{ | ||
3062 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
3063 | + if test "$cross_compiling" = yes; then | ||
3064 | + # Depending upon the size, compute the lo and hi bounds. | ||
3065 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3066 | +/* end confdefs.h. */ | ||
3067 | +$4 | ||
3068 | +int | ||
3069 | +main () | ||
3070 | +{ | ||
3071 | +static int test_array [1 - 2 * !(($2) >= 0)]; | ||
3072 | +test_array [0] = 0 | ||
3073 | + | ||
3074 | + ; | ||
3075 | + return 0; | ||
3076 | +} | ||
3077 | +_ACEOF | ||
3078 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3079 | + ac_lo=0 ac_mid=0 | ||
3080 | + while :; do | ||
3081 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3082 | +/* end confdefs.h. */ | ||
3083 | +$4 | ||
3084 | +int | ||
3085 | +main () | ||
3086 | +{ | ||
3087 | +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; | ||
3088 | +test_array [0] = 0 | ||
3089 | + | ||
3090 | + ; | ||
3091 | + return 0; | ||
3092 | +} | ||
3093 | +_ACEOF | ||
3094 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3095 | + ac_hi=$ac_mid; break | ||
3096 | +else | ||
3097 | + as_fn_arith $ac_mid + 1 && ac_lo=$as_val | ||
3098 | + if test $ac_lo -le $ac_mid; then | ||
3099 | + ac_lo= ac_hi= | ||
3100 | + break | ||
3101 | + fi | ||
3102 | + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val | ||
3103 | +fi | ||
3104 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3105 | + done | ||
3106 | +else | ||
3107 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3108 | +/* end confdefs.h. */ | ||
3109 | +$4 | ||
3110 | +int | ||
3111 | +main () | ||
3112 | +{ | ||
3113 | +static int test_array [1 - 2 * !(($2) < 0)]; | ||
3114 | +test_array [0] = 0 | ||
3115 | + | ||
3116 | + ; | ||
3117 | + return 0; | ||
3118 | +} | ||
3119 | +_ACEOF | ||
3120 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3121 | + ac_hi=-1 ac_mid=-1 | ||
3122 | + while :; do | ||
3123 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3124 | +/* end confdefs.h. */ | ||
3125 | +$4 | ||
3126 | +int | ||
3127 | +main () | ||
3128 | +{ | ||
3129 | +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; | ||
3130 | +test_array [0] = 0 | ||
3131 | + | ||
3132 | + ; | ||
3133 | + return 0; | ||
3134 | +} | ||
3135 | +_ACEOF | ||
3136 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3137 | + ac_lo=$ac_mid; break | ||
3138 | +else | ||
3139 | + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val | ||
3140 | + if test $ac_mid -le $ac_hi; then | ||
3141 | + ac_lo= ac_hi= | ||
3142 | + break | ||
3143 | + fi | ||
3144 | + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val | ||
3145 | +fi | ||
3146 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3147 | + done | ||
3148 | +else | ||
3149 | + ac_lo= ac_hi= | ||
3150 | +fi | ||
3151 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3152 | +fi | ||
3153 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3154 | +# Binary search between lo and hi bounds. | ||
3155 | +while test "x$ac_lo" != "x$ac_hi"; do | ||
3156 | + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val | ||
3157 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3158 | +/* end confdefs.h. */ | ||
3159 | +$4 | ||
3160 | +int | ||
3161 | +main () | ||
3162 | +{ | ||
3163 | +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; | ||
3164 | +test_array [0] = 0 | ||
3165 | + | ||
3166 | + ; | ||
3167 | + return 0; | ||
3168 | +} | ||
3169 | +_ACEOF | ||
3170 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3171 | + ac_hi=$ac_mid | ||
3172 | +else | ||
3173 | + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val | ||
3174 | +fi | ||
3175 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3176 | +done | ||
3177 | +case $ac_lo in #(( | ||
3178 | +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; | ||
3179 | +'') ac_retval=1 ;; | ||
3180 | +esac | ||
3181 | + else | ||
3182 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3183 | +/* end confdefs.h. */ | ||
3184 | +$4 | ||
3185 | +static long int longval () { return $2; } | ||
3186 | +static unsigned long int ulongval () { return $2; } | ||
3187 | +#include <stdio.h> | ||
3188 | +#include <stdlib.h> | ||
3189 | +int | ||
3190 | +main () | ||
3191 | +{ | ||
3192 | + | ||
3193 | + FILE *f = fopen ("conftest.val", "w"); | ||
3194 | + if (! f) | ||
3195 | + return 1; | ||
3196 | + if (($2) < 0) | ||
3197 | + { | ||
3198 | + long int i = longval (); | ||
3199 | + if (i != ($2)) | ||
3200 | + return 1; | ||
3201 | + fprintf (f, "%ld", i); | ||
3202 | + } | ||
3203 | + else | ||
3204 | + { | ||
3205 | + unsigned long int i = ulongval (); | ||
3206 | + if (i != ($2)) | ||
3207 | + return 1; | ||
3208 | + fprintf (f, "%lu", i); | ||
3209 | + } | ||
3210 | + /* Do not output a trailing newline, as this causes \r\n confusion | ||
3211 | + on some platforms. */ | ||
3212 | + return ferror (f) || fclose (f) != 0; | ||
3213 | + | ||
3214 | + ; | ||
3215 | + return 0; | ||
3216 | +} | ||
3217 | +_ACEOF | ||
3218 | +if ac_fn_c_try_run "$LINENO"; then : | ||
3219 | + echo >>conftest.val; read $3 <conftest.val; ac_retval=0 | ||
3220 | +else | ||
3221 | + ac_retval=1 | ||
3222 | +fi | ||
3223 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
3224 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
3225 | +rm -f conftest.val | ||
3226 | + | ||
3227 | + fi | ||
3228 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
3229 | + as_fn_set_status $ac_retval | ||
3230 | + | ||
3231 | +} # ac_fn_c_compute_int | ||
3232 | + | ||
3233 | +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES | ||
3234 | +# --------------------------------------------- | ||
3235 | +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR | ||
3236 | +# accordingly. | ||
3237 | +ac_fn_c_check_decl () | ||
3238 | +{ | ||
3239 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
3240 | + as_decl_name=`echo $2|sed 's/ *(.*//'` | ||
3241 | + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` | ||
3242 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 | ||
3243 | +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } | ||
3244 | +if eval "test \"\${$3+set}\"" = set; then : | ||
3245 | + $as_echo_n "(cached) " >&6 | ||
3246 | +else | ||
3247 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3248 | +/* end confdefs.h. */ | ||
3249 | +$4 | ||
3250 | +int | ||
3251 | +main () | ||
3252 | +{ | ||
3253 | +#ifndef $as_decl_name | ||
3254 | +#ifdef __cplusplus | ||
3255 | + (void) $as_decl_use; | ||
3256 | +#else | ||
3257 | + (void) $as_decl_name; | ||
3258 | +#endif | ||
3259 | +#endif | ||
3260 | + | ||
3261 | + ; | ||
3262 | + return 0; | ||
3263 | +} | ||
3264 | +_ACEOF | ||
3265 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
3266 | + eval "$3=yes" | ||
3267 | +else | ||
3268 | + eval "$3=no" | ||
3269 | +fi | ||
3270 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3271 | +fi | ||
3272 | +eval ac_res=\$$3 | ||
3273 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
3274 | +$as_echo "$ac_res" >&6; } | ||
3275 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
3276 | + | ||
3277 | +} # ac_fn_c_check_decl | ||
3278 | + | ||
3279 | +# ac_fn_f77_try_compile LINENO | ||
3280 | +# ---------------------------- | ||
3281 | +# Try to compile conftest.$ac_ext, and return whether this succeeded. | ||
3282 | +ac_fn_f77_try_compile () | ||
3283 | +{ | ||
3284 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
3285 | + rm -f conftest.$ac_objext | ||
3286 | + if { { ac_try="$ac_compile" | ||
3287 | +case "(($ac_try" in | ||
3288 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3289 | + *) ac_try_echo=$ac_try;; | ||
3290 | +esac | ||
3291 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3292 | +$as_echo "$ac_try_echo"; } >&5 | ||
3293 | + (eval "$ac_compile") 2>conftest.err | ||
3294 | + ac_status=$? | ||
3295 | + if test -s conftest.err; then | ||
3296 | + grep -v '^ *+' conftest.err >conftest.er1 | ||
3297 | + cat conftest.er1 >&5 | ||
3298 | + mv -f conftest.er1 conftest.err | ||
3299 | + fi | ||
3300 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3301 | + test $ac_status = 0; } && { | ||
3302 | + test -z "$ac_f77_werror_flag" || | ||
3303 | + test ! -s conftest.err | ||
3304 | + } && test -s conftest.$ac_objext; then : | ||
3305 | + ac_retval=0 | ||
3306 | +else | ||
3307 | + $as_echo "$as_me: failed program was:" >&5 | ||
3308 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3309 | + | ||
3310 | + ac_retval=1 | ||
3311 | +fi | ||
3312 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
3313 | + as_fn_set_status $ac_retval | ||
3314 | + | ||
3315 | +} # ac_fn_f77_try_compile | ||
3316 | + | ||
3317 | +# ac_fn_f77_try_link LINENO | ||
3318 | +# ------------------------- | ||
3319 | +# Try to link conftest.$ac_ext, and return whether this succeeded. | ||
3320 | +ac_fn_f77_try_link () | ||
3321 | +{ | ||
3322 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
3323 | + rm -f conftest.$ac_objext conftest$ac_exeext | ||
3324 | + if { { ac_try="$ac_link" | ||
3325 | +case "(($ac_try" in | ||
3326 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3327 | + *) ac_try_echo=$ac_try;; | ||
3328 | +esac | ||
3329 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3330 | +$as_echo "$ac_try_echo"; } >&5 | ||
3331 | + (eval "$ac_link") 2>conftest.err | ||
3332 | + ac_status=$? | ||
3333 | + if test -s conftest.err; then | ||
3334 | + grep -v '^ *+' conftest.err >conftest.er1 | ||
3335 | + cat conftest.er1 >&5 | ||
3336 | + mv -f conftest.er1 conftest.err | ||
3337 | + fi | ||
3338 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3339 | + test $ac_status = 0; } && { | ||
3340 | + test -z "$ac_f77_werror_flag" || | ||
3341 | + test ! -s conftest.err | ||
3342 | + } && test -s conftest$ac_exeext && { | ||
3343 | + test "$cross_compiling" = yes || | ||
3344 | + $as_test_x conftest$ac_exeext | ||
3345 | + }; then : | ||
3346 | + ac_retval=0 | ||
3347 | +else | ||
3348 | + $as_echo "$as_me: failed program was:" >&5 | ||
3349 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3350 | + | ||
3351 | + ac_retval=1 | ||
3352 | +fi | ||
3353 | + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information | ||
3354 | + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would | ||
3355 | + # interfere with the next link command; also delete a directory that is | ||
3356 | + # left behind by Apple's compiler. We do this before executing the actions. | ||
3357 | + rm -rf conftest.dSYM conftest_ipa8_conftest.oo | ||
3358 | + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
3359 | + as_fn_set_status $ac_retval | ||
3360 | + | ||
3361 | +} # ac_fn_f77_try_link | ||
3362 | cat >config.log <<_ACEOF | ||
3363 | This file contains any messages produced by compilers while | ||
3364 | running configure, to aid debugging if configure makes a mistake. | ||
3365 | |||
3366 | It was created by fftw $as_me 3.2.2, which was | ||
3367 | -generated by GNU Autoconf 2.63. Invocation command line was | ||
3368 | +generated by GNU Autoconf 2.67. Invocation command line was | ||
3369 | |||
3370 | $ $0 $@ | ||
3371 | |||
3372 | @@ -1804,8 +2478,8 @@ | ||
3373 | do | ||
3374 | IFS=$as_save_IFS | ||
3375 | test -z "$as_dir" && as_dir=. | ||
3376 | - $as_echo "PATH: $as_dir" | ||
3377 | -done | ||
3378 | + $as_echo "PATH: $as_dir" | ||
3379 | + done | ||
3380 | IFS=$as_save_IFS | ||
3381 | |||
3382 | } >&5 | ||
3383 | @@ -1842,9 +2516,9 @@ | ||
3384 | ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
3385 | esac | ||
3386 | case $ac_pass in | ||
3387 | - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; | ||
3388 | + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; | ||
3389 | 2) | ||
3390 | - ac_configure_args1="$ac_configure_args1 '$ac_arg'" | ||
3391 | + as_fn_append ac_configure_args1 " '$ac_arg'" | ||
3392 | if test $ac_must_keep_next = true; then | ||
3393 | ac_must_keep_next=false # Got value, back to normal. | ||
3394 | else | ||
3395 | @@ -1860,13 +2534,13 @@ | ||
3396 | -* ) ac_must_keep_next=true ;; | ||
3397 | esac | ||
3398 | fi | ||
3399 | - ac_configure_args="$ac_configure_args '$ac_arg'" | ||
3400 | + as_fn_append ac_configure_args " '$ac_arg'" | ||
3401 | ;; | ||
3402 | esac | ||
3403 | done | ||
3404 | done | ||
3405 | -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } | ||
3406 | -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } | ||
3407 | +{ ac_configure_args0=; unset ac_configure_args0;} | ||
3408 | +{ ac_configure_args1=; unset ac_configure_args1;} | ||
3409 | |||
3410 | # When interrupted or exit'd, cleanup temporary files, and complete | ||
3411 | # config.log. We remove comments because anyway the quotes in there | ||
3412 | @@ -1878,11 +2552,9 @@ | ||
3413 | { | ||
3414 | echo | ||
3415 | |||
3416 | - cat <<\_ASBOX | ||
3417 | -## ---------------- ## | ||
3418 | + $as_echo "## ---------------- ## | ||
3419 | ## Cache variables. ## | ||
3420 | -## ---------------- ## | ||
3421 | -_ASBOX | ||
3422 | +## ---------------- ##" | ||
3423 | echo | ||
3424 | # The following way of writing the cache mishandles newlines in values, | ||
3425 | ( | ||
3426 | @@ -1891,13 +2563,13 @@ | ||
3427 | case $ac_val in #( | ||
3428 | *${as_nl}*) | ||
3429 | case $ac_var in #( | ||
3430 | - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 | ||
3431 | + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 | ||
3432 | $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | ||
3433 | esac | ||
3434 | case $ac_var in #( | ||
3435 | _ | IFS | as_nl) ;; #( | ||
3436 | BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( | ||
3437 | - *) $as_unset $ac_var ;; | ||
3438 | + *) { eval $ac_var=; unset $ac_var;} ;; | ||
3439 | esac ;; | ||
3440 | esac | ||
3441 | done | ||
3442 | @@ -1916,11 +2588,9 @@ | ||
3443 | ) | ||
3444 | echo | ||
3445 | |||
3446 | - cat <<\_ASBOX | ||
3447 | -## ----------------- ## | ||
3448 | + $as_echo "## ----------------- ## | ||
3449 | ## Output variables. ## | ||
3450 | -## ----------------- ## | ||
3451 | -_ASBOX | ||
3452 | +## ----------------- ##" | ||
3453 | echo | ||
3454 | for ac_var in $ac_subst_vars | ||
3455 | do | ||
3456 | @@ -1933,11 +2603,9 @@ | ||
3457 | echo | ||
3458 | |||
3459 | if test -n "$ac_subst_files"; then | ||
3460 | - cat <<\_ASBOX | ||
3461 | -## ------------------- ## | ||
3462 | + $as_echo "## ------------------- ## | ||
3463 | ## File substitutions. ## | ||
3464 | -## ------------------- ## | ||
3465 | -_ASBOX | ||
3466 | +## ------------------- ##" | ||
3467 | echo | ||
3468 | for ac_var in $ac_subst_files | ||
3469 | do | ||
3470 | @@ -1951,11 +2619,9 @@ | ||
3471 | fi | ||
3472 | |||
3473 | if test -s confdefs.h; then | ||
3474 | - cat <<\_ASBOX | ||
3475 | -## ----------- ## | ||
3476 | + $as_echo "## ----------- ## | ||
3477 | ## confdefs.h. ## | ||
3478 | -## ----------- ## | ||
3479 | -_ASBOX | ||
3480 | +## ----------- ##" | ||
3481 | echo | ||
3482 | cat confdefs.h | ||
3483 | echo | ||
3484 | @@ -1969,46 +2635,53 @@ | ||
3485 | exit $exit_status | ||
3486 | ' 0 | ||
3487 | for ac_signal in 1 2 13 15; do | ||
3488 | - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal | ||
3489 | + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal | ||
3490 | done | ||
3491 | ac_signal=0 | ||
3492 | |||
3493 | # confdefs.h avoids OS command line length limits that DEFS can exceed. | ||
3494 | rm -f -r conftest* confdefs.h | ||
3495 | |||
3496 | +$as_echo "/* confdefs.h */" > confdefs.h | ||
3497 | + | ||
3498 | # Predefined preprocessor variables. | ||
3499 | |||
3500 | cat >>confdefs.h <<_ACEOF | ||
3501 | #define PACKAGE_NAME "$PACKAGE_NAME" | ||
3502 | _ACEOF | ||
3503 | |||
3504 | - | ||
3505 | cat >>confdefs.h <<_ACEOF | ||
3506 | #define PACKAGE_TARNAME "$PACKAGE_TARNAME" | ||
3507 | _ACEOF | ||
3508 | |||
3509 | - | ||
3510 | cat >>confdefs.h <<_ACEOF | ||
3511 | #define PACKAGE_VERSION "$PACKAGE_VERSION" | ||
3512 | _ACEOF | ||
3513 | |||
3514 | - | ||
3515 | cat >>confdefs.h <<_ACEOF | ||
3516 | #define PACKAGE_STRING "$PACKAGE_STRING" | ||
3517 | _ACEOF | ||
3518 | |||
3519 | - | ||
3520 | cat >>confdefs.h <<_ACEOF | ||
3521 | #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" | ||
3522 | _ACEOF | ||
3523 | |||
3524 | +cat >>confdefs.h <<_ACEOF | ||
3525 | +#define PACKAGE_URL "$PACKAGE_URL" | ||
3526 | +_ACEOF | ||
3527 | + | ||
3528 | |||
3529 | # Let the site file select an alternate cache file if it wants to. | ||
3530 | # Prefer an explicitly selected file to automatically selected ones. | ||
3531 | ac_site_file1=NONE | ||
3532 | ac_site_file2=NONE | ||
3533 | if test -n "$CONFIG_SITE"; then | ||
3534 | - ac_site_file1=$CONFIG_SITE | ||
3535 | + # We do not want a PATH search for config.site. | ||
3536 | + case $CONFIG_SITE in #(( | ||
3537 | + -*) ac_site_file1=./$CONFIG_SITE;; | ||
3538 | + */*) ac_site_file1=$CONFIG_SITE;; | ||
3539 | + *) ac_site_file1=./$CONFIG_SITE;; | ||
3540 | + esac | ||
3541 | elif test "x$prefix" != xNONE; then | ||
3542 | ac_site_file1=$prefix/share/config.site | ||
3543 | ac_site_file2=$prefix/etc/config.site | ||
3544 | @@ -2019,19 +2692,23 @@ | ||
3545 | for ac_site_file in "$ac_site_file1" "$ac_site_file2" | ||
3546 | do | ||
3547 | test "x$ac_site_file" = xNONE && continue | ||
3548 | - if test -r "$ac_site_file"; then | ||
3549 | - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | ||
3550 | + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then | ||
3551 | + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 | ||
3552 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} | ||
3553 | sed 's/^/| /' "$ac_site_file" >&5 | ||
3554 | - . "$ac_site_file" | ||
3555 | + . "$ac_site_file" \ | ||
3556 | + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3557 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3558 | +as_fn_error $? "failed to load site script $ac_site_file | ||
3559 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
3560 | fi | ||
3561 | done | ||
3562 | |||
3563 | if test -r "$cache_file"; then | ||
3564 | - # Some versions of bash will fail to source /dev/null (special | ||
3565 | - # files actually), so we avoid doing that. | ||
3566 | - if test -f "$cache_file"; then | ||
3567 | - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 | ||
3568 | + # Some versions of bash will fail to source /dev/null (special files | ||
3569 | + # actually), so we avoid doing that. DJGPP emulates it as a regular file. | ||
3570 | + if test /dev/null != "$cache_file" && test -f "$cache_file"; then | ||
3571 | + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 | ||
3572 | $as_echo "$as_me: loading cache $cache_file" >&6;} | ||
3573 | case $cache_file in | ||
3574 | [\\/]* | ?:[\\/]* ) . "$cache_file";; | ||
3575 | @@ -2039,7 +2716,7 @@ | ||
3576 | esac | ||
3577 | fi | ||
3578 | else | ||
3579 | - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 | ||
3580 | + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 | ||
3581 | $as_echo "$as_me: creating cache $cache_file" >&6;} | ||
3582 | >$cache_file | ||
3583 | fi | ||
3584 | @@ -2054,11 +2731,11 @@ | ||
3585 | eval ac_new_val=\$ac_env_${ac_var}_value | ||
3586 | case $ac_old_set,$ac_new_set in | ||
3587 | set,) | ||
3588 | - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
3589 | + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
3590 | $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | ||
3591 | ac_cache_corrupted=: ;; | ||
3592 | ,set) | ||
3593 | - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 | ||
3594 | + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 | ||
3595 | $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | ||
3596 | ac_cache_corrupted=: ;; | ||
3597 | ,);; | ||
3598 | @@ -2068,17 +2745,17 @@ | ||
3599 | ac_old_val_w=`echo x $ac_old_val` | ||
3600 | ac_new_val_w=`echo x $ac_new_val` | ||
3601 | if test "$ac_old_val_w" != "$ac_new_val_w"; then | ||
3602 | - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
3603 | + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 | ||
3604 | $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
3605 | ac_cache_corrupted=: | ||
3606 | else | ||
3607 | - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 | ||
3608 | + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 | ||
3609 | $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} | ||
3610 | eval $ac_var=\$ac_old_val | ||
3611 | fi | ||
3612 | - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 | ||
3613 | + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 | ||
3614 | $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} | ||
3615 | - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 | ||
3616 | + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 | ||
3617 | $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} | ||
3618 | fi;; | ||
3619 | esac | ||
3620 | @@ -2090,43 +2767,20 @@ | ||
3621 | esac | ||
3622 | case " $ac_configure_args " in | ||
3623 | *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. | ||
3624 | - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; | ||
3625 | + *) as_fn_append ac_configure_args " '$ac_arg'" ;; | ||
3626 | esac | ||
3627 | fi | ||
3628 | done | ||
3629 | if $ac_cache_corrupted; then | ||
3630 | - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
3631 | + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3632 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3633 | - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 | ||
3634 | + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 | ||
3635 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} | ||
3636 | - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | ||
3637 | -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | ||
3638 | - { (exit 1); exit 1; }; } | ||
3639 | + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 | ||
3640 | fi | ||
3641 | - | ||
3642 | - | ||
3643 | - | ||
3644 | - | ||
3645 | - | ||
3646 | - | ||
3647 | - | ||
3648 | - | ||
3649 | - | ||
3650 | - | ||
3651 | - | ||
3652 | - | ||
3653 | - | ||
3654 | - | ||
3655 | - | ||
3656 | - | ||
3657 | - | ||
3658 | - | ||
3659 | - | ||
3660 | - | ||
3661 | - | ||
3662 | - | ||
3663 | - | ||
3664 | - | ||
3665 | +## -------------------- ## | ||
3666 | +## Main body of script. ## | ||
3667 | +## -------------------- ## | ||
3668 | |||
3669 | ac_ext=c | ||
3670 | ac_cpp='$CPP $CPPFLAGS' | ||
3671 | @@ -2138,7 +2792,7 @@ | ||
3672 | |||
3673 | SHARED_VERSION_INFO="5:4:2" # CURRENT:REVISION:AGE | ||
3674 | |||
3675 | -am__api_version='1.10' | ||
3676 | +am__api_version='1.11' | ||
3677 | |||
3678 | ac_aux_dir= | ||
3679 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | ||
3680 | @@ -2157,9 +2811,7 @@ | ||
3681 | fi | ||
3682 | done | ||
3683 | if test -z "$ac_aux_dir"; then | ||
3684 | - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 | ||
3685 | -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} | ||
3686 | - { (exit 1); exit 1; }; } | ||
3687 | + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 | ||
3688 | fi | ||
3689 | |||
3690 | # These three variables are undocumented and unsupported, | ||
3691 | @@ -2185,10 +2837,10 @@ | ||
3692 | # OS/2's system install, which has a completely different semantic | ||
3693 | # ./install, which can be erroneously created by make from ./install.sh. | ||
3694 | # Reject install programs that cannot install multiple files. | ||
3695 | -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
3696 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 | ||
3697 | $as_echo_n "checking for a BSD-compatible install... " >&6; } | ||
3698 | if test -z "$INSTALL"; then | ||
3699 | -if test "${ac_cv_path_install+set}" = set; then | ||
3700 | +if test "${ac_cv_path_install+set}" = set; then : | ||
3701 | $as_echo_n "(cached) " >&6 | ||
3702 | else | ||
3703 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3704 | @@ -2196,11 +2848,11 @@ | ||
3705 | do | ||
3706 | IFS=$as_save_IFS | ||
3707 | test -z "$as_dir" && as_dir=. | ||
3708 | - # Account for people who put trailing slashes in PATH elements. | ||
3709 | -case $as_dir/ in | ||
3710 | - ./ | .// | /cC/* | \ | ||
3711 | + # Account for people who put trailing slashes in PATH elements. | ||
3712 | +case $as_dir/ in #(( | ||
3713 | + ./ | .// | /[cC]/* | \ | ||
3714 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | ||
3715 | - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ | ||
3716 | + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ | ||
3717 | /usr/ucb/* ) ;; | ||
3718 | *) | ||
3719 | # OSF1 and SCO ODT 3.0 have their own names for install. | ||
3720 | @@ -2237,7 +2889,7 @@ | ||
3721 | ;; | ||
3722 | esac | ||
3723 | |||
3724 | -done | ||
3725 | + done | ||
3726 | IFS=$as_save_IFS | ||
3727 | |||
3728 | rm -rf conftest.one conftest.two conftest.dir | ||
3729 | @@ -2253,7 +2905,7 @@ | ||
3730 | INSTALL=$ac_install_sh | ||
3731 | fi | ||
3732 | fi | ||
3733 | -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 | ||
3734 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 | ||
3735 | $as_echo "$INSTALL" >&6; } | ||
3736 | |||
3737 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
3738 | @@ -2264,21 +2916,34 @@ | ||
3739 | |||
3740 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | ||
3741 | |||
3742 | -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 | ||
3743 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 | ||
3744 | $as_echo_n "checking whether build environment is sane... " >&6; } | ||
3745 | # Just in case | ||
3746 | sleep 1 | ||
3747 | echo timestamp > conftest.file | ||
3748 | +# Reject unsafe characters in $srcdir or the absolute working directory | ||
3749 | +# name. Accept space and tab only in the latter. | ||
3750 | +am_lf=' | ||
3751 | +' | ||
3752 | +case `pwd` in | ||
3753 | + *[\\\"\#\$\&\'\`$am_lf]*) | ||
3754 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; | ||
3755 | +esac | ||
3756 | +case $srcdir in | ||
3757 | + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | ||
3758 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; | ||
3759 | +esac | ||
3760 | + | ||
3761 | # Do `set' in a subshell so we don't clobber the current shell's | ||
3762 | # arguments. Must try -L first in case configure is actually a | ||
3763 | # symlink; some systems play weird games with the mod time of symlinks | ||
3764 | # (eg FreeBSD returns the mod time of the symlink's containing | ||
3765 | # directory). | ||
3766 | if ( | ||
3767 | - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` | ||
3768 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | ||
3769 | if test "$*" = "X"; then | ||
3770 | # -L didn't work. | ||
3771 | - set X `ls -t $srcdir/configure conftest.file` | ||
3772 | + set X `ls -t "$srcdir/configure" conftest.file` | ||
3773 | fi | ||
3774 | rm -f conftest.file | ||
3775 | if test "$*" != "X $srcdir/configure conftest.file" \ | ||
3776 | @@ -2288,11 +2953,8 @@ | ||
3777 | # if, for instance, CONFIG_SHELL is bash and it inherits a | ||
3778 | # broken ls alias from the environment. This has actually | ||
3779 | # happened. Such a system could not be considered "sane". | ||
3780 | - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken | ||
3781 | -alias in your environment" >&5 | ||
3782 | -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken | ||
3783 | -alias in your environment" >&2;} | ||
3784 | - { (exit 1); exit 1; }; } | ||
3785 | + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken | ||
3786 | +alias in your environment" "$LINENO" 5 | ||
3787 | fi | ||
3788 | |||
3789 | test "$2" = conftest.file | ||
3790 | @@ -2301,13 +2963,10 @@ | ||
3791 | # Ok. | ||
3792 | : | ||
3793 | else | ||
3794 | - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! | ||
3795 | -Check your system clock" >&5 | ||
3796 | -$as_echo "$as_me: error: newly created file is older than distributed files! | ||
3797 | -Check your system clock" >&2;} | ||
3798 | - { (exit 1); exit 1; }; } | ||
3799 | + as_fn_error $? "newly created file is older than distributed files! | ||
3800 | +Check your system clock" "$LINENO" 5 | ||
3801 | fi | ||
3802 | -{ $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
3803 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3804 | $as_echo "yes" >&6; } | ||
3805 | test "$program_prefix" != NONE && | ||
3806 | program_transform_name="s&^&$program_prefix&;$program_transform_name" | ||
3807 | @@ -2322,20 +2981,136 @@ | ||
3808 | # expand $ac_aux_dir to an absolute path | ||
3809 | am_aux_dir=`cd $ac_aux_dir && pwd` | ||
3810 | |||
3811 | -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" | ||
3812 | +if test x"${MISSING+set}" != xset; then | ||
3813 | + case $am_aux_dir in | ||
3814 | + *\ * | *\ *) | ||
3815 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
3816 | + *) | ||
3817 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
3818 | + esac | ||
3819 | +fi | ||
3820 | # Use eval to expand $SHELL | ||
3821 | if eval "$MISSING --run true"; then | ||
3822 | am_missing_run="$MISSING --run " | ||
3823 | else | ||
3824 | am_missing_run= | ||
3825 | - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 | ||
3826 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 | ||
3827 | $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} | ||
3828 | fi | ||
3829 | |||
3830 | -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 | ||
3831 | +if test x"${install_sh}" != xset; then | ||
3832 | + case $am_aux_dir in | ||
3833 | + *\ * | *\ *) | ||
3834 | + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | ||
3835 | + *) | ||
3836 | + install_sh="\${SHELL} $am_aux_dir/install-sh" | ||
3837 | + esac | ||
3838 | +fi | ||
3839 | + | ||
3840 | +# Installed binaries are usually stripped using `strip' when the user | ||
3841 | +# run `make install-strip'. However `strip' might not be the right | ||
3842 | +# tool to use in cross-compilation environments, therefore Automake | ||
3843 | +# will honor the `STRIP' environment variable to overrule this program. | ||
3844 | +if test "$cross_compiling" != no; then | ||
3845 | + if test -n "$ac_tool_prefix"; then | ||
3846 | + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
3847 | +set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
3848 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3849 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
3850 | +if test "${ac_cv_prog_STRIP+set}" = set; then : | ||
3851 | + $as_echo_n "(cached) " >&6 | ||
3852 | +else | ||
3853 | + if test -n "$STRIP"; then | ||
3854 | + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. | ||
3855 | +else | ||
3856 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3857 | +for as_dir in $PATH | ||
3858 | +do | ||
3859 | + IFS=$as_save_IFS | ||
3860 | + test -z "$as_dir" && as_dir=. | ||
3861 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
3862 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
3863 | + ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
3864 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3865 | + break 2 | ||
3866 | + fi | ||
3867 | +done | ||
3868 | + done | ||
3869 | +IFS=$as_save_IFS | ||
3870 | + | ||
3871 | +fi | ||
3872 | +fi | ||
3873 | +STRIP=$ac_cv_prog_STRIP | ||
3874 | +if test -n "$STRIP"; then | ||
3875 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 | ||
3876 | +$as_echo "$STRIP" >&6; } | ||
3877 | +else | ||
3878 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3879 | +$as_echo "no" >&6; } | ||
3880 | +fi | ||
3881 | + | ||
3882 | + | ||
3883 | +fi | ||
3884 | +if test -z "$ac_cv_prog_STRIP"; then | ||
3885 | + ac_ct_STRIP=$STRIP | ||
3886 | + # Extract the first word of "strip", so it can be a program name with args. | ||
3887 | +set dummy strip; ac_word=$2 | ||
3888 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3889 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
3890 | +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : | ||
3891 | + $as_echo_n "(cached) " >&6 | ||
3892 | +else | ||
3893 | + if test -n "$ac_ct_STRIP"; then | ||
3894 | + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. | ||
3895 | +else | ||
3896 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3897 | +for as_dir in $PATH | ||
3898 | +do | ||
3899 | + IFS=$as_save_IFS | ||
3900 | + test -z "$as_dir" && as_dir=. | ||
3901 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
3902 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
3903 | + ac_cv_prog_ac_ct_STRIP="strip" | ||
3904 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3905 | + break 2 | ||
3906 | + fi | ||
3907 | +done | ||
3908 | + done | ||
3909 | +IFS=$as_save_IFS | ||
3910 | + | ||
3911 | +fi | ||
3912 | +fi | ||
3913 | +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
3914 | +if test -n "$ac_ct_STRIP"; then | ||
3915 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 | ||
3916 | +$as_echo "$ac_ct_STRIP" >&6; } | ||
3917 | +else | ||
3918 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3919 | +$as_echo "no" >&6; } | ||
3920 | +fi | ||
3921 | + | ||
3922 | + if test "x$ac_ct_STRIP" = x; then | ||
3923 | + STRIP=":" | ||
3924 | + else | ||
3925 | + case $cross_compiling:$ac_tool_warned in | ||
3926 | +yes:) | ||
3927 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
3928 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
3929 | +ac_tool_warned=yes ;; | ||
3930 | +esac | ||
3931 | + STRIP=$ac_ct_STRIP | ||
3932 | + fi | ||
3933 | +else | ||
3934 | + STRIP="$ac_cv_prog_STRIP" | ||
3935 | +fi | ||
3936 | + | ||
3937 | +fi | ||
3938 | +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
3939 | + | ||
3940 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 | ||
3941 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } | ||
3942 | if test -z "$MKDIR_P"; then | ||
3943 | - if test "${ac_cv_path_mkdir+set}" = set; then | ||
3944 | + if test "${ac_cv_path_mkdir+set}" = set; then : | ||
3945 | $as_echo_n "(cached) " >&6 | ||
3946 | else | ||
3947 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3948 | @@ -2343,7 +3118,7 @@ | ||
3949 | do | ||
3950 | IFS=$as_save_IFS | ||
3951 | test -z "$as_dir" && as_dir=. | ||
3952 | - for ac_prog in mkdir gmkdir; do | ||
3953 | + for ac_prog in mkdir gmkdir; do | ||
3954 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3955 | { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue | ||
3956 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( | ||
3957 | @@ -2355,11 +3130,12 @@ | ||
3958 | esac | ||
3959 | done | ||
3960 | done | ||
3961 | -done | ||
3962 | + done | ||
3963 | IFS=$as_save_IFS | ||
3964 | |||
3965 | fi | ||
3966 | |||
3967 | + test -d ./--version && rmdir ./--version | ||
3968 | if test "${ac_cv_path_mkdir+set}" = set; then | ||
3969 | MKDIR_P="$ac_cv_path_mkdir -p" | ||
3970 | else | ||
3971 | @@ -2367,11 +3143,10 @@ | ||
3972 | # value for MKDIR_P within a source directory, because that will | ||
3973 | # break other packages using the cache if that directory is | ||
3974 | # removed, or if the value is a relative name. | ||
3975 | - test -d ./--version && rmdir ./--version | ||
3976 | MKDIR_P="$ac_install_sh -d" | ||
3977 | fi | ||
3978 | fi | ||
3979 | -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 | ||
3980 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 | ||
3981 | $as_echo "$MKDIR_P" >&6; } | ||
3982 | |||
3983 | mkdir_p="$MKDIR_P" | ||
3984 | @@ -2384,9 +3159,9 @@ | ||
3985 | do | ||
3986 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
3987 | set dummy $ac_prog; ac_word=$2 | ||
3988 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3989 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3990 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3991 | -if test "${ac_cv_prog_AWK+set}" = set; then | ||
3992 | +if test "${ac_cv_prog_AWK+set}" = set; then : | ||
3993 | $as_echo_n "(cached) " >&6 | ||
3994 | else | ||
3995 | if test -n "$AWK"; then | ||
3996 | @@ -2397,24 +3172,24 @@ | ||
3997 | do | ||
3998 | IFS=$as_save_IFS | ||
3999 | test -z "$as_dir" && as_dir=. | ||
4000 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4001 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4002 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4003 | ac_cv_prog_AWK="$ac_prog" | ||
4004 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4005 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4006 | break 2 | ||
4007 | fi | ||
4008 | done | ||
4009 | -done | ||
4010 | + done | ||
4011 | IFS=$as_save_IFS | ||
4012 | |||
4013 | fi | ||
4014 | fi | ||
4015 | AWK=$ac_cv_prog_AWK | ||
4016 | if test -n "$AWK"; then | ||
4017 | - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 | ||
4018 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 | ||
4019 | $as_echo "$AWK" >&6; } | ||
4020 | else | ||
4021 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4022 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4023 | $as_echo "no" >&6; } | ||
4024 | fi | ||
4025 | |||
4026 | @@ -2422,11 +3197,11 @@ | ||
4027 | test -n "$AWK" && break | ||
4028 | done | ||
4029 | |||
4030 | -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
4031 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
4032 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } | ||
4033 | set x ${MAKE-make} | ||
4034 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | ||
4035 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4036 | +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : | ||
4037 | $as_echo_n "(cached) " >&6 | ||
4038 | else | ||
4039 | cat >conftest.make <<\_ACEOF | ||
4040 | @@ -2434,7 +3209,7 @@ | ||
4041 | all: | ||
4042 | @echo '@@@%%%=$(MAKE)=@@@%%%' | ||
4043 | _ACEOF | ||
4044 | -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. | ||
4045 | +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. | ||
4046 | case `${MAKE-make} -f conftest.make 2>/dev/null` in | ||
4047 | *@@@%%%=?*=@@@%%%*) | ||
4048 | eval ac_cv_prog_make_${ac_make}_set=yes;; | ||
4049 | @@ -2444,11 +3219,11 @@ | ||
4050 | rm -f conftest.make | ||
4051 | fi | ||
4052 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | ||
4053 | - { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
4054 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
4055 | $as_echo "yes" >&6; } | ||
4056 | SET_MAKE= | ||
4057 | else | ||
4058 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4059 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4060 | $as_echo "no" >&6; } | ||
4061 | SET_MAKE="MAKE=${MAKE-make}" | ||
4062 | fi | ||
4063 | @@ -2468,9 +3243,7 @@ | ||
4064 | am__isrc=' -I$(srcdir)' | ||
4065 | # test to see if srcdir already configured | ||
4066 | if test -f $srcdir/config.status; then | ||
4067 | - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 | ||
4068 | -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} | ||
4069 | - { (exit 1); exit 1; }; } | ||
4070 | + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 | ||
4071 | fi | ||
4072 | fi | ||
4073 | |||
4074 | @@ -2514,108 +3287,6 @@ | ||
4075 | |||
4076 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | ||
4077 | |||
4078 | -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} | ||
4079 | - | ||
4080 | -# Installed binaries are usually stripped using `strip' when the user | ||
4081 | -# run `make install-strip'. However `strip' might not be the right | ||
4082 | -# tool to use in cross-compilation environments, therefore Automake | ||
4083 | -# will honor the `STRIP' environment variable to overrule this program. | ||
4084 | -if test "$cross_compiling" != no; then | ||
4085 | - if test -n "$ac_tool_prefix"; then | ||
4086 | - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
4087 | -set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
4088 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4089 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
4090 | -if test "${ac_cv_prog_STRIP+set}" = set; then | ||
4091 | - $as_echo_n "(cached) " >&6 | ||
4092 | -else | ||
4093 | - if test -n "$STRIP"; then | ||
4094 | - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. | ||
4095 | -else | ||
4096 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4097 | -for as_dir in $PATH | ||
4098 | -do | ||
4099 | - IFS=$as_save_IFS | ||
4100 | - test -z "$as_dir" && as_dir=. | ||
4101 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4102 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4103 | - ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
4104 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4105 | - break 2 | ||
4106 | - fi | ||
4107 | -done | ||
4108 | -done | ||
4109 | -IFS=$as_save_IFS | ||
4110 | - | ||
4111 | -fi | ||
4112 | -fi | ||
4113 | -STRIP=$ac_cv_prog_STRIP | ||
4114 | -if test -n "$STRIP"; then | ||
4115 | - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 | ||
4116 | -$as_echo "$STRIP" >&6; } | ||
4117 | -else | ||
4118 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4119 | -$as_echo "no" >&6; } | ||
4120 | -fi | ||
4121 | - | ||
4122 | - | ||
4123 | -fi | ||
4124 | -if test -z "$ac_cv_prog_STRIP"; then | ||
4125 | - ac_ct_STRIP=$STRIP | ||
4126 | - # Extract the first word of "strip", so it can be a program name with args. | ||
4127 | -set dummy strip; ac_word=$2 | ||
4128 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4129 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
4130 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | ||
4131 | - $as_echo_n "(cached) " >&6 | ||
4132 | -else | ||
4133 | - if test -n "$ac_ct_STRIP"; then | ||
4134 | - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. | ||
4135 | -else | ||
4136 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4137 | -for as_dir in $PATH | ||
4138 | -do | ||
4139 | - IFS=$as_save_IFS | ||
4140 | - test -z "$as_dir" && as_dir=. | ||
4141 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4142 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4143 | - ac_cv_prog_ac_ct_STRIP="strip" | ||
4144 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4145 | - break 2 | ||
4146 | - fi | ||
4147 | -done | ||
4148 | -done | ||
4149 | -IFS=$as_save_IFS | ||
4150 | - | ||
4151 | -fi | ||
4152 | -fi | ||
4153 | -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
4154 | -if test -n "$ac_ct_STRIP"; then | ||
4155 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | ||
4156 | -$as_echo "$ac_ct_STRIP" >&6; } | ||
4157 | -else | ||
4158 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4159 | -$as_echo "no" >&6; } | ||
4160 | -fi | ||
4161 | - | ||
4162 | - if test "x$ac_ct_STRIP" = x; then | ||
4163 | - STRIP=":" | ||
4164 | - else | ||
4165 | - case $cross_compiling:$ac_tool_warned in | ||
4166 | -yes:) | ||
4167 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4168 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
4169 | -ac_tool_warned=yes ;; | ||
4170 | -esac | ||
4171 | - STRIP=$ac_ct_STRIP | ||
4172 | - fi | ||
4173 | -else | ||
4174 | - STRIP="$ac_cv_prog_STRIP" | ||
4175 | -fi | ||
4176 | - | ||
4177 | -fi | ||
4178 | -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
4179 | - | ||
4180 | # We need awk for the "check" target. The system "awk" is bad on | ||
4181 | # some platforms. | ||
4182 | # Always define AMTAR for backward compatibility. | ||
4183 | @@ -2631,16 +3302,17 @@ | ||
4184 | ac_config_headers="$ac_config_headers config.h" | ||
4185 | |||
4186 | |||
4187 | -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | ||
4188 | + | ||
4189 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 | ||
4190 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } | ||
4191 | # Check whether --enable-maintainer-mode was given. | ||
4192 | -if test "${enable_maintainer_mode+set}" = set; then | ||
4193 | +if test "${enable_maintainer_mode+set}" = set; then : | ||
4194 | enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval | ||
4195 | else | ||
4196 | USE_MAINTAINER_MODE=no | ||
4197 | fi | ||
4198 | |||
4199 | - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | ||
4200 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 | ||
4201 | $as_echo "$USE_MAINTAINER_MODE" >&6; } | ||
4202 | if test $USE_MAINTAINER_MODE = yes; then | ||
4203 | MAINTAINER_MODE_TRUE= | ||
4204 | @@ -2655,7 +3327,7 @@ | ||
4205 | |||
4206 | |||
4207 | # Check whether --enable-shared was given. | ||
4208 | -if test "${enable_shared+set}" = set; then | ||
4209 | +if test "${enable_shared+set}" = set; then : | ||
4210 | enableval=$enable_shared; p=${PACKAGE-default} | ||
4211 | case $enableval in | ||
4212 | yes) enable_shared=yes ;; | ||
4213 | @@ -2686,35 +3358,27 @@ | ||
4214 | |||
4215 | # Make sure we can run config.sub. | ||
4216 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | ||
4217 | - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | ||
4218 | -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | ||
4219 | - { (exit 1); exit 1; }; } | ||
4220 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 | ||
4221 | |||
4222 | -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 | ||
4223 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 | ||
4224 | $as_echo_n "checking build system type... " >&6; } | ||
4225 | -if test "${ac_cv_build+set}" = set; then | ||
4226 | +if test "${ac_cv_build+set}" = set; then : | ||
4227 | $as_echo_n "(cached) " >&6 | ||
4228 | else | ||
4229 | ac_build_alias=$build_alias | ||
4230 | test "x$ac_build_alias" = x && | ||
4231 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | ||
4232 | test "x$ac_build_alias" = x && | ||
4233 | - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | ||
4234 | -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
4235 | - { (exit 1); exit 1; }; } | ||
4236 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 | ||
4237 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | ||
4238 | - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | ||
4239 | -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | ||
4240 | - { (exit 1); exit 1; }; } | ||
4241 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 | ||
4242 | |||
4243 | fi | ||
4244 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | ||
4245 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 | ||
4246 | $as_echo "$ac_cv_build" >&6; } | ||
4247 | case $ac_cv_build in | ||
4248 | *-*-*) ;; | ||
4249 | -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | ||
4250 | -$as_echo "$as_me: error: invalid value of canonical build" >&2;} | ||
4251 | - { (exit 1); exit 1; }; };; | ||
4252 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; | ||
4253 | esac | ||
4254 | build=$ac_cv_build | ||
4255 | ac_save_IFS=$IFS; IFS='-' | ||
4256 | @@ -2730,28 +3394,24 @@ | ||
4257 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
4258 | |||
4259 | |||
4260 | -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 | ||
4261 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 | ||
4262 | $as_echo_n "checking host system type... " >&6; } | ||
4263 | -if test "${ac_cv_host+set}" = set; then | ||
4264 | +if test "${ac_cv_host+set}" = set; then : | ||
4265 | $as_echo_n "(cached) " >&6 | ||
4266 | else | ||
4267 | if test "x$host_alias" = x; then | ||
4268 | ac_cv_host=$ac_cv_build | ||
4269 | else | ||
4270 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | ||
4271 | - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | ||
4272 | -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | ||
4273 | - { (exit 1); exit 1; }; } | ||
4274 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 | ||
4275 | fi | ||
4276 | |||
4277 | fi | ||
4278 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | ||
4279 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 | ||
4280 | $as_echo "$ac_cv_host" >&6; } | ||
4281 | case $ac_cv_host in | ||
4282 | *-*-*) ;; | ||
4283 | -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | ||
4284 | -$as_echo "$as_me: error: invalid value of canonical host" >&2;} | ||
4285 | - { (exit 1); exit 1; }; };; | ||
4286 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; | ||
4287 | esac | ||
4288 | host=$ac_cv_host | ||
4289 | ac_save_IFS=$IFS; IFS='-' | ||
4290 | @@ -2777,21 +3437,19 @@ | ||
4291 | esac | ||
4292 | |||
4293 | # Check whether --enable-fma was given. | ||
4294 | -if test "${enable_fma+set}" = set; then | ||
4295 | +if test "${enable_fma+set}" = set; then : | ||
4296 | enableval=$enable_fma; have_fma=$enableval | ||
4297 | fi | ||
4298 | |||
4299 | if test "$have_fma"x = "yes"x; then | ||
4300 | |||
4301 | -cat >>confdefs.h <<\_ACEOF | ||
4302 | -#define HAVE_FMA 1 | ||
4303 | -_ACEOF | ||
4304 | +$as_echo "#define HAVE_FMA 1" >>confdefs.h | ||
4305 | |||
4306 | fi | ||
4307 | |||
4308 | |||
4309 | # Check whether --enable-debug was given. | ||
4310 | -if test "${enable_debug+set}" = set; then | ||
4311 | +if test "${enable_debug+set}" = set; then : | ||
4312 | enableval=$enable_debug; ok=$enableval | ||
4313 | else | ||
4314 | ok=no | ||
4315 | @@ -2799,9 +3457,7 @@ | ||
4316 | |||
4317 | if test "$ok" = "yes"; then | ||
4318 | |||
4319 | -cat >>confdefs.h <<\_ACEOF | ||
4320 | -#define FFTW_DEBUG 1 | ||
4321 | -_ACEOF | ||
4322 | +$as_echo "#define FFTW_DEBUG 1" >>confdefs.h | ||
4323 | |||
4324 | debug_malloc=yes | ||
4325 | else | ||
4326 | @@ -2809,7 +3465,7 @@ | ||
4327 | fi | ||
4328 | |||
4329 | # Check whether --enable-debug-malloc was given. | ||
4330 | -if test "${enable_debug_malloc+set}" = set; then | ||
4331 | +if test "${enable_debug_malloc+set}" = set; then : | ||
4332 | enableval=$enable_debug_malloc; ok=$enableval | ||
4333 | else | ||
4334 | ok=$debug_malloc | ||
4335 | @@ -2817,14 +3473,12 @@ | ||
4336 | |||
4337 | if test "$ok" = "yes"; then | ||
4338 | |||
4339 | -cat >>confdefs.h <<\_ACEOF | ||
4340 | -#define FFTW_DEBUG_MALLOC 1 | ||
4341 | -_ACEOF | ||
4342 | +$as_echo "#define FFTW_DEBUG_MALLOC 1" >>confdefs.h | ||
4343 | |||
4344 | fi | ||
4345 | |||
4346 | # Check whether --enable-debug-alignment was given. | ||
4347 | -if test "${enable_debug_alignment+set}" = set; then | ||
4348 | +if test "${enable_debug_alignment+set}" = set; then : | ||
4349 | enableval=$enable_debug_alignment; ok=$enableval | ||
4350 | else | ||
4351 | ok=no | ||
4352 | @@ -2832,14 +3486,12 @@ | ||
4353 | |||
4354 | if test "$ok" = "yes"; then | ||
4355 | |||
4356 | -cat >>confdefs.h <<\_ACEOF | ||
4357 | -#define FFTW_DEBUG_ALIGNMENT 1 | ||
4358 | -_ACEOF | ||
4359 | +$as_echo "#define FFTW_DEBUG_ALIGNMENT 1" >>confdefs.h | ||
4360 | |||
4361 | fi | ||
4362 | |||
4363 | # Check whether --enable-alloca was given. | ||
4364 | -if test "${enable_alloca+set}" = set; then | ||
4365 | +if test "${enable_alloca+set}" = set; then : | ||
4366 | enableval=$enable_alloca; ok=$enableval | ||
4367 | else | ||
4368 | ok=yes | ||
4369 | @@ -2847,34 +3499,28 @@ | ||
4370 | |||
4371 | if test "$ok" = "yes"; then | ||
4372 | |||
4373 | -cat >>confdefs.h <<\_ACEOF | ||
4374 | -#define FFTW_ENABLE_ALLOCA 1 | ||
4375 | -_ACEOF | ||
4376 | +$as_echo "#define FFTW_ENABLE_ALLOCA 1" >>confdefs.h | ||
4377 | |||
4378 | fi | ||
4379 | |||
4380 | # Check whether --enable-single was given. | ||
4381 | -if test "${enable_single+set}" = set; then | ||
4382 | +if test "${enable_single+set}" = set; then : | ||
4383 | enableval=$enable_single; ok=$enableval | ||
4384 | else | ||
4385 | ok=no | ||
4386 | fi | ||
4387 | |||
4388 | # Check whether --enable-float was given. | ||
4389 | -if test "${enable_float+set}" = set; then | ||
4390 | +if test "${enable_float+set}" = set; then : | ||
4391 | enableval=$enable_float; ok=$enableval | ||
4392 | fi | ||
4393 | |||
4394 | if test "$ok" = "yes"; then | ||
4395 | |||
4396 | -cat >>confdefs.h <<\_ACEOF | ||
4397 | -#define FFTW_SINGLE 1 | ||
4398 | -_ACEOF | ||
4399 | +$as_echo "#define FFTW_SINGLE 1" >>confdefs.h | ||
4400 | |||
4401 | |||
4402 | -cat >>confdefs.h <<\_ACEOF | ||
4403 | -#define BENCHFFT_SINGLE 1 | ||
4404 | -_ACEOF | ||
4405 | +$as_echo "#define BENCHFFT_SINGLE 1" >>confdefs.h | ||
4406 | |||
4407 | PRECISION=s | ||
4408 | else | ||
4409 | @@ -2890,7 +3536,7 @@ | ||
4410 | |||
4411 | |||
4412 | # Check whether --enable-long-double was given. | ||
4413 | -if test "${enable_long_double+set}" = set; then | ||
4414 | +if test "${enable_long_double+set}" = set; then : | ||
4415 | enableval=$enable_long_double; ok=$enableval | ||
4416 | else | ||
4417 | ok=no | ||
4418 | @@ -2898,19 +3544,13 @@ | ||
4419 | |||
4420 | if test "$ok" = "yes"; then | ||
4421 | if test "$PRECISION" = "s"; then | ||
4422 | - { { $as_echo "$as_me:$LINENO: error: --enable-single/--enable-long-double conflict" >&5 | ||
4423 | -$as_echo "$as_me: error: --enable-single/--enable-long-double conflict" >&2;} | ||
4424 | - { (exit 1); exit 1; }; } | ||
4425 | + as_fn_error $? "--enable-single/--enable-long-double conflict" "$LINENO" 5 | ||
4426 | fi | ||
4427 | |||
4428 | -cat >>confdefs.h <<\_ACEOF | ||
4429 | -#define FFTW_LDOUBLE 1 | ||
4430 | -_ACEOF | ||
4431 | +$as_echo "#define FFTW_LDOUBLE 1" >>confdefs.h | ||
4432 | |||
4433 | |||
4434 | -cat >>confdefs.h <<\_ACEOF | ||
4435 | -#define BENCHFFT_LDOUBLE 1 | ||
4436 | -_ACEOF | ||
4437 | +$as_echo "#define BENCHFFT_LDOUBLE 1" >>confdefs.h | ||
4438 | |||
4439 | PRECISION=l | ||
4440 | fi | ||
4441 | @@ -2928,7 +3568,7 @@ | ||
4442 | simd_precision="s" | ||
4443 | |||
4444 | # Check whether --enable-sse was given. | ||
4445 | -if test "${enable_sse+set}" = set; then | ||
4446 | +if test "${enable_sse+set}" = set; then : | ||
4447 | enableval=$enable_sse; have_sse=$enableval | ||
4448 | else | ||
4449 | have_sse=no | ||
4450 | @@ -2936,15 +3576,13 @@ | ||
4451 | |||
4452 | if test "$have_sse" = "yes"; then | ||
4453 | |||
4454 | -cat >>confdefs.h <<\_ACEOF | ||
4455 | -#define HAVE_SSE 1 | ||
4456 | -_ACEOF | ||
4457 | +$as_echo "#define HAVE_SSE 1" >>confdefs.h | ||
4458 | |||
4459 | have_simd="yes" | ||
4460 | fi | ||
4461 | |||
4462 | # Check whether --enable-sse2 was given. | ||
4463 | -if test "${enable_sse2+set}" = set; then | ||
4464 | +if test "${enable_sse2+set}" = set; then : | ||
4465 | enableval=$enable_sse2; have_sse2=$enableval | ||
4466 | else | ||
4467 | have_sse2=no | ||
4468 | @@ -2952,21 +3590,17 @@ | ||
4469 | |||
4470 | if test "$have_sse2" = "yes"; then | ||
4471 | |||
4472 | -cat >>confdefs.h <<\_ACEOF | ||
4473 | -#define HAVE_SSE2 1 | ||
4474 | -_ACEOF | ||
4475 | +$as_echo "#define HAVE_SSE2 1" >>confdefs.h | ||
4476 | |||
4477 | have_simd="yes" | ||
4478 | simd_precision="d" | ||
4479 | if test "$have_sse" = "yes"; then | ||
4480 | - { { $as_echo "$as_me:$LINENO: error: you cannot use SSE and SSE2 at the same time" >&5 | ||
4481 | -$as_echo "$as_me: error: you cannot use SSE and SSE2 at the same time" >&2;} | ||
4482 | - { (exit 1); exit 1; }; } | ||
4483 | + as_fn_error $? "you cannot use SSE and SSE2 at the same time" "$LINENO" 5 | ||
4484 | fi | ||
4485 | fi | ||
4486 | |||
4487 | # Check whether --enable-altivec was given. | ||
4488 | -if test "${enable_altivec+set}" = set; then | ||
4489 | +if test "${enable_altivec+set}" = set; then : | ||
4490 | enableval=$enable_altivec; have_altivec=$enableval | ||
4491 | else | ||
4492 | have_altivec=no | ||
4493 | @@ -2974,15 +3608,27 @@ | ||
4494 | |||
4495 | if test "$have_altivec" = "yes"; then | ||
4496 | |||
4497 | -cat >>confdefs.h <<\_ACEOF | ||
4498 | -#define HAVE_ALTIVEC 1 | ||
4499 | -_ACEOF | ||
4500 | +$as_echo "#define HAVE_ALTIVEC 1" >>confdefs.h | ||
4501 | + | ||
4502 | + have_simd="yes" | ||
4503 | +fi | ||
4504 | + | ||
4505 | +# Check whether --enable-neon was given. | ||
4506 | +if test "${enable_neon+set}" = set; then : | ||
4507 | + enableval=$enable_neon; have_neon=$enableval | ||
4508 | +else | ||
4509 | + have_neon=no | ||
4510 | +fi | ||
4511 | + | ||
4512 | +if test "$have_neon" = "yes"; then | ||
4513 | + | ||
4514 | +$as_echo "#define HAVE_NEON 1" >>confdefs.h | ||
4515 | |||
4516 | have_simd="yes" | ||
4517 | fi | ||
4518 | |||
4519 | # Check whether --enable-mips-ps was given. | ||
4520 | -if test "${enable_mips_ps+set}" = set; then | ||
4521 | +if test "${enable_mips_ps+set}" = set; then : | ||
4522 | enableval=$enable_mips_ps; have_mips_ps=$enableval | ||
4523 | else | ||
4524 | have_mips_ps=no | ||
4525 | @@ -2990,21 +3636,17 @@ | ||
4526 | |||
4527 | if test "$have_mips_ps" = "yes"; then | ||
4528 | |||
4529 | -cat >>confdefs.h <<\_ACEOF | ||
4530 | -#define HAVE_MIPS_PS 1 | ||
4531 | -_ACEOF | ||
4532 | +$as_echo "#define HAVE_MIPS_PS 1" >>confdefs.h | ||
4533 | |||
4534 | have_simd="yes" | ||
4535 | fi | ||
4536 | |||
4537 | if test "$PRECISION" != "$simd_precision" && test "$have_simd" = "yes"; then | ||
4538 | - { { $as_echo "$as_me:$LINENO: error: requested SIMD type does not match selected precision" >&5 | ||
4539 | -$as_echo "$as_me: error: requested SIMD type does not match selected precision" >&2;} | ||
4540 | - { (exit 1); exit 1; }; } | ||
4541 | + as_fn_error $? "requested SIMD type does not match selected precision" "$LINENO" 5 | ||
4542 | fi | ||
4543 | |||
4544 | # Check whether --enable-cell was given. | ||
4545 | -if test "${enable_cell+set}" = set; then | ||
4546 | +if test "${enable_cell+set}" = set; then : | ||
4547 | enableval=$enable_cell; have_cell=$enableval | ||
4548 | else | ||
4549 | have_cell=no | ||
4550 | @@ -3012,14 +3654,10 @@ | ||
4551 | |||
4552 | if test "$have_cell" = "yes"; then | ||
4553 | |||
4554 | -cat >>confdefs.h <<\_ACEOF | ||
4555 | -#define HAVE_CELL 1 | ||
4556 | -_ACEOF | ||
4557 | +$as_echo "#define HAVE_CELL 1" >>confdefs.h | ||
4558 | |||
4559 | if test "$PRECISION" = "l"; then | ||
4560 | - { { $as_echo "$as_me:$LINENO: error: Cell does not support long double" >&5 | ||
4561 | -$as_echo "$as_me: error: Cell does not support long double" >&2;} | ||
4562 | - { (exit 1); exit 1; }; } | ||
4563 | + as_fn_error $? "Cell does not support long double" "$LINENO" 5 | ||
4564 | fi | ||
4565 | fi | ||
4566 | |||
4567 | @@ -3042,7 +3680,7 @@ | ||
4568 | |||
4569 | |||
4570 | # Check whether --with-slow-timer was given. | ||
4571 | -if test "${with_slow_timer+set}" = set; then | ||
4572 | +if test "${with_slow_timer+set}" = set; then : | ||
4573 | withval=$with_slow_timer; with_slow_timer=$withval | ||
4574 | else | ||
4575 | with_slow_timer=no | ||
4576 | @@ -3050,14 +3688,12 @@ | ||
4577 | |||
4578 | if test "$with_slow_timer" = "yes"; then | ||
4579 | |||
4580 | -cat >>confdefs.h <<\_ACEOF | ||
4581 | -#define WITH_SLOW_TIMER 1 | ||
4582 | -_ACEOF | ||
4583 | +$as_echo "#define WITH_SLOW_TIMER 1" >>confdefs.h | ||
4584 | |||
4585 | fi | ||
4586 | |||
4587 | # Check whether --enable-mips_zbus_timer was given. | ||
4588 | -if test "${enable_mips_zbus_timer+set}" = set; then | ||
4589 | +if test "${enable_mips_zbus_timer+set}" = set; then : | ||
4590 | enableval=$enable_mips_zbus_timer; have_mips_zbus_timer=$enableval | ||
4591 | else | ||
4592 | have_mips_zbus_timer=no | ||
4593 | @@ -3065,15 +3701,39 @@ | ||
4594 | |||
4595 | if test "$have_mips_zbus_timer" = "yes"; then | ||
4596 | |||
4597 | -cat >>confdefs.h <<\_ACEOF | ||
4598 | -#define HAVE_MIPS_ZBUS_TIMER 1 | ||
4599 | -_ACEOF | ||
4600 | +$as_echo "#define HAVE_MIPS_ZBUS_TIMER 1" >>confdefs.h | ||
4601 | + | ||
4602 | +fi | ||
4603 | + | ||
4604 | +# Check whether --enable-armv7a-cycle-counter was given. | ||
4605 | +if test "${enable_armv7a_cycle_counter+set}" = set; then : | ||
4606 | + enableval=$enable_armv7a_cycle_counter; have_arm_cycle_counter=$enableval | ||
4607 | +else | ||
4608 | + have_arm_cycle_counter=no | ||
4609 | +fi | ||
4610 | + | ||
4611 | +if test "$have_arm_cycle_counter" = "yes"; then | ||
4612 | + | ||
4613 | +$as_echo "#define HAVE_ARM_CYCLE_COUNTER 1" >>confdefs.h | ||
4614 | + | ||
4615 | +fi | ||
4616 | + | ||
4617 | +# Check whether --enable-perf-events was given. | ||
4618 | +if test "${enable_perf_events+set}" = set; then : | ||
4619 | + enableval=$enable_perf_events; have_perf_events=$enableval | ||
4620 | +else | ||
4621 | + have_perf_events=no | ||
4622 | +fi | ||
4623 | + | ||
4624 | +if test "$have_perf_events" = "yes"; then | ||
4625 | + | ||
4626 | +$as_echo "#define HAVE_PERF_EVENTS 1" >>confdefs.h | ||
4627 | |||
4628 | fi | ||
4629 | |||
4630 | |||
4631 | # Check whether --with-our-malloc16 was given. | ||
4632 | -if test "${with_our_malloc16+set}" = set; then | ||
4633 | +if test "${with_our_malloc16+set}" = set; then : | ||
4634 | withval=$with_our_malloc16; with_our_malloc16=$withval | ||
4635 | else | ||
4636 | with_our_malloc16=no | ||
4637 | @@ -3081,15 +3741,13 @@ | ||
4638 | |||
4639 | if test "$with_our_malloc16" = "yes"; then | ||
4640 | |||
4641 | -cat >>confdefs.h <<\_ACEOF | ||
4642 | -#define WITH_OUR_MALLOC16 1 | ||
4643 | -_ACEOF | ||
4644 | +$as_echo "#define WITH_OUR_MALLOC16 1" >>confdefs.h | ||
4645 | |||
4646 | fi | ||
4647 | |||
4648 | |||
4649 | # Check whether --with-windows-f77-mangling was given. | ||
4650 | -if test "${with_windows_f77_mangling+set}" = set; then | ||
4651 | +if test "${with_windows_f77_mangling+set}" = set; then : | ||
4652 | withval=$with_windows_f77_mangling; with_windows_f77_mangling=$withval | ||
4653 | else | ||
4654 | with_windows_f77_mangling=no | ||
4655 | @@ -3097,9 +3755,7 @@ | ||
4656 | |||
4657 | if test "$with_windows_f77_mangling" = "yes"; then | ||
4658 | |||
4659 | -cat >>confdefs.h <<\_ACEOF | ||
4660 | -#define WINDOWS_F77_MANGLING 1 | ||
4661 | -_ACEOF | ||
4662 | +$as_echo "#define WINDOWS_F77_MANGLING 1" >>confdefs.h | ||
4663 | |||
4664 | fi | ||
4665 | |||
4666 | @@ -3138,9 +3794,9 @@ | ||
4667 | if test -n "$ac_tool_prefix"; then | ||
4668 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | ||
4669 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | ||
4670 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4671 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4672 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4673 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
4674 | +if test "${ac_cv_prog_CC+set}" = set; then : | ||
4675 | $as_echo_n "(cached) " >&6 | ||
4676 | else | ||
4677 | if test -n "$CC"; then | ||
4678 | @@ -3151,24 +3807,24 @@ | ||
4679 | do | ||
4680 | IFS=$as_save_IFS | ||
4681 | test -z "$as_dir" && as_dir=. | ||
4682 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4683 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4684 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4685 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | ||
4686 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4687 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4688 | break 2 | ||
4689 | fi | ||
4690 | done | ||
4691 | -done | ||
4692 | + done | ||
4693 | IFS=$as_save_IFS | ||
4694 | |||
4695 | fi | ||
4696 | fi | ||
4697 | CC=$ac_cv_prog_CC | ||
4698 | if test -n "$CC"; then | ||
4699 | - { $as_echo "$as_me:$LINENO: result: $CC" >&5 | ||
4700 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
4701 | $as_echo "$CC" >&6; } | ||
4702 | else | ||
4703 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4704 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4705 | $as_echo "no" >&6; } | ||
4706 | fi | ||
4707 | |||
4708 | @@ -3178,9 +3834,9 @@ | ||
4709 | ac_ct_CC=$CC | ||
4710 | # Extract the first word of "gcc", so it can be a program name with args. | ||
4711 | set dummy gcc; ac_word=$2 | ||
4712 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4713 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4714 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4715 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
4716 | +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : | ||
4717 | $as_echo_n "(cached) " >&6 | ||
4718 | else | ||
4719 | if test -n "$ac_ct_CC"; then | ||
4720 | @@ -3191,24 +3847,24 @@ | ||
4721 | do | ||
4722 | IFS=$as_save_IFS | ||
4723 | test -z "$as_dir" && as_dir=. | ||
4724 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4725 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4726 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4727 | ac_cv_prog_ac_ct_CC="gcc" | ||
4728 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4729 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4730 | break 2 | ||
4731 | fi | ||
4732 | done | ||
4733 | -done | ||
4734 | + done | ||
4735 | IFS=$as_save_IFS | ||
4736 | |||
4737 | fi | ||
4738 | fi | ||
4739 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
4740 | if test -n "$ac_ct_CC"; then | ||
4741 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
4742 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 | ||
4743 | $as_echo "$ac_ct_CC" >&6; } | ||
4744 | else | ||
4745 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4746 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4747 | $as_echo "no" >&6; } | ||
4748 | fi | ||
4749 | |||
4750 | @@ -3217,7 +3873,7 @@ | ||
4751 | else | ||
4752 | case $cross_compiling:$ac_tool_warned in | ||
4753 | yes:) | ||
4754 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4755 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4756 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
4757 | ac_tool_warned=yes ;; | ||
4758 | esac | ||
4759 | @@ -3231,9 +3887,9 @@ | ||
4760 | if test -n "$ac_tool_prefix"; then | ||
4761 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
4762 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | ||
4763 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4764 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4765 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4766 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
4767 | +if test "${ac_cv_prog_CC+set}" = set; then : | ||
4768 | $as_echo_n "(cached) " >&6 | ||
4769 | else | ||
4770 | if test -n "$CC"; then | ||
4771 | @@ -3244,24 +3900,24 @@ | ||
4772 | do | ||
4773 | IFS=$as_save_IFS | ||
4774 | test -z "$as_dir" && as_dir=. | ||
4775 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4776 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4777 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4778 | ac_cv_prog_CC="${ac_tool_prefix}cc" | ||
4779 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4780 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4781 | break 2 | ||
4782 | fi | ||
4783 | done | ||
4784 | -done | ||
4785 | + done | ||
4786 | IFS=$as_save_IFS | ||
4787 | |||
4788 | fi | ||
4789 | fi | ||
4790 | CC=$ac_cv_prog_CC | ||
4791 | if test -n "$CC"; then | ||
4792 | - { $as_echo "$as_me:$LINENO: result: $CC" >&5 | ||
4793 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
4794 | $as_echo "$CC" >&6; } | ||
4795 | else | ||
4796 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4797 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4798 | $as_echo "no" >&6; } | ||
4799 | fi | ||
4800 | |||
4801 | @@ -3271,9 +3927,9 @@ | ||
4802 | if test -z "$CC"; then | ||
4803 | # Extract the first word of "cc", so it can be a program name with args. | ||
4804 | set dummy cc; ac_word=$2 | ||
4805 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4806 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4807 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4808 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
4809 | +if test "${ac_cv_prog_CC+set}" = set; then : | ||
4810 | $as_echo_n "(cached) " >&6 | ||
4811 | else | ||
4812 | if test -n "$CC"; then | ||
4813 | @@ -3285,18 +3941,18 @@ | ||
4814 | do | ||
4815 | IFS=$as_save_IFS | ||
4816 | test -z "$as_dir" && as_dir=. | ||
4817 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4818 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4819 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4820 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | ||
4821 | ac_prog_rejected=yes | ||
4822 | continue | ||
4823 | fi | ||
4824 | ac_cv_prog_CC="cc" | ||
4825 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4826 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4827 | break 2 | ||
4828 | fi | ||
4829 | done | ||
4830 | -done | ||
4831 | + done | ||
4832 | IFS=$as_save_IFS | ||
4833 | |||
4834 | if test $ac_prog_rejected = yes; then | ||
4835 | @@ -3315,10 +3971,10 @@ | ||
4836 | fi | ||
4837 | CC=$ac_cv_prog_CC | ||
4838 | if test -n "$CC"; then | ||
4839 | - { $as_echo "$as_me:$LINENO: result: $CC" >&5 | ||
4840 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
4841 | $as_echo "$CC" >&6; } | ||
4842 | else | ||
4843 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4844 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4845 | $as_echo "no" >&6; } | ||
4846 | fi | ||
4847 | |||
4848 | @@ -3330,9 +3986,9 @@ | ||
4849 | do | ||
4850 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
4851 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
4852 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4853 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4854 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4855 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
4856 | +if test "${ac_cv_prog_CC+set}" = set; then : | ||
4857 | $as_echo_n "(cached) " >&6 | ||
4858 | else | ||
4859 | if test -n "$CC"; then | ||
4860 | @@ -3343,24 +3999,24 @@ | ||
4861 | do | ||
4862 | IFS=$as_save_IFS | ||
4863 | test -z "$as_dir" && as_dir=. | ||
4864 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4865 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4866 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4867 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | ||
4868 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4869 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4870 | break 2 | ||
4871 | fi | ||
4872 | done | ||
4873 | -done | ||
4874 | + done | ||
4875 | IFS=$as_save_IFS | ||
4876 | |||
4877 | fi | ||
4878 | fi | ||
4879 | CC=$ac_cv_prog_CC | ||
4880 | if test -n "$CC"; then | ||
4881 | - { $as_echo "$as_me:$LINENO: result: $CC" >&5 | ||
4882 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
4883 | $as_echo "$CC" >&6; } | ||
4884 | else | ||
4885 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4886 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4887 | $as_echo "no" >&6; } | ||
4888 | fi | ||
4889 | |||
4890 | @@ -3374,9 +4030,9 @@ | ||
4891 | do | ||
4892 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
4893 | set dummy $ac_prog; ac_word=$2 | ||
4894 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4895 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
4896 | $as_echo_n "checking for $ac_word... " >&6; } | ||
4897 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
4898 | +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : | ||
4899 | $as_echo_n "(cached) " >&6 | ||
4900 | else | ||
4901 | if test -n "$ac_ct_CC"; then | ||
4902 | @@ -3387,24 +4043,24 @@ | ||
4903 | do | ||
4904 | IFS=$as_save_IFS | ||
4905 | test -z "$as_dir" && as_dir=. | ||
4906 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4907 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4908 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4909 | ac_cv_prog_ac_ct_CC="$ac_prog" | ||
4910 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4911 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4912 | break 2 | ||
4913 | fi | ||
4914 | done | ||
4915 | -done | ||
4916 | + done | ||
4917 | IFS=$as_save_IFS | ||
4918 | |||
4919 | fi | ||
4920 | fi | ||
4921 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
4922 | if test -n "$ac_ct_CC"; then | ||
4923 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
4924 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 | ||
4925 | $as_echo "$ac_ct_CC" >&6; } | ||
4926 | else | ||
4927 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
4928 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4929 | $as_echo "no" >&6; } | ||
4930 | fi | ||
4931 | |||
4932 | @@ -3417,7 +4073,7 @@ | ||
4933 | else | ||
4934 | case $cross_compiling:$ac_tool_warned in | ||
4935 | yes:) | ||
4936 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4937 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
4938 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
4939 | ac_tool_warned=yes ;; | ||
4940 | esac | ||
4941 | @@ -3428,57 +4084,37 @@ | ||
4942 | fi | ||
4943 | |||
4944 | |||
4945 | -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
4946 | +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
4947 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
4948 | -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | ||
4949 | -See \`config.log' for more details." >&5 | ||
4950 | -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH | ||
4951 | -See \`config.log' for more details." >&2;} | ||
4952 | - { (exit 1); exit 1; }; }; } | ||
4953 | +as_fn_error $? "no acceptable C compiler found in \$PATH | ||
4954 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
4955 | |||
4956 | # Provide some information about the compiler. | ||
4957 | -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 | ||
4958 | +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 | ||
4959 | set X $ac_compile | ||
4960 | ac_compiler=$2 | ||
4961 | -{ (ac_try="$ac_compiler --version >&5" | ||
4962 | -case "(($ac_try" in | ||
4963 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4964 | - *) ac_try_echo=$ac_try;; | ||
4965 | -esac | ||
4966 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
4967 | -$as_echo "$ac_try_echo") >&5 | ||
4968 | - (eval "$ac_compiler --version >&5") 2>&5 | ||
4969 | - ac_status=$? | ||
4970 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4971 | - (exit $ac_status); } | ||
4972 | -{ (ac_try="$ac_compiler -v >&5" | ||
4973 | -case "(($ac_try" in | ||
4974 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4975 | - *) ac_try_echo=$ac_try;; | ||
4976 | -esac | ||
4977 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
4978 | -$as_echo "$ac_try_echo") >&5 | ||
4979 | - (eval "$ac_compiler -v >&5") 2>&5 | ||
4980 | - ac_status=$? | ||
4981 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4982 | - (exit $ac_status); } | ||
4983 | -{ (ac_try="$ac_compiler -V >&5" | ||
4984 | +for ac_option in --version -v -V -qversion; do | ||
4985 | + { { ac_try="$ac_compiler $ac_option >&5" | ||
4986 | case "(($ac_try" in | ||
4987 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4988 | *) ac_try_echo=$ac_try;; | ||
4989 | esac | ||
4990 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
4991 | -$as_echo "$ac_try_echo") >&5 | ||
4992 | - (eval "$ac_compiler -V >&5") 2>&5 | ||
4993 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
4994 | +$as_echo "$ac_try_echo"; } >&5 | ||
4995 | + (eval "$ac_compiler $ac_option >&5") 2>conftest.err | ||
4996 | ac_status=$? | ||
4997 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4998 | - (exit $ac_status); } | ||
4999 | + if test -s conftest.err; then | ||
5000 | + sed '10a\ | ||
5001 | +... rest of stderr output deleted ... | ||
5002 | + 10q' conftest.err >conftest.er1 | ||
5003 | + cat conftest.er1 >&5 | ||
5004 | + fi | ||
5005 | + rm -f conftest.er1 conftest.err | ||
5006 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
5007 | + test $ac_status = 0; } | ||
5008 | +done | ||
5009 | |||
5010 | -cat >conftest.$ac_ext <<_ACEOF | ||
5011 | -/* confdefs.h. */ | ||
5012 | -_ACEOF | ||
5013 | -cat confdefs.h >>conftest.$ac_ext | ||
5014 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5015 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5016 | /* end confdefs.h. */ | ||
5017 | |||
5018 | int | ||
5019 | @@ -3494,8 +4130,8 @@ | ||
5020 | # Try to create an executable without -o first, disregard a.out. | ||
5021 | # It will help us diagnose broken compilers, and finding out an intuition | ||
5022 | # of exeext. | ||
5023 | -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | ||
5024 | -$as_echo_n "checking for C compiler default output file name... " >&6; } | ||
5025 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 | ||
5026 | +$as_echo_n "checking whether the C compiler works... " >&6; } | ||
5027 | ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
5028 | |||
5029 | # The possible output files: | ||
5030 | @@ -3511,17 +4147,17 @@ | ||
5031 | done | ||
5032 | rm -f $ac_rmfiles | ||
5033 | |||
5034 | -if { (ac_try="$ac_link_default" | ||
5035 | +if { { ac_try="$ac_link_default" | ||
5036 | case "(($ac_try" in | ||
5037 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5038 | *) ac_try_echo=$ac_try;; | ||
5039 | esac | ||
5040 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5041 | -$as_echo "$ac_try_echo") >&5 | ||
5042 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
5043 | +$as_echo "$ac_try_echo"; } >&5 | ||
5044 | (eval "$ac_link_default") 2>&5 | ||
5045 | ac_status=$? | ||
5046 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5047 | - (exit $ac_status); }; then | ||
5048 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
5049 | + test $ac_status = 0; }; then : | ||
5050 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. | ||
5051 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' | ||
5052 | # in a Makefile. We should not override ac_cv_exeext if it was cached, | ||
5053 | @@ -3538,7 +4174,7 @@ | ||
5054 | # certainly right. | ||
5055 | break;; | ||
5056 | *.* ) | ||
5057 | - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | ||
5058 | + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | ||
5059 | then :; else | ||
5060 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
5061 | fi | ||
5062 | @@ -3557,84 +4193,41 @@ | ||
5063 | else | ||
5064 | ac_file='' | ||
5065 | fi | ||
5066 | - | ||
5067 | -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 | ||
5068 | -$as_echo "$ac_file" >&6; } | ||
5069 | -if test -z "$ac_file"; then | ||
5070 | - $as_echo "$as_me: failed program was:" >&5 | ||
5071 | +if test -z "$ac_file"; then : | ||
5072 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
5073 | +$as_echo "no" >&6; } | ||
5074 | +$as_echo "$as_me: failed program was:" >&5 | ||
5075 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5076 | |||
5077 | -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
5078 | +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
5079 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
5080 | -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables | ||
5081 | -See \`config.log' for more details." >&5 | ||
5082 | -$as_echo "$as_me: error: C compiler cannot create executables | ||
5083 | -See \`config.log' for more details." >&2;} | ||
5084 | - { (exit 77); exit 77; }; }; } | ||
5085 | +as_fn_error 77 "C compiler cannot create executables | ||
5086 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
5087 | +else | ||
5088 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
5089 | +$as_echo "yes" >&6; } | ||
5090 | fi | ||
5091 | - | ||
5092 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 | ||
5093 | +$as_echo_n "checking for C compiler default output file name... " >&6; } | ||
5094 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 | ||
5095 | +$as_echo "$ac_file" >&6; } | ||
5096 | ac_exeext=$ac_cv_exeext | ||
5097 | |||
5098 | -# Check that the compiler produces executables we can run. If not, either | ||
5099 | -# the compiler is broken, or we cross compile. | ||
5100 | -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | ||
5101 | -$as_echo_n "checking whether the C compiler works... " >&6; } | ||
5102 | -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | ||
5103 | -# If not cross compiling, check that we can run a simple program. | ||
5104 | -if test "$cross_compiling" != yes; then | ||
5105 | - if { ac_try='./$ac_file' | ||
5106 | - { (case "(($ac_try" in | ||
5107 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5108 | - *) ac_try_echo=$ac_try;; | ||
5109 | -esac | ||
5110 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5111 | -$as_echo "$ac_try_echo") >&5 | ||
5112 | - (eval "$ac_try") 2>&5 | ||
5113 | - ac_status=$? | ||
5114 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5115 | - (exit $ac_status); }; }; then | ||
5116 | - cross_compiling=no | ||
5117 | - else | ||
5118 | - if test "$cross_compiling" = maybe; then | ||
5119 | - cross_compiling=yes | ||
5120 | - else | ||
5121 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
5122 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
5123 | -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. | ||
5124 | -If you meant to cross compile, use \`--host'. | ||
5125 | -See \`config.log' for more details." >&5 | ||
5126 | -$as_echo "$as_me: error: cannot run C compiled programs. | ||
5127 | -If you meant to cross compile, use \`--host'. | ||
5128 | -See \`config.log' for more details." >&2;} | ||
5129 | - { (exit 1); exit 1; }; }; } | ||
5130 | - fi | ||
5131 | - fi | ||
5132 | -fi | ||
5133 | -{ $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
5134 | -$as_echo "yes" >&6; } | ||
5135 | - | ||
5136 | rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out | ||
5137 | ac_clean_files=$ac_clean_files_save | ||
5138 | -# Check that the compiler produces executables we can run. If not, either | ||
5139 | -# the compiler is broken, or we cross compile. | ||
5140 | -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | ||
5141 | -$as_echo_n "checking whether we are cross compiling... " >&6; } | ||
5142 | -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 | ||
5143 | -$as_echo "$cross_compiling" >&6; } | ||
5144 | - | ||
5145 | -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 | ||
5146 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 | ||
5147 | $as_echo_n "checking for suffix of executables... " >&6; } | ||
5148 | -if { (ac_try="$ac_link" | ||
5149 | +if { { ac_try="$ac_link" | ||
5150 | case "(($ac_try" in | ||
5151 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5152 | *) ac_try_echo=$ac_try;; | ||
5153 | esac | ||
5154 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5155 | -$as_echo "$ac_try_echo") >&5 | ||
5156 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
5157 | +$as_echo "$ac_try_echo"; } >&5 | ||
5158 | (eval "$ac_link") 2>&5 | ||
5159 | ac_status=$? | ||
5160 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5161 | - (exit $ac_status); }; then | ||
5162 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
5163 | + test $ac_status = 0; }; then : | ||
5164 | # If both `conftest.exe' and `conftest' are `present' (well, observable) | ||
5165 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will | ||
5166 | # work properly (i.e., refer to `conftest.exe'), while it won't with | ||
5167 | @@ -3649,32 +4242,83 @@ | ||
5168 | esac | ||
5169 | done | ||
5170 | else | ||
5171 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
5172 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
5173 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
5174 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | ||
5175 | -See \`config.log' for more details." >&5 | ||
5176 | -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | ||
5177 | -See \`config.log' for more details." >&2;} | ||
5178 | - { (exit 1); exit 1; }; }; } | ||
5179 | +as_fn_error $? "cannot compute suffix of executables: cannot compile and link | ||
5180 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
5181 | fi | ||
5182 | - | ||
5183 | -rm -f conftest$ac_cv_exeext | ||
5184 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | ||
5185 | +rm -f conftest conftest$ac_cv_exeext | ||
5186 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 | ||
5187 | $as_echo "$ac_cv_exeext" >&6; } | ||
5188 | |||
5189 | rm -f conftest.$ac_ext | ||
5190 | EXEEXT=$ac_cv_exeext | ||
5191 | ac_exeext=$EXEEXT | ||
5192 | -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 | ||
5193 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5194 | +/* end confdefs.h. */ | ||
5195 | +#include <stdio.h> | ||
5196 | +int | ||
5197 | +main () | ||
5198 | +{ | ||
5199 | +FILE *f = fopen ("conftest.out", "w"); | ||
5200 | + return ferror (f) || fclose (f) != 0; | ||
5201 | + | ||
5202 | + ; | ||
5203 | + return 0; | ||
5204 | +} | ||
5205 | +_ACEOF | ||
5206 | +ac_clean_files="$ac_clean_files conftest.out" | ||
5207 | +# Check that the compiler produces executables we can run. If not, either | ||
5208 | +# the compiler is broken, or we cross compile. | ||
5209 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 | ||
5210 | +$as_echo_n "checking whether we are cross compiling... " >&6; } | ||
5211 | +if test "$cross_compiling" != yes; then | ||
5212 | + { { ac_try="$ac_link" | ||
5213 | +case "(($ac_try" in | ||
5214 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5215 | + *) ac_try_echo=$ac_try;; | ||
5216 | +esac | ||
5217 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
5218 | +$as_echo "$ac_try_echo"; } >&5 | ||
5219 | + (eval "$ac_link") 2>&5 | ||
5220 | + ac_status=$? | ||
5221 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
5222 | + test $ac_status = 0; } | ||
5223 | + if { ac_try='./conftest$ac_cv_exeext' | ||
5224 | + { { case "(($ac_try" in | ||
5225 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5226 | + *) ac_try_echo=$ac_try;; | ||
5227 | +esac | ||
5228 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
5229 | +$as_echo "$ac_try_echo"; } >&5 | ||
5230 | + (eval "$ac_try") 2>&5 | ||
5231 | + ac_status=$? | ||
5232 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
5233 | + test $ac_status = 0; }; }; then | ||
5234 | + cross_compiling=no | ||
5235 | + else | ||
5236 | + if test "$cross_compiling" = maybe; then | ||
5237 | + cross_compiling=yes | ||
5238 | + else | ||
5239 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
5240 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
5241 | +as_fn_error $? "cannot run C compiled programs. | ||
5242 | +If you meant to cross compile, use \`--host'. | ||
5243 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
5244 | + fi | ||
5245 | + fi | ||
5246 | +fi | ||
5247 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 | ||
5248 | +$as_echo "$cross_compiling" >&6; } | ||
5249 | + | ||
5250 | +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out | ||
5251 | +ac_clean_files=$ac_clean_files_save | ||
5252 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 | ||
5253 | $as_echo_n "checking for suffix of object files... " >&6; } | ||
5254 | -if test "${ac_cv_objext+set}" = set; then | ||
5255 | +if test "${ac_cv_objext+set}" = set; then : | ||
5256 | $as_echo_n "(cached) " >&6 | ||
5257 | else | ||
5258 | - cat >conftest.$ac_ext <<_ACEOF | ||
5259 | -/* confdefs.h. */ | ||
5260 | -_ACEOF | ||
5261 | -cat confdefs.h >>conftest.$ac_ext | ||
5262 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5263 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5264 | /* end confdefs.h. */ | ||
5265 | |||
5266 | int | ||
5267 | @@ -3686,17 +4330,17 @@ | ||
5268 | } | ||
5269 | _ACEOF | ||
5270 | rm -f conftest.o conftest.obj | ||
5271 | -if { (ac_try="$ac_compile" | ||
5272 | +if { { ac_try="$ac_compile" | ||
5273 | case "(($ac_try" in | ||
5274 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5275 | *) ac_try_echo=$ac_try;; | ||
5276 | esac | ||
5277 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5278 | -$as_echo "$ac_try_echo") >&5 | ||
5279 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
5280 | +$as_echo "$ac_try_echo"; } >&5 | ||
5281 | (eval "$ac_compile") 2>&5 | ||
5282 | ac_status=$? | ||
5283 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5284 | - (exit $ac_status); }; then | ||
5285 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
5286 | + test $ac_status = 0; }; then : | ||
5287 | for ac_file in conftest.o conftest.obj conftest.*; do | ||
5288 | test -f "$ac_file" || continue; | ||
5289 | case $ac_file in | ||
5290 | @@ -3709,31 +4353,23 @@ | ||
5291 | $as_echo "$as_me: failed program was:" >&5 | ||
5292 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5293 | |||
5294 | -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
5295 | +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
5296 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
5297 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile | ||
5298 | -See \`config.log' for more details." >&5 | ||
5299 | -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile | ||
5300 | -See \`config.log' for more details." >&2;} | ||
5301 | - { (exit 1); exit 1; }; }; } | ||
5302 | +as_fn_error $? "cannot compute suffix of object files: cannot compile | ||
5303 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
5304 | fi | ||
5305 | - | ||
5306 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | ||
5307 | fi | ||
5308 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | ||
5309 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 | ||
5310 | $as_echo "$ac_cv_objext" >&6; } | ||
5311 | OBJEXT=$ac_cv_objext | ||
5312 | ac_objext=$OBJEXT | ||
5313 | -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | ||
5314 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 | ||
5315 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } | ||
5316 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then | ||
5317 | +if test "${ac_cv_c_compiler_gnu+set}" = set; then : | ||
5318 | $as_echo_n "(cached) " >&6 | ||
5319 | else | ||
5320 | - cat >conftest.$ac_ext <<_ACEOF | ||
5321 | -/* confdefs.h. */ | ||
5322 | -_ACEOF | ||
5323 | -cat confdefs.h >>conftest.$ac_ext | ||
5324 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5325 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5326 | /* end confdefs.h. */ | ||
5327 | |||
5328 | int | ||
5329 | @@ -3747,37 +4383,16 @@ | ||
5330 | return 0; | ||
5331 | } | ||
5332 | _ACEOF | ||
5333 | -rm -f conftest.$ac_objext | ||
5334 | -if { (ac_try="$ac_compile" | ||
5335 | -case "(($ac_try" in | ||
5336 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5337 | - *) ac_try_echo=$ac_try;; | ||
5338 | -esac | ||
5339 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5340 | -$as_echo "$ac_try_echo") >&5 | ||
5341 | - (eval "$ac_compile") 2>conftest.er1 | ||
5342 | - ac_status=$? | ||
5343 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5344 | - rm -f conftest.er1 | ||
5345 | - cat conftest.err >&5 | ||
5346 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5347 | - (exit $ac_status); } && { | ||
5348 | - test -z "$ac_c_werror_flag" || | ||
5349 | - test ! -s conftest.err | ||
5350 | - } && test -s conftest.$ac_objext; then | ||
5351 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
5352 | ac_compiler_gnu=yes | ||
5353 | else | ||
5354 | - $as_echo "$as_me: failed program was:" >&5 | ||
5355 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5356 | - | ||
5357 | - ac_compiler_gnu=no | ||
5358 | + ac_compiler_gnu=no | ||
5359 | fi | ||
5360 | - | ||
5361 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5362 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
5363 | |||
5364 | fi | ||
5365 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | ||
5366 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 | ||
5367 | $as_echo "$ac_cv_c_compiler_gnu" >&6; } | ||
5368 | if test $ac_compiler_gnu = yes; then | ||
5369 | GCC=yes | ||
5370 | @@ -3786,20 +4401,16 @@ | ||
5371 | fi | ||
5372 | ac_test_CFLAGS=${CFLAGS+set} | ||
5373 | ac_save_CFLAGS=$CFLAGS | ||
5374 | -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | ||
5375 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 | ||
5376 | $as_echo_n "checking whether $CC accepts -g... " >&6; } | ||
5377 | -if test "${ac_cv_prog_cc_g+set}" = set; then | ||
5378 | +if test "${ac_cv_prog_cc_g+set}" = set; then : | ||
5379 | $as_echo_n "(cached) " >&6 | ||
5380 | else | ||
5381 | ac_save_c_werror_flag=$ac_c_werror_flag | ||
5382 | ac_c_werror_flag=yes | ||
5383 | ac_cv_prog_cc_g=no | ||
5384 | CFLAGS="-g" | ||
5385 | - cat >conftest.$ac_ext <<_ACEOF | ||
5386 | -/* confdefs.h. */ | ||
5387 | -_ACEOF | ||
5388 | -cat confdefs.h >>conftest.$ac_ext | ||
5389 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5390 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5391 | /* end confdefs.h. */ | ||
5392 | |||
5393 | int | ||
5394 | @@ -3810,35 +4421,11 @@ | ||
5395 | return 0; | ||
5396 | } | ||
5397 | _ACEOF | ||
5398 | -rm -f conftest.$ac_objext | ||
5399 | -if { (ac_try="$ac_compile" | ||
5400 | -case "(($ac_try" in | ||
5401 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5402 | - *) ac_try_echo=$ac_try;; | ||
5403 | -esac | ||
5404 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5405 | -$as_echo "$ac_try_echo") >&5 | ||
5406 | - (eval "$ac_compile") 2>conftest.er1 | ||
5407 | - ac_status=$? | ||
5408 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5409 | - rm -f conftest.er1 | ||
5410 | - cat conftest.err >&5 | ||
5411 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5412 | - (exit $ac_status); } && { | ||
5413 | - test -z "$ac_c_werror_flag" || | ||
5414 | - test ! -s conftest.err | ||
5415 | - } && test -s conftest.$ac_objext; then | ||
5416 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
5417 | ac_cv_prog_cc_g=yes | ||
5418 | else | ||
5419 | - $as_echo "$as_me: failed program was:" >&5 | ||
5420 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5421 | - | ||
5422 | - CFLAGS="" | ||
5423 | - cat >conftest.$ac_ext <<_ACEOF | ||
5424 | -/* confdefs.h. */ | ||
5425 | -_ACEOF | ||
5426 | -cat confdefs.h >>conftest.$ac_ext | ||
5427 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5428 | + CFLAGS="" | ||
5429 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5430 | /* end confdefs.h. */ | ||
5431 | |||
5432 | int | ||
5433 | @@ -3849,36 +4436,12 @@ | ||
5434 | return 0; | ||
5435 | } | ||
5436 | _ACEOF | ||
5437 | -rm -f conftest.$ac_objext | ||
5438 | -if { (ac_try="$ac_compile" | ||
5439 | -case "(($ac_try" in | ||
5440 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5441 | - *) ac_try_echo=$ac_try;; | ||
5442 | -esac | ||
5443 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5444 | -$as_echo "$ac_try_echo") >&5 | ||
5445 | - (eval "$ac_compile") 2>conftest.er1 | ||
5446 | - ac_status=$? | ||
5447 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5448 | - rm -f conftest.er1 | ||
5449 | - cat conftest.err >&5 | ||
5450 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5451 | - (exit $ac_status); } && { | ||
5452 | - test -z "$ac_c_werror_flag" || | ||
5453 | - test ! -s conftest.err | ||
5454 | - } && test -s conftest.$ac_objext; then | ||
5455 | - : | ||
5456 | -else | ||
5457 | - $as_echo "$as_me: failed program was:" >&5 | ||
5458 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5459 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
5460 | |||
5461 | - ac_c_werror_flag=$ac_save_c_werror_flag | ||
5462 | +else | ||
5463 | + ac_c_werror_flag=$ac_save_c_werror_flag | ||
5464 | CFLAGS="-g" | ||
5465 | - cat >conftest.$ac_ext <<_ACEOF | ||
5466 | -/* confdefs.h. */ | ||
5467 | -_ACEOF | ||
5468 | -cat confdefs.h >>conftest.$ac_ext | ||
5469 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5470 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5471 | /* end confdefs.h. */ | ||
5472 | |||
5473 | int | ||
5474 | @@ -3889,42 +4452,17 @@ | ||
5475 | return 0; | ||
5476 | } | ||
5477 | _ACEOF | ||
5478 | -rm -f conftest.$ac_objext | ||
5479 | -if { (ac_try="$ac_compile" | ||
5480 | -case "(($ac_try" in | ||
5481 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5482 | - *) ac_try_echo=$ac_try;; | ||
5483 | -esac | ||
5484 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5485 | -$as_echo "$ac_try_echo") >&5 | ||
5486 | - (eval "$ac_compile") 2>conftest.er1 | ||
5487 | - ac_status=$? | ||
5488 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5489 | - rm -f conftest.er1 | ||
5490 | - cat conftest.err >&5 | ||
5491 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5492 | - (exit $ac_status); } && { | ||
5493 | - test -z "$ac_c_werror_flag" || | ||
5494 | - test ! -s conftest.err | ||
5495 | - } && test -s conftest.$ac_objext; then | ||
5496 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
5497 | ac_cv_prog_cc_g=yes | ||
5498 | -else | ||
5499 | - $as_echo "$as_me: failed program was:" >&5 | ||
5500 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5501 | - | ||
5502 | - | ||
5503 | fi | ||
5504 | - | ||
5505 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5506 | fi | ||
5507 | - | ||
5508 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5509 | fi | ||
5510 | - | ||
5511 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5512 | ac_c_werror_flag=$ac_save_c_werror_flag | ||
5513 | fi | ||
5514 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
5515 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 | ||
5516 | $as_echo "$ac_cv_prog_cc_g" >&6; } | ||
5517 | if test "$ac_test_CFLAGS" = set; then | ||
5518 | CFLAGS=$ac_save_CFLAGS | ||
5519 | @@ -3941,18 +4479,14 @@ | ||
5520 | CFLAGS= | ||
5521 | fi | ||
5522 | fi | ||
5523 | -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | ||
5524 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 | ||
5525 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } | ||
5526 | -if test "${ac_cv_prog_cc_c89+set}" = set; then | ||
5527 | +if test "${ac_cv_prog_cc_c89+set}" = set; then : | ||
5528 | $as_echo_n "(cached) " >&6 | ||
5529 | else | ||
5530 | ac_cv_prog_cc_c89=no | ||
5531 | ac_save_CC=$CC | ||
5532 | -cat >conftest.$ac_ext <<_ACEOF | ||
5533 | -/* confdefs.h. */ | ||
5534 | -_ACEOF | ||
5535 | -cat confdefs.h >>conftest.$ac_ext | ||
5536 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5537 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5538 | /* end confdefs.h. */ | ||
5539 | #include <stdarg.h> | ||
5540 | #include <stdio.h> | ||
5541 | @@ -4009,32 +4543,9 @@ | ||
5542 | -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
5543 | do | ||
5544 | CC="$ac_save_CC $ac_arg" | ||
5545 | - rm -f conftest.$ac_objext | ||
5546 | -if { (ac_try="$ac_compile" | ||
5547 | -case "(($ac_try" in | ||
5548 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5549 | - *) ac_try_echo=$ac_try;; | ||
5550 | -esac | ||
5551 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5552 | -$as_echo "$ac_try_echo") >&5 | ||
5553 | - (eval "$ac_compile") 2>conftest.er1 | ||
5554 | - ac_status=$? | ||
5555 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5556 | - rm -f conftest.er1 | ||
5557 | - cat conftest.err >&5 | ||
5558 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5559 | - (exit $ac_status); } && { | ||
5560 | - test -z "$ac_c_werror_flag" || | ||
5561 | - test ! -s conftest.err | ||
5562 | - } && test -s conftest.$ac_objext; then | ||
5563 | + if ac_fn_c_try_compile "$LINENO"; then : | ||
5564 | ac_cv_prog_cc_c89=$ac_arg | ||
5565 | -else | ||
5566 | - $as_echo "$as_me: failed program was:" >&5 | ||
5567 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5568 | - | ||
5569 | - | ||
5570 | fi | ||
5571 | - | ||
5572 | rm -f core conftest.err conftest.$ac_objext | ||
5573 | test "x$ac_cv_prog_cc_c89" != "xno" && break | ||
5574 | done | ||
5575 | @@ -4045,17 +4556,19 @@ | ||
5576 | # AC_CACHE_VAL | ||
5577 | case "x$ac_cv_prog_cc_c89" in | ||
5578 | x) | ||
5579 | - { $as_echo "$as_me:$LINENO: result: none needed" >&5 | ||
5580 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 | ||
5581 | $as_echo "none needed" >&6; } ;; | ||
5582 | xno) | ||
5583 | - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 | ||
5584 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 | ||
5585 | $as_echo "unsupported" >&6; } ;; | ||
5586 | *) | ||
5587 | CC="$CC $ac_cv_prog_cc_c89" | ||
5588 | - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | ||
5589 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 | ||
5590 | $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; | ||
5591 | esac | ||
5592 | +if test "x$ac_cv_prog_cc_c89" != xno; then : | ||
5593 | |||
5594 | +fi | ||
5595 | |||
5596 | ac_ext=c | ||
5597 | ac_cpp='$CPP $CPPFLAGS' | ||
5598 | @@ -4070,44 +4583,44 @@ | ||
5599 | am_make=${MAKE-make} | ||
5600 | cat > confinc << 'END' | ||
5601 | am__doit: | ||
5602 | - @echo done | ||
5603 | + @echo this is the am__doit target | ||
5604 | .PHONY: am__doit | ||
5605 | END | ||
5606 | # If we don't find an include directive, just comment out the code. | ||
5607 | -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 | ||
5608 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 | ||
5609 | $as_echo_n "checking for style of include used by $am_make... " >&6; } | ||
5610 | am__include="#" | ||
5611 | am__quote= | ||
5612 | _am_result=none | ||
5613 | # First try GNU make style include. | ||
5614 | echo "include confinc" > confmf | ||
5615 | -# We grep out `Entering directory' and `Leaving directory' | ||
5616 | -# messages which can occur if `w' ends up in MAKEFLAGS. | ||
5617 | -# In particular we don't look at `^make:' because GNU make might | ||
5618 | -# be invoked under some other name (usually "gmake"), in which | ||
5619 | -# case it prints its new name instead of `make'. | ||
5620 | -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then | ||
5621 | - am__include=include | ||
5622 | - am__quote= | ||
5623 | - _am_result=GNU | ||
5624 | -fi | ||
5625 | +# Ignore all kinds of additional output from `make'. | ||
5626 | +case `$am_make -s -f confmf 2> /dev/null` in #( | ||
5627 | +*the\ am__doit\ target*) | ||
5628 | + am__include=include | ||
5629 | + am__quote= | ||
5630 | + _am_result=GNU | ||
5631 | + ;; | ||
5632 | +esac | ||
5633 | # Now try BSD make style include. | ||
5634 | if test "$am__include" = "#"; then | ||
5635 | echo '.include "confinc"' > confmf | ||
5636 | - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then | ||
5637 | - am__include=.include | ||
5638 | - am__quote="\"" | ||
5639 | - _am_result=BSD | ||
5640 | - fi | ||
5641 | + case `$am_make -s -f confmf 2> /dev/null` in #( | ||
5642 | + *the\ am__doit\ target*) | ||
5643 | + am__include=.include | ||
5644 | + am__quote="\"" | ||
5645 | + _am_result=BSD | ||
5646 | + ;; | ||
5647 | + esac | ||
5648 | fi | ||
5649 | |||
5650 | |||
5651 | -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 | ||
5652 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 | ||
5653 | $as_echo "$_am_result" >&6; } | ||
5654 | rm -f confinc confmf | ||
5655 | |||
5656 | # Check whether --enable-dependency-tracking was given. | ||
5657 | -if test "${enable_dependency_tracking+set}" = set; then | ||
5658 | +if test "${enable_dependency_tracking+set}" = set; then : | ||
5659 | enableval=$enable_dependency_tracking; | ||
5660 | fi | ||
5661 | |||
5662 | @@ -4127,9 +4640,9 @@ | ||
5663 | |||
5664 | depcc="$CC" am_compiler_list= | ||
5665 | |||
5666 | -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
5667 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 | ||
5668 | $as_echo_n "checking dependency style of $depcc... " >&6; } | ||
5669 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then | ||
5670 | +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : | ||
5671 | $as_echo_n "(cached) " >&6 | ||
5672 | else | ||
5673 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then | ||
5674 | @@ -4155,6 +4668,11 @@ | ||
5675 | if test "$am_compiler_list" = ""; then | ||
5676 | am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` | ||
5677 | fi | ||
5678 | + am__universal=false | ||
5679 | + case " $depcc " in #( | ||
5680 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; | ||
5681 | + esac | ||
5682 | + | ||
5683 | for depmode in $am_compiler_list; do | ||
5684 | # Setup a source with many dependencies, because some compilers | ||
5685 | # like to wrap large dependency lists on column 80 (with \), and | ||
5686 | @@ -4172,7 +4690,17 @@ | ||
5687 | done | ||
5688 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | ||
5689 | |||
5690 | + # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
5691 | + # mode. It turns out that the SunPro C++ compiler does not properly | ||
5692 | + # handle `-M -o', and we need to detect this. Also, some Intel | ||
5693 | + # versions had trouble with output in subdirs | ||
5694 | + am__obj=sub/conftest.${OBJEXT-o} | ||
5695 | + am__minus_obj="-o $am__obj" | ||
5696 | case $depmode in | ||
5697 | + gcc) | ||
5698 | + # This depmode causes a compiler race in universal mode. | ||
5699 | + test "$am__universal" = false || continue | ||
5700 | + ;; | ||
5701 | nosideeffect) | ||
5702 | # after this tag, mechanisms are not by side-effect, so they'll | ||
5703 | # only be used when explicitly requested | ||
5704 | @@ -4182,19 +4710,23 @@ | ||
5705 | break | ||
5706 | fi | ||
5707 | ;; | ||
5708 | + msvisualcpp | msvcmsys) | ||
5709 | + # This compiler won't grok `-c -o', but also, the minuso test has | ||
5710 | + # not run yet. These depmodes are late enough in the game, and | ||
5711 | + # so weak that their functioning should not be impacted. | ||
5712 | + am__obj=conftest.${OBJEXT-o} | ||
5713 | + am__minus_obj= | ||
5714 | + ;; | ||
5715 | none) break ;; | ||
5716 | esac | ||
5717 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
5718 | - # mode. It turns out that the SunPro C++ compiler does not properly | ||
5719 | - # handle `-M -o', and we need to detect this. | ||
5720 | if depmode=$depmode \ | ||
5721 | - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ | ||
5722 | + source=sub/conftest.c object=$am__obj \ | ||
5723 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | ||
5724 | - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | ||
5725 | + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ | ||
5726 | >/dev/null 2>conftest.err && | ||
5727 | grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | ||
5728 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | ||
5729 | - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | ||
5730 | + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && | ||
5731 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | ||
5732 | # icc doesn't choke on unknown options, it will just issue warnings | ||
5733 | # or remarks (even with -Werror). So we grep stderr for any message | ||
5734 | @@ -4218,7 +4750,7 @@ | ||
5735 | fi | ||
5736 | |||
5737 | fi | ||
5738 | -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | ||
5739 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 | ||
5740 | $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } | ||
5741 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type | ||
5742 | |||
5743 | @@ -4235,20 +4767,16 @@ | ||
5744 | |||
5745 | |||
5746 | |||
5747 | -{ $as_echo "$as_me:$LINENO: checking for C compiler vendor" >&5 | ||
5748 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5 | ||
5749 | $as_echo_n "checking for C compiler vendor... " >&6; } | ||
5750 | -if test "${ax_cv_c_compiler_vendor+set}" = set; then | ||
5751 | +if test "${ax_cv_c_compiler_vendor+set}" = set; then : | ||
5752 | $as_echo_n "(cached) " >&6 | ||
5753 | else | ||
5754 | ax_cv_c_compiler_vendor=unknown | ||
5755 | # note: don't check for gcc first since some other compilers define __GNUC__ | ||
5756 | for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do | ||
5757 | vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" | ||
5758 | - cat >conftest.$ac_ext <<_ACEOF | ||
5759 | -/* confdefs.h. */ | ||
5760 | -_ACEOF | ||
5761 | -cat confdefs.h >>conftest.$ac_ext | ||
5762 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5763 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5764 | /* end confdefs.h. */ | ||
5765 | |||
5766 | int | ||
5767 | @@ -4263,53 +4791,28 @@ | ||
5768 | return 0; | ||
5769 | } | ||
5770 | _ACEOF | ||
5771 | -rm -f conftest.$ac_objext | ||
5772 | -if { (ac_try="$ac_compile" | ||
5773 | -case "(($ac_try" in | ||
5774 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5775 | - *) ac_try_echo=$ac_try;; | ||
5776 | -esac | ||
5777 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5778 | -$as_echo "$ac_try_echo") >&5 | ||
5779 | - (eval "$ac_compile") 2>conftest.er1 | ||
5780 | - ac_status=$? | ||
5781 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5782 | - rm -f conftest.er1 | ||
5783 | - cat conftest.err >&5 | ||
5784 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5785 | - (exit $ac_status); } && { | ||
5786 | - test -z "$ac_c_werror_flag" || | ||
5787 | - test ! -s conftest.err | ||
5788 | - } && test -s conftest.$ac_objext; then | ||
5789 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
5790 | ax_cv_c_compiler_vendor=`echo $ventest | cut -d: -f1`; break | ||
5791 | -else | ||
5792 | - $as_echo "$as_me: failed program was:" >&5 | ||
5793 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5794 | - | ||
5795 | - | ||
5796 | fi | ||
5797 | - | ||
5798 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5799 | done | ||
5800 | |||
5801 | fi | ||
5802 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_c_compiler_vendor" >&5 | ||
5803 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_vendor" >&5 | ||
5804 | $as_echo "$ax_cv_c_compiler_vendor" >&6; } | ||
5805 | |||
5806 | - case $ac_cv_prog_cc_stdc in | ||
5807 | - no) ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; | ||
5808 | - *) { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 | ||
5809 | + case $ac_cv_prog_cc_stdc in #( | ||
5810 | + no) : | ||
5811 | + ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( | ||
5812 | + *) : | ||
5813 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 | ||
5814 | $as_echo_n "checking for $CC option to accept ISO C99... " >&6; } | ||
5815 | -if test "${ac_cv_prog_cc_c99+set}" = set; then | ||
5816 | +if test "${ac_cv_prog_cc_c99+set}" = set; then : | ||
5817 | $as_echo_n "(cached) " >&6 | ||
5818 | else | ||
5819 | ac_cv_prog_cc_c99=no | ||
5820 | ac_save_CC=$CC | ||
5821 | -cat >conftest.$ac_ext <<_ACEOF | ||
5822 | -/* confdefs.h. */ | ||
5823 | -_ACEOF | ||
5824 | -cat confdefs.h >>conftest.$ac_ext | ||
5825 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5826 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5827 | /* end confdefs.h. */ | ||
5828 | #include <stdarg.h> | ||
5829 | #include <stdbool.h> | ||
5830 | @@ -4451,32 +4954,9 @@ | ||
5831 | for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 | ||
5832 | do | ||
5833 | CC="$ac_save_CC $ac_arg" | ||
5834 | - rm -f conftest.$ac_objext | ||
5835 | -if { (ac_try="$ac_compile" | ||
5836 | -case "(($ac_try" in | ||
5837 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5838 | - *) ac_try_echo=$ac_try;; | ||
5839 | -esac | ||
5840 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5841 | -$as_echo "$ac_try_echo") >&5 | ||
5842 | - (eval "$ac_compile") 2>conftest.er1 | ||
5843 | - ac_status=$? | ||
5844 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5845 | - rm -f conftest.er1 | ||
5846 | - cat conftest.err >&5 | ||
5847 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5848 | - (exit $ac_status); } && { | ||
5849 | - test -z "$ac_c_werror_flag" || | ||
5850 | - test ! -s conftest.err | ||
5851 | - } && test -s conftest.$ac_objext; then | ||
5852 | + if ac_fn_c_try_compile "$LINENO"; then : | ||
5853 | ac_cv_prog_cc_c99=$ac_arg | ||
5854 | -else | ||
5855 | - $as_echo "$as_me: failed program was:" >&5 | ||
5856 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5857 | - | ||
5858 | - | ||
5859 | fi | ||
5860 | - | ||
5861 | rm -f core conftest.err conftest.$ac_objext | ||
5862 | test "x$ac_cv_prog_cc_c99" != "xno" && break | ||
5863 | done | ||
5864 | @@ -4487,31 +4967,27 @@ | ||
5865 | # AC_CACHE_VAL | ||
5866 | case "x$ac_cv_prog_cc_c99" in | ||
5867 | x) | ||
5868 | - { $as_echo "$as_me:$LINENO: result: none needed" >&5 | ||
5869 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 | ||
5870 | $as_echo "none needed" >&6; } ;; | ||
5871 | xno) | ||
5872 | - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 | ||
5873 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 | ||
5874 | $as_echo "unsupported" >&6; } ;; | ||
5875 | *) | ||
5876 | CC="$CC $ac_cv_prog_cc_c99" | ||
5877 | - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 | ||
5878 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 | ||
5879 | $as_echo "$ac_cv_prog_cc_c99" >&6; } ;; | ||
5880 | esac | ||
5881 | -if test "x$ac_cv_prog_cc_c99" != xno; then | ||
5882 | +if test "x$ac_cv_prog_cc_c99" != xno; then : | ||
5883 | ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 | ||
5884 | else | ||
5885 | - { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | ||
5886 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 | ||
5887 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } | ||
5888 | -if test "${ac_cv_prog_cc_c89+set}" = set; then | ||
5889 | +if test "${ac_cv_prog_cc_c89+set}" = set; then : | ||
5890 | $as_echo_n "(cached) " >&6 | ||
5891 | else | ||
5892 | ac_cv_prog_cc_c89=no | ||
5893 | ac_save_CC=$CC | ||
5894 | -cat >conftest.$ac_ext <<_ACEOF | ||
5895 | -/* confdefs.h. */ | ||
5896 | -_ACEOF | ||
5897 | -cat confdefs.h >>conftest.$ac_ext | ||
5898 | -cat >>conftest.$ac_ext <<_ACEOF | ||
5899 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5900 | /* end confdefs.h. */ | ||
5901 | #include <stdarg.h> | ||
5902 | #include <stdio.h> | ||
5903 | @@ -4568,32 +5044,9 @@ | ||
5904 | -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
5905 | do | ||
5906 | CC="$ac_save_CC $ac_arg" | ||
5907 | - rm -f conftest.$ac_objext | ||
5908 | -if { (ac_try="$ac_compile" | ||
5909 | -case "(($ac_try" in | ||
5910 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5911 | - *) ac_try_echo=$ac_try;; | ||
5912 | -esac | ||
5913 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
5914 | -$as_echo "$ac_try_echo") >&5 | ||
5915 | - (eval "$ac_compile") 2>conftest.er1 | ||
5916 | - ac_status=$? | ||
5917 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
5918 | - rm -f conftest.er1 | ||
5919 | - cat conftest.err >&5 | ||
5920 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5921 | - (exit $ac_status); } && { | ||
5922 | - test -z "$ac_c_werror_flag" || | ||
5923 | - test ! -s conftest.err | ||
5924 | - } && test -s conftest.$ac_objext; then | ||
5925 | + if ac_fn_c_try_compile "$LINENO"; then : | ||
5926 | ac_cv_prog_cc_c89=$ac_arg | ||
5927 | -else | ||
5928 | - $as_echo "$as_me: failed program was:" >&5 | ||
5929 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
5930 | - | ||
5931 | - | ||
5932 | fi | ||
5933 | - | ||
5934 | rm -f core conftest.err conftest.$ac_objext | ||
5935 | test "x$ac_cv_prog_cc_c89" != "xno" && break | ||
5936 | done | ||
5937 | @@ -4604,152 +5057,60 @@ | ||
5938 | # AC_CACHE_VAL | ||
5939 | case "x$ac_cv_prog_cc_c89" in | ||
5940 | x) | ||
5941 | - { $as_echo "$as_me:$LINENO: result: none needed" >&5 | ||
5942 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 | ||
5943 | $as_echo "none needed" >&6; } ;; | ||
5944 | xno) | ||
5945 | - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 | ||
5946 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 | ||
5947 | $as_echo "unsupported" >&6; } ;; | ||
5948 | *) | ||
5949 | CC="$CC $ac_cv_prog_cc_c89" | ||
5950 | - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | ||
5951 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 | ||
5952 | $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; | ||
5953 | esac | ||
5954 | -if test "x$ac_cv_prog_cc_c89" != xno; then | ||
5955 | +if test "x$ac_cv_prog_cc_c89" != xno; then : | ||
5956 | ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 | ||
5957 | else | ||
5958 | ac_cv_prog_cc_stdc=no | ||
5959 | fi | ||
5960 | |||
5961 | - | ||
5962 | fi | ||
5963 | - | ||
5964 | ;; | ||
5965 | esac | ||
5966 | - { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO Standard C" >&5 | ||
5967 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 | ||
5968 | $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } | ||
5969 | - if test "${ac_cv_prog_cc_stdc+set}" = set; then | ||
5970 | + if test "${ac_cv_prog_cc_stdc+set}" = set; then : | ||
5971 | $as_echo_n "(cached) " >&6 | ||
5972 | fi | ||
5973 | |||
5974 | - case $ac_cv_prog_cc_stdc in | ||
5975 | - no) { $as_echo "$as_me:$LINENO: result: unsupported" >&5 | ||
5976 | -$as_echo "unsupported" >&6; } ;; | ||
5977 | - '') { $as_echo "$as_me:$LINENO: result: none needed" >&5 | ||
5978 | -$as_echo "none needed" >&6; } ;; | ||
5979 | - *) { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 | ||
5980 | + case $ac_cv_prog_cc_stdc in #( | ||
5981 | + no) : | ||
5982 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 | ||
5983 | +$as_echo "unsupported" >&6; } ;; #( | ||
5984 | + '') : | ||
5985 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 | ||
5986 | +$as_echo "none needed" >&6; } ;; #( | ||
5987 | + *) : | ||
5988 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5 | ||
5989 | $as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; | ||
5990 | esac | ||
5991 | |||
5992 | |||
5993 | -# Find a good install program. We prefer a C program (faster), | ||
5994 | -# so one script is as good as another. But avoid the broken or | ||
5995 | -# incompatible versions: | ||
5996 | -# SysV /etc/install, /usr/sbin/install | ||
5997 | -# SunOS /usr/etc/install | ||
5998 | -# IRIX /sbin/install | ||
5999 | -# AIX /bin/install | ||
6000 | -# AmigaOS /C/install, which installs bootblocks on floppy discs | ||
6001 | -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag | ||
6002 | -# AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
6003 | -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
6004 | -# OS/2's system install, which has a completely different semantic | ||
6005 | -# ./install, which can be erroneously created by make from ./install.sh. | ||
6006 | -# Reject install programs that cannot install multiple files. | ||
6007 | -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
6008 | -$as_echo_n "checking for a BSD-compatible install... " >&6; } | ||
6009 | -if test -z "$INSTALL"; then | ||
6010 | -if test "${ac_cv_path_install+set}" = set; then | ||
6011 | - $as_echo_n "(cached) " >&6 | ||
6012 | -else | ||
6013 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
6014 | -for as_dir in $PATH | ||
6015 | -do | ||
6016 | - IFS=$as_save_IFS | ||
6017 | - test -z "$as_dir" && as_dir=. | ||
6018 | - # Account for people who put trailing slashes in PATH elements. | ||
6019 | -case $as_dir/ in | ||
6020 | - ./ | .// | /cC/* | \ | ||
6021 | - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | ||
6022 | - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ | ||
6023 | - /usr/ucb/* ) ;; | ||
6024 | - *) | ||
6025 | - # OSF1 and SCO ODT 3.0 have their own names for install. | ||
6026 | - # Don't use installbsd from OSF since it installs stuff as root | ||
6027 | - # by default. | ||
6028 | - for ac_prog in ginstall scoinst install; do | ||
6029 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6030 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | ||
6031 | - if test $ac_prog = install && | ||
6032 | - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
6033 | - # AIX install. It has an incompatible calling convention. | ||
6034 | - : | ||
6035 | - elif test $ac_prog = install && | ||
6036 | - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
6037 | - # program-specific install script used by HP pwplus--don't use. | ||
6038 | - : | ||
6039 | - else | ||
6040 | - rm -rf conftest.one conftest.two conftest.dir | ||
6041 | - echo one > conftest.one | ||
6042 | - echo two > conftest.two | ||
6043 | - mkdir conftest.dir | ||
6044 | - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && | ||
6045 | - test -s conftest.one && test -s conftest.two && | ||
6046 | - test -s conftest.dir/conftest.one && | ||
6047 | - test -s conftest.dir/conftest.two | ||
6048 | - then | ||
6049 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
6050 | - break 3 | ||
6051 | - fi | ||
6052 | - fi | ||
6053 | - fi | ||
6054 | - done | ||
6055 | - done | ||
6056 | - ;; | ||
6057 | -esac | ||
6058 | - | ||
6059 | -done | ||
6060 | -IFS=$as_save_IFS | ||
6061 | - | ||
6062 | -rm -rf conftest.one conftest.two conftest.dir | ||
6063 | - | ||
6064 | -fi | ||
6065 | - if test "${ac_cv_path_install+set}" = set; then | ||
6066 | - INSTALL=$ac_cv_path_install | ||
6067 | - else | ||
6068 | - # As a last resort, use the slow shell script. Don't cache a | ||
6069 | - # value for INSTALL within a source directory, because that will | ||
6070 | - # break other packages using the cache if that directory is | ||
6071 | - # removed, or if the value is a relative name. | ||
6072 | - INSTALL=$ac_install_sh | ||
6073 | - fi | ||
6074 | -fi | ||
6075 | -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 | ||
6076 | -$as_echo "$INSTALL" >&6; } | ||
6077 | - | ||
6078 | -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
6079 | -# It thinks the first close brace ends the variable substitution. | ||
6080 | -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' | ||
6081 | - | ||
6082 | -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' | ||
6083 | - | ||
6084 | -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | ||
6085 | - | ||
6086 | -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 | ||
6087 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 | ||
6088 | $as_echo_n "checking whether ln -s works... " >&6; } | ||
6089 | LN_S=$as_ln_s | ||
6090 | if test "$LN_S" = "ln -s"; then | ||
6091 | - { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
6092 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
6093 | $as_echo "yes" >&6; } | ||
6094 | else | ||
6095 | - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | ||
6096 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 | ||
6097 | $as_echo "no, using $LN_S" >&6; } | ||
6098 | fi | ||
6099 | |||
6100 | -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
6101 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
6102 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } | ||
6103 | set x ${MAKE-make} | ||
6104 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | ||
6105 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6106 | +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : | ||
6107 | $as_echo_n "(cached) " >&6 | ||
6108 | else | ||
6109 | cat >conftest.make <<\_ACEOF | ||
6110 | @@ -4757,7 +5118,7 @@ | ||
6111 | all: | ||
6112 | @echo '@@@%%%=$(MAKE)=@@@%%%' | ||
6113 | _ACEOF | ||
6114 | -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. | ||
6115 | +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. | ||
6116 | case `${MAKE-make} -f conftest.make 2>/dev/null` in | ||
6117 | *@@@%%%=?*=@@@%%%*) | ||
6118 | eval ac_cv_prog_make_${ac_make}_set=yes;; | ||
6119 | @@ -4767,11 +5128,11 @@ | ||
6120 | rm -f conftest.make | ||
6121 | fi | ||
6122 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | ||
6123 | - { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
6124 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
6125 | $as_echo "yes" >&6; } | ||
6126 | SET_MAKE= | ||
6127 | else | ||
6128 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6129 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6130 | $as_echo "no" >&6; } | ||
6131 | SET_MAKE="MAKE=${MAKE-make}" | ||
6132 | fi | ||
6133 | @@ -4783,9 +5144,9 @@ | ||
6134 | if test -n "$ac_tool_prefix"; then | ||
6135 | # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. | ||
6136 | set dummy ${ac_tool_prefix}as; ac_word=$2 | ||
6137 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6138 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6139 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6140 | -if test "${ac_cv_prog_AS+set}" = set; then | ||
6141 | +if test "${ac_cv_prog_AS+set}" = set; then : | ||
6142 | $as_echo_n "(cached) " >&6 | ||
6143 | else | ||
6144 | if test -n "$AS"; then | ||
6145 | @@ -4796,24 +5157,24 @@ | ||
6146 | do | ||
6147 | IFS=$as_save_IFS | ||
6148 | test -z "$as_dir" && as_dir=. | ||
6149 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6150 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6151 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6152 | ac_cv_prog_AS="${ac_tool_prefix}as" | ||
6153 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6154 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6155 | break 2 | ||
6156 | fi | ||
6157 | done | ||
6158 | -done | ||
6159 | + done | ||
6160 | IFS=$as_save_IFS | ||
6161 | |||
6162 | fi | ||
6163 | fi | ||
6164 | AS=$ac_cv_prog_AS | ||
6165 | if test -n "$AS"; then | ||
6166 | - { $as_echo "$as_me:$LINENO: result: $AS" >&5 | ||
6167 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 | ||
6168 | $as_echo "$AS" >&6; } | ||
6169 | else | ||
6170 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6171 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6172 | $as_echo "no" >&6; } | ||
6173 | fi | ||
6174 | |||
6175 | @@ -4823,9 +5184,9 @@ | ||
6176 | ac_ct_AS=$AS | ||
6177 | # Extract the first word of "as", so it can be a program name with args. | ||
6178 | set dummy as; ac_word=$2 | ||
6179 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6180 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6181 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6182 | -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then | ||
6183 | +if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : | ||
6184 | $as_echo_n "(cached) " >&6 | ||
6185 | else | ||
6186 | if test -n "$ac_ct_AS"; then | ||
6187 | @@ -4836,24 +5197,24 @@ | ||
6188 | do | ||
6189 | IFS=$as_save_IFS | ||
6190 | test -z "$as_dir" && as_dir=. | ||
6191 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6192 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6193 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6194 | ac_cv_prog_ac_ct_AS="as" | ||
6195 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6196 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6197 | break 2 | ||
6198 | fi | ||
6199 | done | ||
6200 | -done | ||
6201 | + done | ||
6202 | IFS=$as_save_IFS | ||
6203 | |||
6204 | fi | ||
6205 | fi | ||
6206 | ac_ct_AS=$ac_cv_prog_ac_ct_AS | ||
6207 | if test -n "$ac_ct_AS"; then | ||
6208 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 | ||
6209 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 | ||
6210 | $as_echo "$ac_ct_AS" >&6; } | ||
6211 | else | ||
6212 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6213 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6214 | $as_echo "no" >&6; } | ||
6215 | fi | ||
6216 | |||
6217 | @@ -4862,7 +5223,7 @@ | ||
6218 | else | ||
6219 | case $cross_compiling:$ac_tool_warned in | ||
6220 | yes:) | ||
6221 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6222 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6223 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
6224 | ac_tool_warned=yes ;; | ||
6225 | esac | ||
6226 | @@ -4875,9 +5236,9 @@ | ||
6227 | if test -n "$ac_tool_prefix"; then | ||
6228 | # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
6229 | set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
6230 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6231 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6232 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6233 | -if test "${ac_cv_prog_DLLTOOL+set}" = set; then | ||
6234 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : | ||
6235 | $as_echo_n "(cached) " >&6 | ||
6236 | else | ||
6237 | if test -n "$DLLTOOL"; then | ||
6238 | @@ -4888,24 +5249,24 @@ | ||
6239 | do | ||
6240 | IFS=$as_save_IFS | ||
6241 | test -z "$as_dir" && as_dir=. | ||
6242 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6243 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6244 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6245 | ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
6246 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6247 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6248 | break 2 | ||
6249 | fi | ||
6250 | done | ||
6251 | -done | ||
6252 | + done | ||
6253 | IFS=$as_save_IFS | ||
6254 | |||
6255 | fi | ||
6256 | fi | ||
6257 | DLLTOOL=$ac_cv_prog_DLLTOOL | ||
6258 | if test -n "$DLLTOOL"; then | ||
6259 | - { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 | ||
6260 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
6261 | $as_echo "$DLLTOOL" >&6; } | ||
6262 | else | ||
6263 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6264 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6265 | $as_echo "no" >&6; } | ||
6266 | fi | ||
6267 | |||
6268 | @@ -4915,9 +5276,9 @@ | ||
6269 | ac_ct_DLLTOOL=$DLLTOOL | ||
6270 | # Extract the first word of "dlltool", so it can be a program name with args. | ||
6271 | set dummy dlltool; ac_word=$2 | ||
6272 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6273 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6274 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6275 | -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then | ||
6276 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : | ||
6277 | $as_echo_n "(cached) " >&6 | ||
6278 | else | ||
6279 | if test -n "$ac_ct_DLLTOOL"; then | ||
6280 | @@ -4928,24 +5289,24 @@ | ||
6281 | do | ||
6282 | IFS=$as_save_IFS | ||
6283 | test -z "$as_dir" && as_dir=. | ||
6284 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6285 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6286 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6287 | ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
6288 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6289 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6290 | break 2 | ||
6291 | fi | ||
6292 | done | ||
6293 | -done | ||
6294 | + done | ||
6295 | IFS=$as_save_IFS | ||
6296 | |||
6297 | fi | ||
6298 | fi | ||
6299 | ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
6300 | if test -n "$ac_ct_DLLTOOL"; then | ||
6301 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 | ||
6302 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
6303 | $as_echo "$ac_ct_DLLTOOL" >&6; } | ||
6304 | else | ||
6305 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6306 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6307 | $as_echo "no" >&6; } | ||
6308 | fi | ||
6309 | |||
6310 | @@ -4954,7 +5315,7 @@ | ||
6311 | else | ||
6312 | case $cross_compiling:$ac_tool_warned in | ||
6313 | yes:) | ||
6314 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6315 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6316 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
6317 | ac_tool_warned=yes ;; | ||
6318 | esac | ||
6319 | @@ -4967,9 +5328,9 @@ | ||
6320 | if test -n "$ac_tool_prefix"; then | ||
6321 | # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. | ||
6322 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 | ||
6323 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6324 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6325 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6326 | -if test "${ac_cv_prog_OBJDUMP+set}" = set; then | ||
6327 | +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : | ||
6328 | $as_echo_n "(cached) " >&6 | ||
6329 | else | ||
6330 | if test -n "$OBJDUMP"; then | ||
6331 | @@ -4980,24 +5341,24 @@ | ||
6332 | do | ||
6333 | IFS=$as_save_IFS | ||
6334 | test -z "$as_dir" && as_dir=. | ||
6335 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6336 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6337 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6338 | ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" | ||
6339 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6340 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6341 | break 2 | ||
6342 | fi | ||
6343 | done | ||
6344 | -done | ||
6345 | + done | ||
6346 | IFS=$as_save_IFS | ||
6347 | |||
6348 | fi | ||
6349 | fi | ||
6350 | OBJDUMP=$ac_cv_prog_OBJDUMP | ||
6351 | if test -n "$OBJDUMP"; then | ||
6352 | - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 | ||
6353 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 | ||
6354 | $as_echo "$OBJDUMP" >&6; } | ||
6355 | else | ||
6356 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6357 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6358 | $as_echo "no" >&6; } | ||
6359 | fi | ||
6360 | |||
6361 | @@ -5007,9 +5368,9 @@ | ||
6362 | ac_ct_OBJDUMP=$OBJDUMP | ||
6363 | # Extract the first word of "objdump", so it can be a program name with args. | ||
6364 | set dummy objdump; ac_word=$2 | ||
6365 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6366 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6367 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6368 | -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then | ||
6369 | +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : | ||
6370 | $as_echo_n "(cached) " >&6 | ||
6371 | else | ||
6372 | if test -n "$ac_ct_OBJDUMP"; then | ||
6373 | @@ -5020,24 +5381,24 @@ | ||
6374 | do | ||
6375 | IFS=$as_save_IFS | ||
6376 | test -z "$as_dir" && as_dir=. | ||
6377 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6378 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6379 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6380 | ac_cv_prog_ac_ct_OBJDUMP="objdump" | ||
6381 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6382 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6383 | break 2 | ||
6384 | fi | ||
6385 | done | ||
6386 | -done | ||
6387 | + done | ||
6388 | IFS=$as_save_IFS | ||
6389 | |||
6390 | fi | ||
6391 | fi | ||
6392 | ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP | ||
6393 | if test -n "$ac_ct_OBJDUMP"; then | ||
6394 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 | ||
6395 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 | ||
6396 | $as_echo "$ac_ct_OBJDUMP" >&6; } | ||
6397 | else | ||
6398 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6399 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6400 | $as_echo "no" >&6; } | ||
6401 | fi | ||
6402 | |||
6403 | @@ -5046,7 +5407,7 @@ | ||
6404 | else | ||
6405 | case $cross_compiling:$ac_tool_warned in | ||
6406 | yes:) | ||
6407 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6408 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6409 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
6410 | ac_tool_warned=yes ;; | ||
6411 | esac | ||
6412 | @@ -5081,14 +5442,14 @@ | ||
6413 | |||
6414 | case `pwd` in | ||
6415 | *\ * | *\ *) | ||
6416 | - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 | ||
6417 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 | ||
6418 | $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; | ||
6419 | esac | ||
6420 | |||
6421 | |||
6422 | |||
6423 | -macro_version='2.2.6' | ||
6424 | -macro_revision='1.3012' | ||
6425 | +macro_version='2.2.6b' | ||
6426 | +macro_revision='1.3017' | ||
6427 | |||
6428 | |||
6429 | |||
6430 | @@ -5104,9 +5465,9 @@ | ||
6431 | |||
6432 | ltmain="$ac_aux_dir/ltmain.sh" | ||
6433 | |||
6434 | -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 | ||
6435 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 | ||
6436 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } | ||
6437 | -if test "${ac_cv_path_SED+set}" = set; then | ||
6438 | +if test "${ac_cv_path_SED+set}" = set; then : | ||
6439 | $as_echo_n "(cached) " >&6 | ||
6440 | else | ||
6441 | ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ | ||
6442 | @@ -5114,7 +5475,7 @@ | ||
6443 | ac_script="$ac_script$as_nl$ac_script" | ||
6444 | done | ||
6445 | echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed | ||
6446 | - $as_unset ac_script || ac_script= | ||
6447 | + { ac_script=; unset ac_script;} | ||
6448 | if test -z "$SED"; then | ||
6449 | ac_path_SED_found=false | ||
6450 | # Loop through the user's path and test for each of PROGNAME-LIST | ||
6451 | @@ -5123,7 +5484,7 @@ | ||
6452 | do | ||
6453 | IFS=$as_save_IFS | ||
6454 | test -z "$as_dir" && as_dir=. | ||
6455 | - for ac_prog in sed gsed; do | ||
6456 | + for ac_prog in sed gsed; do | ||
6457 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6458 | ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" | ||
6459 | { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue | ||
6460 | @@ -5143,7 +5504,7 @@ | ||
6461 | $as_echo '' >> "conftest.nl" | ||
6462 | "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
6463 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
6464 | - ac_count=`expr $ac_count + 1` | ||
6465 | + as_fn_arith $ac_count + 1 && ac_count=$as_val | ||
6466 | if test $ac_count -gt ${ac_path_SED_max-0}; then | ||
6467 | # Best one so far, save it but keep looking for a better one | ||
6468 | ac_cv_path_SED="$ac_path_SED" | ||
6469 | @@ -5158,19 +5519,17 @@ | ||
6470 | $ac_path_SED_found && break 3 | ||
6471 | done | ||
6472 | done | ||
6473 | -done | ||
6474 | + done | ||
6475 | IFS=$as_save_IFS | ||
6476 | if test -z "$ac_cv_path_SED"; then | ||
6477 | - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 | ||
6478 | -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} | ||
6479 | - { (exit 1); exit 1; }; } | ||
6480 | + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 | ||
6481 | fi | ||
6482 | else | ||
6483 | ac_cv_path_SED=$SED | ||
6484 | fi | ||
6485 | |||
6486 | fi | ||
6487 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 | ||
6488 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 | ||
6489 | $as_echo "$ac_cv_path_SED" >&6; } | ||
6490 | SED="$ac_cv_path_SED" | ||
6491 | rm -f conftest.sed | ||
6492 | @@ -5188,9 +5547,9 @@ | ||
6493 | |||
6494 | |||
6495 | |||
6496 | -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | ||
6497 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 | ||
6498 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } | ||
6499 | -if test "${ac_cv_path_GREP+set}" = set; then | ||
6500 | +if test "${ac_cv_path_GREP+set}" = set; then : | ||
6501 | $as_echo_n "(cached) " >&6 | ||
6502 | else | ||
6503 | if test -z "$GREP"; then | ||
6504 | @@ -5201,7 +5560,7 @@ | ||
6505 | do | ||
6506 | IFS=$as_save_IFS | ||
6507 | test -z "$as_dir" && as_dir=. | ||
6508 | - for ac_prog in grep ggrep; do | ||
6509 | + for ac_prog in grep ggrep; do | ||
6510 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6511 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | ||
6512 | { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | ||
6513 | @@ -5221,7 +5580,7 @@ | ||
6514 | $as_echo 'GREP' >> "conftest.nl" | ||
6515 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
6516 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
6517 | - ac_count=`expr $ac_count + 1` | ||
6518 | + as_fn_arith $ac_count + 1 && ac_count=$as_val | ||
6519 | if test $ac_count -gt ${ac_path_GREP_max-0}; then | ||
6520 | # Best one so far, save it but keep looking for a better one | ||
6521 | ac_cv_path_GREP="$ac_path_GREP" | ||
6522 | @@ -5236,26 +5595,24 @@ | ||
6523 | $ac_path_GREP_found && break 3 | ||
6524 | done | ||
6525 | done | ||
6526 | -done | ||
6527 | + done | ||
6528 | IFS=$as_save_IFS | ||
6529 | if test -z "$ac_cv_path_GREP"; then | ||
6530 | - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
6531 | -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
6532 | - { (exit 1); exit 1; }; } | ||
6533 | + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | ||
6534 | fi | ||
6535 | else | ||
6536 | ac_cv_path_GREP=$GREP | ||
6537 | fi | ||
6538 | |||
6539 | fi | ||
6540 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | ||
6541 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 | ||
6542 | $as_echo "$ac_cv_path_GREP" >&6; } | ||
6543 | GREP="$ac_cv_path_GREP" | ||
6544 | |||
6545 | |||
6546 | -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 | ||
6547 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 | ||
6548 | $as_echo_n "checking for egrep... " >&6; } | ||
6549 | -if test "${ac_cv_path_EGREP+set}" = set; then | ||
6550 | +if test "${ac_cv_path_EGREP+set}" = set; then : | ||
6551 | $as_echo_n "(cached) " >&6 | ||
6552 | else | ||
6553 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | ||
6554 | @@ -5269,7 +5626,7 @@ | ||
6555 | do | ||
6556 | IFS=$as_save_IFS | ||
6557 | test -z "$as_dir" && as_dir=. | ||
6558 | - for ac_prog in egrep; do | ||
6559 | + for ac_prog in egrep; do | ||
6560 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6561 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | ||
6562 | { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | ||
6563 | @@ -5289,7 +5646,7 @@ | ||
6564 | $as_echo 'EGREP' >> "conftest.nl" | ||
6565 | "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
6566 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
6567 | - ac_count=`expr $ac_count + 1` | ||
6568 | + as_fn_arith $ac_count + 1 && ac_count=$as_val | ||
6569 | if test $ac_count -gt ${ac_path_EGREP_max-0}; then | ||
6570 | # Best one so far, save it but keep looking for a better one | ||
6571 | ac_cv_path_EGREP="$ac_path_EGREP" | ||
6572 | @@ -5304,12 +5661,10 @@ | ||
6573 | $ac_path_EGREP_found && break 3 | ||
6574 | done | ||
6575 | done | ||
6576 | -done | ||
6577 | + done | ||
6578 | IFS=$as_save_IFS | ||
6579 | if test -z "$ac_cv_path_EGREP"; then | ||
6580 | - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
6581 | -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
6582 | - { (exit 1); exit 1; }; } | ||
6583 | + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | ||
6584 | fi | ||
6585 | else | ||
6586 | ac_cv_path_EGREP=$EGREP | ||
6587 | @@ -5317,14 +5672,14 @@ | ||
6588 | |||
6589 | fi | ||
6590 | fi | ||
6591 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | ||
6592 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 | ||
6593 | $as_echo "$ac_cv_path_EGREP" >&6; } | ||
6594 | EGREP="$ac_cv_path_EGREP" | ||
6595 | |||
6596 | |||
6597 | -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 | ||
6598 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 | ||
6599 | $as_echo_n "checking for fgrep... " >&6; } | ||
6600 | -if test "${ac_cv_path_FGREP+set}" = set; then | ||
6601 | +if test "${ac_cv_path_FGREP+set}" = set; then : | ||
6602 | $as_echo_n "(cached) " >&6 | ||
6603 | else | ||
6604 | if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 | ||
6605 | @@ -5338,7 +5693,7 @@ | ||
6606 | do | ||
6607 | IFS=$as_save_IFS | ||
6608 | test -z "$as_dir" && as_dir=. | ||
6609 | - for ac_prog in fgrep; do | ||
6610 | + for ac_prog in fgrep; do | ||
6611 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6612 | ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" | ||
6613 | { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue | ||
6614 | @@ -5358,7 +5713,7 @@ | ||
6615 | $as_echo 'FGREP' >> "conftest.nl" | ||
6616 | "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
6617 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
6618 | - ac_count=`expr $ac_count + 1` | ||
6619 | + as_fn_arith $ac_count + 1 && ac_count=$as_val | ||
6620 | if test $ac_count -gt ${ac_path_FGREP_max-0}; then | ||
6621 | # Best one so far, save it but keep looking for a better one | ||
6622 | ac_cv_path_FGREP="$ac_path_FGREP" | ||
6623 | @@ -5373,12 +5728,10 @@ | ||
6624 | $ac_path_FGREP_found && break 3 | ||
6625 | done | ||
6626 | done | ||
6627 | -done | ||
6628 | + done | ||
6629 | IFS=$as_save_IFS | ||
6630 | if test -z "$ac_cv_path_FGREP"; then | ||
6631 | - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
6632 | -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
6633 | - { (exit 1); exit 1; }; } | ||
6634 | + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | ||
6635 | fi | ||
6636 | else | ||
6637 | ac_cv_path_FGREP=$FGREP | ||
6638 | @@ -5386,7 +5739,7 @@ | ||
6639 | |||
6640 | fi | ||
6641 | fi | ||
6642 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 | ||
6643 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 | ||
6644 | $as_echo "$ac_cv_path_FGREP" >&6; } | ||
6645 | FGREP="$ac_cv_path_FGREP" | ||
6646 | |||
6647 | @@ -5412,7 +5765,7 @@ | ||
6648 | |||
6649 | |||
6650 | # Check whether --with-gnu-ld was given. | ||
6651 | -if test "${with_gnu_ld+set}" = set; then | ||
6652 | +if test "${with_gnu_ld+set}" = set; then : | ||
6653 | withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | ||
6654 | else | ||
6655 | with_gnu_ld=no | ||
6656 | @@ -5421,7 +5774,7 @@ | ||
6657 | ac_prog=ld | ||
6658 | if test "$GCC" = yes; then | ||
6659 | # Check if gcc -print-prog-name=ld gives a path. | ||
6660 | - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | ||
6661 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 | ||
6662 | $as_echo_n "checking for ld used by $CC... " >&6; } | ||
6663 | case $host in | ||
6664 | *-*-mingw*) | ||
6665 | @@ -5451,13 +5804,13 @@ | ||
6666 | ;; | ||
6667 | esac | ||
6668 | elif test "$with_gnu_ld" = yes; then | ||
6669 | - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 | ||
6670 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 | ||
6671 | $as_echo_n "checking for GNU ld... " >&6; } | ||
6672 | else | ||
6673 | - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | ||
6674 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 | ||
6675 | $as_echo_n "checking for non-GNU ld... " >&6; } | ||
6676 | fi | ||
6677 | -if test "${lt_cv_path_LD+set}" = set; then | ||
6678 | +if test "${lt_cv_path_LD+set}" = set; then : | ||
6679 | $as_echo_n "(cached) " >&6 | ||
6680 | else | ||
6681 | if test -z "$LD"; then | ||
6682 | @@ -5488,18 +5841,16 @@ | ||
6683 | |||
6684 | LD="$lt_cv_path_LD" | ||
6685 | if test -n "$LD"; then | ||
6686 | - { $as_echo "$as_me:$LINENO: result: $LD" >&5 | ||
6687 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 | ||
6688 | $as_echo "$LD" >&6; } | ||
6689 | else | ||
6690 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6691 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6692 | $as_echo "no" >&6; } | ||
6693 | fi | ||
6694 | -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | ||
6695 | -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | ||
6696 | - { (exit 1); exit 1; }; } | ||
6697 | -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | ||
6698 | +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 | ||
6699 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 | ||
6700 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } | ||
6701 | -if test "${lt_cv_prog_gnu_ld+set}" = set; then | ||
6702 | +if test "${lt_cv_prog_gnu_ld+set}" = set; then : | ||
6703 | $as_echo_n "(cached) " >&6 | ||
6704 | else | ||
6705 | # I'd rather use --version here, but apparently some GNU lds only accept -v. | ||
6706 | @@ -5512,7 +5863,7 @@ | ||
6707 | ;; | ||
6708 | esac | ||
6709 | fi | ||
6710 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | ||
6711 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 | ||
6712 | $as_echo "$lt_cv_prog_gnu_ld" >&6; } | ||
6713 | with_gnu_ld=$lt_cv_prog_gnu_ld | ||
6714 | |||
6715 | @@ -5524,9 +5875,9 @@ | ||
6716 | |||
6717 | |||
6718 | |||
6719 | -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 | ||
6720 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 | ||
6721 | $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } | ||
6722 | -if test "${lt_cv_path_NM+set}" = set; then | ||
6723 | +if test "${lt_cv_path_NM+set}" = set; then : | ||
6724 | $as_echo_n "(cached) " >&6 | ||
6725 | else | ||
6726 | if test -n "$NM"; then | ||
6727 | @@ -5573,7 +5924,7 @@ | ||
6728 | : ${lt_cv_path_NM=no} | ||
6729 | fi | ||
6730 | fi | ||
6731 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 | ||
6732 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 | ||
6733 | $as_echo "$lt_cv_path_NM" >&6; } | ||
6734 | if test "$lt_cv_path_NM" != "no"; then | ||
6735 | NM="$lt_cv_path_NM" | ||
6736 | @@ -5584,9 +5935,9 @@ | ||
6737 | do | ||
6738 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
6739 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
6740 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6741 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6742 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6743 | -if test "${ac_cv_prog_DUMPBIN+set}" = set; then | ||
6744 | +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : | ||
6745 | $as_echo_n "(cached) " >&6 | ||
6746 | else | ||
6747 | if test -n "$DUMPBIN"; then | ||
6748 | @@ -5597,24 +5948,24 @@ | ||
6749 | do | ||
6750 | IFS=$as_save_IFS | ||
6751 | test -z "$as_dir" && as_dir=. | ||
6752 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6753 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6754 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6755 | ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" | ||
6756 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6757 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6758 | break 2 | ||
6759 | fi | ||
6760 | done | ||
6761 | -done | ||
6762 | + done | ||
6763 | IFS=$as_save_IFS | ||
6764 | |||
6765 | fi | ||
6766 | fi | ||
6767 | DUMPBIN=$ac_cv_prog_DUMPBIN | ||
6768 | if test -n "$DUMPBIN"; then | ||
6769 | - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 | ||
6770 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 | ||
6771 | $as_echo "$DUMPBIN" >&6; } | ||
6772 | else | ||
6773 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6774 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6775 | $as_echo "no" >&6; } | ||
6776 | fi | ||
6777 | |||
6778 | @@ -5628,9 +5979,9 @@ | ||
6779 | do | ||
6780 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
6781 | set dummy $ac_prog; ac_word=$2 | ||
6782 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6783 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6784 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6785 | -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then | ||
6786 | +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : | ||
6787 | $as_echo_n "(cached) " >&6 | ||
6788 | else | ||
6789 | if test -n "$ac_ct_DUMPBIN"; then | ||
6790 | @@ -5641,24 +5992,24 @@ | ||
6791 | do | ||
6792 | IFS=$as_save_IFS | ||
6793 | test -z "$as_dir" && as_dir=. | ||
6794 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6795 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6796 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6797 | ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" | ||
6798 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6799 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6800 | break 2 | ||
6801 | fi | ||
6802 | done | ||
6803 | -done | ||
6804 | + done | ||
6805 | IFS=$as_save_IFS | ||
6806 | |||
6807 | fi | ||
6808 | fi | ||
6809 | ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN | ||
6810 | if test -n "$ac_ct_DUMPBIN"; then | ||
6811 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 | ||
6812 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 | ||
6813 | $as_echo "$ac_ct_DUMPBIN" >&6; } | ||
6814 | else | ||
6815 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6816 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6817 | $as_echo "no" >&6; } | ||
6818 | fi | ||
6819 | |||
6820 | @@ -5671,7 +6022,7 @@ | ||
6821 | else | ||
6822 | case $cross_compiling:$ac_tool_warned in | ||
6823 | yes:) | ||
6824 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6825 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
6826 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
6827 | ac_tool_warned=yes ;; | ||
6828 | esac | ||
6829 | @@ -5691,33 +6042,33 @@ | ||
6830 | |||
6831 | |||
6832 | |||
6833 | -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 | ||
6834 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 | ||
6835 | $as_echo_n "checking the name lister ($NM) interface... " >&6; } | ||
6836 | -if test "${lt_cv_nm_interface+set}" = set; then | ||
6837 | +if test "${lt_cv_nm_interface+set}" = set; then : | ||
6838 | $as_echo_n "(cached) " >&6 | ||
6839 | else | ||
6840 | lt_cv_nm_interface="BSD nm" | ||
6841 | echo "int some_variable = 0;" > conftest.$ac_ext | ||
6842 | - (eval echo "\"\$as_me:5701: $ac_compile\"" >&5) | ||
6843 | + (eval echo "\"\$as_me:6052: $ac_compile\"" >&5) | ||
6844 | (eval "$ac_compile" 2>conftest.err) | ||
6845 | cat conftest.err >&5 | ||
6846 | - (eval echo "\"\$as_me:5704: $NM \\\"conftest.$ac_objext\\\"\"" >&5) | ||
6847 | + (eval echo "\"\$as_me:6055: $NM \\\"conftest.$ac_objext\\\"\"" >&5) | ||
6848 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | ||
6849 | cat conftest.err >&5 | ||
6850 | - (eval echo "\"\$as_me:5707: output\"" >&5) | ||
6851 | + (eval echo "\"\$as_me:6058: output\"" >&5) | ||
6852 | cat conftest.out >&5 | ||
6853 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | ||
6854 | lt_cv_nm_interface="MS dumpbin" | ||
6855 | fi | ||
6856 | rm -f conftest* | ||
6857 | fi | ||
6858 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 | ||
6859 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 | ||
6860 | $as_echo "$lt_cv_nm_interface" >&6; } | ||
6861 | |||
6862 | # find the maximum length of command line arguments | ||
6863 | -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 | ||
6864 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 | ||
6865 | $as_echo_n "checking the maximum length of command line arguments... " >&6; } | ||
6866 | -if test "${lt_cv_sys_max_cmd_len+set}" = set; then | ||
6867 | +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : | ||
6868 | $as_echo_n "(cached) " >&6 | ||
6869 | else | ||
6870 | i=0 | ||
6871 | @@ -5835,10 +6186,10 @@ | ||
6872 | fi | ||
6873 | |||
6874 | if test -n $lt_cv_sys_max_cmd_len ; then | ||
6875 | - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 | ||
6876 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 | ||
6877 | $as_echo "$lt_cv_sys_max_cmd_len" >&6; } | ||
6878 | else | ||
6879 | - { $as_echo "$as_me:$LINENO: result: none" >&5 | ||
6880 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 | ||
6881 | $as_echo "none" >&6; } | ||
6882 | fi | ||
6883 | max_cmd_len=$lt_cv_sys_max_cmd_len | ||
6884 | @@ -5852,7 +6203,7 @@ | ||
6885 | : ${MV="mv -f"} | ||
6886 | : ${RM="rm -f"} | ||
6887 | |||
6888 | -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 | ||
6889 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 | ||
6890 | $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } | ||
6891 | # Try some XSI features | ||
6892 | xsi_shell=no | ||
6893 | @@ -5862,17 +6213,17 @@ | ||
6894 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
6895 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
6896 | && xsi_shell=yes | ||
6897 | -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 | ||
6898 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 | ||
6899 | $as_echo "$xsi_shell" >&6; } | ||
6900 | |||
6901 | |||
6902 | -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 | ||
6903 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 | ||
6904 | $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } | ||
6905 | lt_shell_append=no | ||
6906 | ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ | ||
6907 | >/dev/null 2>&1 \ | ||
6908 | && lt_shell_append=yes | ||
6909 | -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 | ||
6910 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 | ||
6911 | $as_echo "$lt_shell_append" >&6; } | ||
6912 | |||
6913 | |||
6914 | @@ -5907,14 +6258,14 @@ | ||
6915 | |||
6916 | |||
6917 | |||
6918 | -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 | ||
6919 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
6920 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
6921 | -if test "${lt_cv_ld_reload_flag+set}" = set; then | ||
6922 | +if test "${lt_cv_ld_reload_flag+set}" = set; then : | ||
6923 | $as_echo_n "(cached) " >&6 | ||
6924 | else | ||
6925 | lt_cv_ld_reload_flag='-r' | ||
6926 | fi | ||
6927 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 | ||
6928 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 | ||
6929 | $as_echo "$lt_cv_ld_reload_flag" >&6; } | ||
6930 | reload_flag=$lt_cv_ld_reload_flag | ||
6931 | case $reload_flag in | ||
6932 | @@ -5943,9 +6294,9 @@ | ||
6933 | if test -n "$ac_tool_prefix"; then | ||
6934 | # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. | ||
6935 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 | ||
6936 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6937 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6938 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6939 | -if test "${ac_cv_prog_OBJDUMP+set}" = set; then | ||
6940 | +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : | ||
6941 | $as_echo_n "(cached) " >&6 | ||
6942 | else | ||
6943 | if test -n "$OBJDUMP"; then | ||
6944 | @@ -5956,24 +6307,24 @@ | ||
6945 | do | ||
6946 | IFS=$as_save_IFS | ||
6947 | test -z "$as_dir" && as_dir=. | ||
6948 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6949 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6950 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6951 | ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" | ||
6952 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6953 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6954 | break 2 | ||
6955 | fi | ||
6956 | done | ||
6957 | -done | ||
6958 | + done | ||
6959 | IFS=$as_save_IFS | ||
6960 | |||
6961 | fi | ||
6962 | fi | ||
6963 | OBJDUMP=$ac_cv_prog_OBJDUMP | ||
6964 | if test -n "$OBJDUMP"; then | ||
6965 | - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 | ||
6966 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 | ||
6967 | $as_echo "$OBJDUMP" >&6; } | ||
6968 | else | ||
6969 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
6970 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6971 | $as_echo "no" >&6; } | ||
6972 | fi | ||
6973 | |||
6974 | @@ -5983,9 +6334,9 @@ | ||
6975 | ac_ct_OBJDUMP=$OBJDUMP | ||
6976 | # Extract the first word of "objdump", so it can be a program name with args. | ||
6977 | set dummy objdump; ac_word=$2 | ||
6978 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6979 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
6980 | $as_echo_n "checking for $ac_word... " >&6; } | ||
6981 | -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then | ||
6982 | +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : | ||
6983 | $as_echo_n "(cached) " >&6 | ||
6984 | else | ||
6985 | if test -n "$ac_ct_OBJDUMP"; then | ||
6986 | @@ -5996,24 +6347,24 @@ | ||
6987 | do | ||
6988 | IFS=$as_save_IFS | ||
6989 | test -z "$as_dir" && as_dir=. | ||
6990 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
6991 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
6992 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6993 | ac_cv_prog_ac_ct_OBJDUMP="objdump" | ||
6994 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6995 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6996 | break 2 | ||
6997 | fi | ||
6998 | done | ||
6999 | -done | ||
7000 | + done | ||
7001 | IFS=$as_save_IFS | ||
7002 | |||
7003 | fi | ||
7004 | fi | ||
7005 | ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP | ||
7006 | if test -n "$ac_ct_OBJDUMP"; then | ||
7007 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 | ||
7008 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 | ||
7009 | $as_echo "$ac_ct_OBJDUMP" >&6; } | ||
7010 | else | ||
7011 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7012 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7013 | $as_echo "no" >&6; } | ||
7014 | fi | ||
7015 | |||
7016 | @@ -6022,7 +6373,7 @@ | ||
7017 | else | ||
7018 | case $cross_compiling:$ac_tool_warned in | ||
7019 | yes:) | ||
7020 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7021 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7022 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7023 | ac_tool_warned=yes ;; | ||
7024 | esac | ||
7025 | @@ -6039,9 +6390,9 @@ | ||
7026 | |||
7027 | |||
7028 | |||
7029 | -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 | ||
7030 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 | ||
7031 | $as_echo_n "checking how to recognize dependent libraries... " >&6; } | ||
7032 | -if test "${lt_cv_deplibs_check_method+set}" = set; then | ||
7033 | +if test "${lt_cv_deplibs_check_method+set}" = set; then : | ||
7034 | $as_echo_n "(cached) " >&6 | ||
7035 | else | ||
7036 | lt_cv_file_magic_cmd='$MAGIC_CMD' | ||
7037 | @@ -6235,7 +6586,7 @@ | ||
7038 | esac | ||
7039 | |||
7040 | fi | ||
7041 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 | ||
7042 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
7043 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
7044 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
7045 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
7046 | @@ -6255,9 +6606,9 @@ | ||
7047 | if test -n "$ac_tool_prefix"; then | ||
7048 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
7049 | set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
7050 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7051 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7052 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7053 | -if test "${ac_cv_prog_AR+set}" = set; then | ||
7054 | +if test "${ac_cv_prog_AR+set}" = set; then : | ||
7055 | $as_echo_n "(cached) " >&6 | ||
7056 | else | ||
7057 | if test -n "$AR"; then | ||
7058 | @@ -6268,24 +6619,24 @@ | ||
7059 | do | ||
7060 | IFS=$as_save_IFS | ||
7061 | test -z "$as_dir" && as_dir=. | ||
7062 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7063 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7064 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7065 | ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
7066 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7067 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7068 | break 2 | ||
7069 | fi | ||
7070 | done | ||
7071 | -done | ||
7072 | + done | ||
7073 | IFS=$as_save_IFS | ||
7074 | |||
7075 | fi | ||
7076 | fi | ||
7077 | AR=$ac_cv_prog_AR | ||
7078 | if test -n "$AR"; then | ||
7079 | - { $as_echo "$as_me:$LINENO: result: $AR" >&5 | ||
7080 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 | ||
7081 | $as_echo "$AR" >&6; } | ||
7082 | else | ||
7083 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7084 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7085 | $as_echo "no" >&6; } | ||
7086 | fi | ||
7087 | |||
7088 | @@ -6295,9 +6646,9 @@ | ||
7089 | ac_ct_AR=$AR | ||
7090 | # Extract the first word of "ar", so it can be a program name with args. | ||
7091 | set dummy ar; ac_word=$2 | ||
7092 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7093 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7094 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7095 | -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | ||
7096 | +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | ||
7097 | $as_echo_n "(cached) " >&6 | ||
7098 | else | ||
7099 | if test -n "$ac_ct_AR"; then | ||
7100 | @@ -6308,24 +6659,24 @@ | ||
7101 | do | ||
7102 | IFS=$as_save_IFS | ||
7103 | test -z "$as_dir" && as_dir=. | ||
7104 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7105 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7106 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7107 | ac_cv_prog_ac_ct_AR="ar" | ||
7108 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7109 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7110 | break 2 | ||
7111 | fi | ||
7112 | done | ||
7113 | -done | ||
7114 | + done | ||
7115 | IFS=$as_save_IFS | ||
7116 | |||
7117 | fi | ||
7118 | fi | ||
7119 | ac_ct_AR=$ac_cv_prog_ac_ct_AR | ||
7120 | if test -n "$ac_ct_AR"; then | ||
7121 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | ||
7122 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 | ||
7123 | $as_echo "$ac_ct_AR" >&6; } | ||
7124 | else | ||
7125 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7126 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7127 | $as_echo "no" >&6; } | ||
7128 | fi | ||
7129 | |||
7130 | @@ -6334,7 +6685,7 @@ | ||
7131 | else | ||
7132 | case $cross_compiling:$ac_tool_warned in | ||
7133 | yes:) | ||
7134 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7135 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7136 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7137 | ac_tool_warned=yes ;; | ||
7138 | esac | ||
7139 | @@ -6360,9 +6711,9 @@ | ||
7140 | if test -n "$ac_tool_prefix"; then | ||
7141 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
7142 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
7143 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7144 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7145 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7146 | -if test "${ac_cv_prog_STRIP+set}" = set; then | ||
7147 | +if test "${ac_cv_prog_STRIP+set}" = set; then : | ||
7148 | $as_echo_n "(cached) " >&6 | ||
7149 | else | ||
7150 | if test -n "$STRIP"; then | ||
7151 | @@ -6373,24 +6724,24 @@ | ||
7152 | do | ||
7153 | IFS=$as_save_IFS | ||
7154 | test -z "$as_dir" && as_dir=. | ||
7155 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7156 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7157 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7158 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
7159 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7160 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7161 | break 2 | ||
7162 | fi | ||
7163 | done | ||
7164 | -done | ||
7165 | + done | ||
7166 | IFS=$as_save_IFS | ||
7167 | |||
7168 | fi | ||
7169 | fi | ||
7170 | STRIP=$ac_cv_prog_STRIP | ||
7171 | if test -n "$STRIP"; then | ||
7172 | - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 | ||
7173 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 | ||
7174 | $as_echo "$STRIP" >&6; } | ||
7175 | else | ||
7176 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7177 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7178 | $as_echo "no" >&6; } | ||
7179 | fi | ||
7180 | |||
7181 | @@ -6400,9 +6751,9 @@ | ||
7182 | ac_ct_STRIP=$STRIP | ||
7183 | # Extract the first word of "strip", so it can be a program name with args. | ||
7184 | set dummy strip; ac_word=$2 | ||
7185 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7186 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7187 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7188 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | ||
7189 | +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : | ||
7190 | $as_echo_n "(cached) " >&6 | ||
7191 | else | ||
7192 | if test -n "$ac_ct_STRIP"; then | ||
7193 | @@ -6413,24 +6764,24 @@ | ||
7194 | do | ||
7195 | IFS=$as_save_IFS | ||
7196 | test -z "$as_dir" && as_dir=. | ||
7197 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7198 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7199 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7200 | ac_cv_prog_ac_ct_STRIP="strip" | ||
7201 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7202 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7203 | break 2 | ||
7204 | fi | ||
7205 | done | ||
7206 | -done | ||
7207 | + done | ||
7208 | IFS=$as_save_IFS | ||
7209 | |||
7210 | fi | ||
7211 | fi | ||
7212 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
7213 | if test -n "$ac_ct_STRIP"; then | ||
7214 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | ||
7215 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 | ||
7216 | $as_echo "$ac_ct_STRIP" >&6; } | ||
7217 | else | ||
7218 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7219 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7220 | $as_echo "no" >&6; } | ||
7221 | fi | ||
7222 | |||
7223 | @@ -6439,7 +6790,7 @@ | ||
7224 | else | ||
7225 | case $cross_compiling:$ac_tool_warned in | ||
7226 | yes:) | ||
7227 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7228 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7229 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7230 | ac_tool_warned=yes ;; | ||
7231 | esac | ||
7232 | @@ -6459,9 +6810,9 @@ | ||
7233 | if test -n "$ac_tool_prefix"; then | ||
7234 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | ||
7235 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | ||
7236 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7237 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7238 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7239 | -if test "${ac_cv_prog_RANLIB+set}" = set; then | ||
7240 | +if test "${ac_cv_prog_RANLIB+set}" = set; then : | ||
7241 | $as_echo_n "(cached) " >&6 | ||
7242 | else | ||
7243 | if test -n "$RANLIB"; then | ||
7244 | @@ -6472,24 +6823,24 @@ | ||
7245 | do | ||
7246 | IFS=$as_save_IFS | ||
7247 | test -z "$as_dir" && as_dir=. | ||
7248 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7249 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7250 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7251 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | ||
7252 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7253 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7254 | break 2 | ||
7255 | fi | ||
7256 | done | ||
7257 | -done | ||
7258 | + done | ||
7259 | IFS=$as_save_IFS | ||
7260 | |||
7261 | fi | ||
7262 | fi | ||
7263 | RANLIB=$ac_cv_prog_RANLIB | ||
7264 | if test -n "$RANLIB"; then | ||
7265 | - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 | ||
7266 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 | ||
7267 | $as_echo "$RANLIB" >&6; } | ||
7268 | else | ||
7269 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7270 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7271 | $as_echo "no" >&6; } | ||
7272 | fi | ||
7273 | |||
7274 | @@ -6499,9 +6850,9 @@ | ||
7275 | ac_ct_RANLIB=$RANLIB | ||
7276 | # Extract the first word of "ranlib", so it can be a program name with args. | ||
7277 | set dummy ranlib; ac_word=$2 | ||
7278 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7279 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7280 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7281 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | ||
7282 | +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : | ||
7283 | $as_echo_n "(cached) " >&6 | ||
7284 | else | ||
7285 | if test -n "$ac_ct_RANLIB"; then | ||
7286 | @@ -6512,24 +6863,24 @@ | ||
7287 | do | ||
7288 | IFS=$as_save_IFS | ||
7289 | test -z "$as_dir" && as_dir=. | ||
7290 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7291 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7292 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7293 | ac_cv_prog_ac_ct_RANLIB="ranlib" | ||
7294 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7295 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7296 | break 2 | ||
7297 | fi | ||
7298 | done | ||
7299 | -done | ||
7300 | + done | ||
7301 | IFS=$as_save_IFS | ||
7302 | |||
7303 | fi | ||
7304 | fi | ||
7305 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | ||
7306 | if test -n "$ac_ct_RANLIB"; then | ||
7307 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | ||
7308 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 | ||
7309 | $as_echo "$ac_ct_RANLIB" >&6; } | ||
7310 | else | ||
7311 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7312 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7313 | $as_echo "no" >&6; } | ||
7314 | fi | ||
7315 | |||
7316 | @@ -6538,7 +6889,7 @@ | ||
7317 | else | ||
7318 | case $cross_compiling:$ac_tool_warned in | ||
7319 | yes:) | ||
7320 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7321 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7322 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7323 | ac_tool_warned=yes ;; | ||
7324 | esac | ||
7325 | @@ -6616,9 +6967,9 @@ | ||
7326 | |||
7327 | |||
7328 | # Check for command to grab the raw symbol name followed by C symbol from nm. | ||
7329 | -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 | ||
7330 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 | ||
7331 | $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } | ||
7332 | -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then | ||
7333 | +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : | ||
7334 | $as_echo_n "(cached) " >&6 | ||
7335 | else | ||
7336 | |||
7337 | @@ -6734,18 +7085,18 @@ | ||
7338 | int main(){nm_test_var='a';nm_test_func();return(0);} | ||
7339 | _LT_EOF | ||
7340 | |||
7341 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7342 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
7343 | (eval $ac_compile) 2>&5 | ||
7344 | ac_status=$? | ||
7345 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7346 | - (exit $ac_status); }; then | ||
7347 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
7348 | + test $ac_status = 0; }; then | ||
7349 | # Now try to grab the symbols. | ||
7350 | nlist=conftest.nm | ||
7351 | - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 | ||
7352 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 | ||
7353 | (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 | ||
7354 | ac_status=$? | ||
7355 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7356 | - (exit $ac_status); } && test -s "$nlist"; then | ||
7357 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
7358 | + test $ac_status = 0; } && test -s "$nlist"; then | ||
7359 | # Try sorting and uniquifying the output. | ||
7360 | if sort "$nlist" | uniq > "$nlist"T; then | ||
7361 | mv -f "$nlist"T "$nlist" | ||
7362 | @@ -6798,11 +7149,11 @@ | ||
7363 | lt_save_CFLAGS="$CFLAGS" | ||
7364 | LIBS="conftstm.$ac_objext" | ||
7365 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
7366 | - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7367 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
7368 | (eval $ac_link) 2>&5 | ||
7369 | ac_status=$? | ||
7370 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7371 | - (exit $ac_status); } && test -s conftest${ac_exeext}; then | ||
7372 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
7373 | + test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
7374 | pipe_works=yes | ||
7375 | fi | ||
7376 | LIBS="$lt_save_LIBS" | ||
7377 | @@ -6836,10 +7187,10 @@ | ||
7378 | lt_cv_sys_global_symbol_to_cdecl= | ||
7379 | fi | ||
7380 | if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then | ||
7381 | - { $as_echo "$as_me:$LINENO: result: failed" >&5 | ||
7382 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 | ||
7383 | $as_echo "failed" >&6; } | ||
7384 | else | ||
7385 | - { $as_echo "$as_me:$LINENO: result: ok" >&5 | ||
7386 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 | ||
7387 | $as_echo "ok" >&6; } | ||
7388 | fi | ||
7389 | |||
7390 | @@ -6865,7 +7216,7 @@ | ||
7391 | |||
7392 | |||
7393 | # Check whether --enable-libtool-lock was given. | ||
7394 | -if test "${enable_libtool_lock+set}" = set; then | ||
7395 | +if test "${enable_libtool_lock+set}" = set; then : | ||
7396 | enableval=$enable_libtool_lock; | ||
7397 | fi | ||
7398 | |||
7399 | @@ -6877,11 +7228,11 @@ | ||
7400 | ia64-*-hpux*) | ||
7401 | # Find out which ABI we are using. | ||
7402 | echo 'int i;' > conftest.$ac_ext | ||
7403 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7404 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
7405 | (eval $ac_compile) 2>&5 | ||
7406 | ac_status=$? | ||
7407 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7408 | - (exit $ac_status); }; then | ||
7409 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
7410 | + test $ac_status = 0; }; then | ||
7411 | case `/usr/bin/file conftest.$ac_objext` in | ||
7412 | *ELF-32*) | ||
7413 | HPUX_IA64_MODE="32" | ||
7414 | @@ -6895,12 +7246,12 @@ | ||
7415 | ;; | ||
7416 | *-*-irix6*) | ||
7417 | # Find out which ABI we are using. | ||
7418 | - echo '#line 6898 "configure"' > conftest.$ac_ext | ||
7419 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7420 | + echo '#line 7249 "configure"' > conftest.$ac_ext | ||
7421 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
7422 | (eval $ac_compile) 2>&5 | ||
7423 | ac_status=$? | ||
7424 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7425 | - (exit $ac_status); }; then | ||
7426 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
7427 | + test $ac_status = 0; }; then | ||
7428 | if test "$lt_cv_prog_gnu_ld" = yes; then | ||
7429 | case `/usr/bin/file conftest.$ac_objext` in | ||
7430 | *32-bit*) | ||
7431 | @@ -6934,11 +7285,11 @@ | ||
7432 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | ||
7433 | # Find out which ABI we are using. | ||
7434 | echo 'int i;' > conftest.$ac_ext | ||
7435 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7436 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
7437 | (eval $ac_compile) 2>&5 | ||
7438 | ac_status=$? | ||
7439 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7440 | - (exit $ac_status); }; then | ||
7441 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
7442 | + test $ac_status = 0; }; then | ||
7443 | case `/usr/bin/file conftest.o` in | ||
7444 | *32-bit*) | ||
7445 | case $host in | ||
7446 | @@ -6987,9 +7338,9 @@ | ||
7447 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. | ||
7448 | SAVE_CFLAGS="$CFLAGS" | ||
7449 | CFLAGS="$CFLAGS -belf" | ||
7450 | - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 | ||
7451 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 | ||
7452 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } | ||
7453 | -if test "${lt_cv_cc_needs_belf+set}" = set; then | ||
7454 | +if test "${lt_cv_cc_needs_belf+set}" = set; then : | ||
7455 | $as_echo_n "(cached) " >&6 | ||
7456 | else | ||
7457 | ac_ext=c | ||
7458 | @@ -6998,11 +7349,7 @@ | ||
7459 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
7460 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
7461 | |||
7462 | - cat >conftest.$ac_ext <<_ACEOF | ||
7463 | -/* confdefs.h. */ | ||
7464 | -_ACEOF | ||
7465 | -cat confdefs.h >>conftest.$ac_ext | ||
7466 | -cat >>conftest.$ac_ext <<_ACEOF | ||
7467 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
7468 | /* end confdefs.h. */ | ||
7469 | |||
7470 | int | ||
7471 | @@ -7013,38 +7360,13 @@ | ||
7472 | return 0; | ||
7473 | } | ||
7474 | _ACEOF | ||
7475 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
7476 | -if { (ac_try="$ac_link" | ||
7477 | -case "(($ac_try" in | ||
7478 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7479 | - *) ac_try_echo=$ac_try;; | ||
7480 | -esac | ||
7481 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
7482 | -$as_echo "$ac_try_echo") >&5 | ||
7483 | - (eval "$ac_link") 2>conftest.er1 | ||
7484 | - ac_status=$? | ||
7485 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
7486 | - rm -f conftest.er1 | ||
7487 | - cat conftest.err >&5 | ||
7488 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7489 | - (exit $ac_status); } && { | ||
7490 | - test -z "$ac_c_werror_flag" || | ||
7491 | - test ! -s conftest.err | ||
7492 | - } && test -s conftest$ac_exeext && { | ||
7493 | - test "$cross_compiling" = yes || | ||
7494 | - $as_test_x conftest$ac_exeext | ||
7495 | - }; then | ||
7496 | +if ac_fn_c_try_link "$LINENO"; then : | ||
7497 | lt_cv_cc_needs_belf=yes | ||
7498 | else | ||
7499 | - $as_echo "$as_me: failed program was:" >&5 | ||
7500 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
7501 | - | ||
7502 | - lt_cv_cc_needs_belf=no | ||
7503 | + lt_cv_cc_needs_belf=no | ||
7504 | fi | ||
7505 | - | ||
7506 | -rm -rf conftest.dSYM | ||
7507 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7508 | - conftest$ac_exeext conftest.$ac_ext | ||
7509 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7510 | + conftest$ac_exeext conftest.$ac_ext | ||
7511 | ac_ext=c | ||
7512 | ac_cpp='$CPP $CPPFLAGS' | ||
7513 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
7514 | @@ -7052,7 +7374,7 @@ | ||
7515 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
7516 | |||
7517 | fi | ||
7518 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 | ||
7519 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 | ||
7520 | $as_echo "$lt_cv_cc_needs_belf" >&6; } | ||
7521 | if test x"$lt_cv_cc_needs_belf" != x"yes"; then | ||
7522 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf | ||
7523 | @@ -7062,11 +7384,11 @@ | ||
7524 | sparc*-*solaris*) | ||
7525 | # Find out which ABI we are using. | ||
7526 | echo 'int i;' > conftest.$ac_ext | ||
7527 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7528 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
7529 | (eval $ac_compile) 2>&5 | ||
7530 | ac_status=$? | ||
7531 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7532 | - (exit $ac_status); }; then | ||
7533 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
7534 | + test $ac_status = 0; }; then | ||
7535 | case `/usr/bin/file conftest.o` in | ||
7536 | *64-bit*) | ||
7537 | case $lt_cv_prog_gnu_ld in | ||
7538 | @@ -7092,9 +7414,9 @@ | ||
7539 | if test -n "$ac_tool_prefix"; then | ||
7540 | # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. | ||
7541 | set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 | ||
7542 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7543 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7544 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7545 | -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then | ||
7546 | +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : | ||
7547 | $as_echo_n "(cached) " >&6 | ||
7548 | else | ||
7549 | if test -n "$DSYMUTIL"; then | ||
7550 | @@ -7105,24 +7427,24 @@ | ||
7551 | do | ||
7552 | IFS=$as_save_IFS | ||
7553 | test -z "$as_dir" && as_dir=. | ||
7554 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7555 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7556 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7557 | ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" | ||
7558 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7559 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7560 | break 2 | ||
7561 | fi | ||
7562 | done | ||
7563 | -done | ||
7564 | + done | ||
7565 | IFS=$as_save_IFS | ||
7566 | |||
7567 | fi | ||
7568 | fi | ||
7569 | DSYMUTIL=$ac_cv_prog_DSYMUTIL | ||
7570 | if test -n "$DSYMUTIL"; then | ||
7571 | - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 | ||
7572 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 | ||
7573 | $as_echo "$DSYMUTIL" >&6; } | ||
7574 | else | ||
7575 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7576 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7577 | $as_echo "no" >&6; } | ||
7578 | fi | ||
7579 | |||
7580 | @@ -7132,9 +7454,9 @@ | ||
7581 | ac_ct_DSYMUTIL=$DSYMUTIL | ||
7582 | # Extract the first word of "dsymutil", so it can be a program name with args. | ||
7583 | set dummy dsymutil; ac_word=$2 | ||
7584 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7585 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7586 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7587 | -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then | ||
7588 | +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : | ||
7589 | $as_echo_n "(cached) " >&6 | ||
7590 | else | ||
7591 | if test -n "$ac_ct_DSYMUTIL"; then | ||
7592 | @@ -7145,24 +7467,24 @@ | ||
7593 | do | ||
7594 | IFS=$as_save_IFS | ||
7595 | test -z "$as_dir" && as_dir=. | ||
7596 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7597 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7598 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7599 | ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" | ||
7600 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7601 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7602 | break 2 | ||
7603 | fi | ||
7604 | done | ||
7605 | -done | ||
7606 | + done | ||
7607 | IFS=$as_save_IFS | ||
7608 | |||
7609 | fi | ||
7610 | fi | ||
7611 | ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL | ||
7612 | if test -n "$ac_ct_DSYMUTIL"; then | ||
7613 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 | ||
7614 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 | ||
7615 | $as_echo "$ac_ct_DSYMUTIL" >&6; } | ||
7616 | else | ||
7617 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7618 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7619 | $as_echo "no" >&6; } | ||
7620 | fi | ||
7621 | |||
7622 | @@ -7171,7 +7493,7 @@ | ||
7623 | else | ||
7624 | case $cross_compiling:$ac_tool_warned in | ||
7625 | yes:) | ||
7626 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7627 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7628 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7629 | ac_tool_warned=yes ;; | ||
7630 | esac | ||
7631 | @@ -7184,9 +7506,9 @@ | ||
7632 | if test -n "$ac_tool_prefix"; then | ||
7633 | # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. | ||
7634 | set dummy ${ac_tool_prefix}nmedit; ac_word=$2 | ||
7635 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7636 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7637 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7638 | -if test "${ac_cv_prog_NMEDIT+set}" = set; then | ||
7639 | +if test "${ac_cv_prog_NMEDIT+set}" = set; then : | ||
7640 | $as_echo_n "(cached) " >&6 | ||
7641 | else | ||
7642 | if test -n "$NMEDIT"; then | ||
7643 | @@ -7197,24 +7519,24 @@ | ||
7644 | do | ||
7645 | IFS=$as_save_IFS | ||
7646 | test -z "$as_dir" && as_dir=. | ||
7647 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7648 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7649 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7650 | ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" | ||
7651 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7652 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7653 | break 2 | ||
7654 | fi | ||
7655 | done | ||
7656 | -done | ||
7657 | + done | ||
7658 | IFS=$as_save_IFS | ||
7659 | |||
7660 | fi | ||
7661 | fi | ||
7662 | NMEDIT=$ac_cv_prog_NMEDIT | ||
7663 | if test -n "$NMEDIT"; then | ||
7664 | - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 | ||
7665 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 | ||
7666 | $as_echo "$NMEDIT" >&6; } | ||
7667 | else | ||
7668 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7669 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7670 | $as_echo "no" >&6; } | ||
7671 | fi | ||
7672 | |||
7673 | @@ -7224,9 +7546,9 @@ | ||
7674 | ac_ct_NMEDIT=$NMEDIT | ||
7675 | # Extract the first word of "nmedit", so it can be a program name with args. | ||
7676 | set dummy nmedit; ac_word=$2 | ||
7677 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7678 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7679 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7680 | -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then | ||
7681 | +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : | ||
7682 | $as_echo_n "(cached) " >&6 | ||
7683 | else | ||
7684 | if test -n "$ac_ct_NMEDIT"; then | ||
7685 | @@ -7237,24 +7559,24 @@ | ||
7686 | do | ||
7687 | IFS=$as_save_IFS | ||
7688 | test -z "$as_dir" && as_dir=. | ||
7689 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7690 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7691 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7692 | ac_cv_prog_ac_ct_NMEDIT="nmedit" | ||
7693 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7694 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7695 | break 2 | ||
7696 | fi | ||
7697 | done | ||
7698 | -done | ||
7699 | + done | ||
7700 | IFS=$as_save_IFS | ||
7701 | |||
7702 | fi | ||
7703 | fi | ||
7704 | ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT | ||
7705 | if test -n "$ac_ct_NMEDIT"; then | ||
7706 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 | ||
7707 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 | ||
7708 | $as_echo "$ac_ct_NMEDIT" >&6; } | ||
7709 | else | ||
7710 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7711 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7712 | $as_echo "no" >&6; } | ||
7713 | fi | ||
7714 | |||
7715 | @@ -7263,7 +7585,7 @@ | ||
7716 | else | ||
7717 | case $cross_compiling:$ac_tool_warned in | ||
7718 | yes:) | ||
7719 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7720 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7721 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7722 | ac_tool_warned=yes ;; | ||
7723 | esac | ||
7724 | @@ -7276,9 +7598,9 @@ | ||
7725 | if test -n "$ac_tool_prefix"; then | ||
7726 | # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. | ||
7727 | set dummy ${ac_tool_prefix}lipo; ac_word=$2 | ||
7728 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7729 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7730 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7731 | -if test "${ac_cv_prog_LIPO+set}" = set; then | ||
7732 | +if test "${ac_cv_prog_LIPO+set}" = set; then : | ||
7733 | $as_echo_n "(cached) " >&6 | ||
7734 | else | ||
7735 | if test -n "$LIPO"; then | ||
7736 | @@ -7289,24 +7611,24 @@ | ||
7737 | do | ||
7738 | IFS=$as_save_IFS | ||
7739 | test -z "$as_dir" && as_dir=. | ||
7740 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7741 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7742 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7743 | ac_cv_prog_LIPO="${ac_tool_prefix}lipo" | ||
7744 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7745 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7746 | break 2 | ||
7747 | fi | ||
7748 | done | ||
7749 | -done | ||
7750 | + done | ||
7751 | IFS=$as_save_IFS | ||
7752 | |||
7753 | fi | ||
7754 | fi | ||
7755 | LIPO=$ac_cv_prog_LIPO | ||
7756 | if test -n "$LIPO"; then | ||
7757 | - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 | ||
7758 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 | ||
7759 | $as_echo "$LIPO" >&6; } | ||
7760 | else | ||
7761 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7762 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7763 | $as_echo "no" >&6; } | ||
7764 | fi | ||
7765 | |||
7766 | @@ -7316,9 +7638,9 @@ | ||
7767 | ac_ct_LIPO=$LIPO | ||
7768 | # Extract the first word of "lipo", so it can be a program name with args. | ||
7769 | set dummy lipo; ac_word=$2 | ||
7770 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7771 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7772 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7773 | -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then | ||
7774 | +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : | ||
7775 | $as_echo_n "(cached) " >&6 | ||
7776 | else | ||
7777 | if test -n "$ac_ct_LIPO"; then | ||
7778 | @@ -7329,24 +7651,24 @@ | ||
7779 | do | ||
7780 | IFS=$as_save_IFS | ||
7781 | test -z "$as_dir" && as_dir=. | ||
7782 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7783 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7784 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7785 | ac_cv_prog_ac_ct_LIPO="lipo" | ||
7786 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7787 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7788 | break 2 | ||
7789 | fi | ||
7790 | done | ||
7791 | -done | ||
7792 | + done | ||
7793 | IFS=$as_save_IFS | ||
7794 | |||
7795 | fi | ||
7796 | fi | ||
7797 | ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO | ||
7798 | if test -n "$ac_ct_LIPO"; then | ||
7799 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 | ||
7800 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 | ||
7801 | $as_echo "$ac_ct_LIPO" >&6; } | ||
7802 | else | ||
7803 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7804 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7805 | $as_echo "no" >&6; } | ||
7806 | fi | ||
7807 | |||
7808 | @@ -7355,7 +7677,7 @@ | ||
7809 | else | ||
7810 | case $cross_compiling:$ac_tool_warned in | ||
7811 | yes:) | ||
7812 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7813 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7814 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7815 | ac_tool_warned=yes ;; | ||
7816 | esac | ||
7817 | @@ -7368,9 +7690,9 @@ | ||
7818 | if test -n "$ac_tool_prefix"; then | ||
7819 | # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. | ||
7820 | set dummy ${ac_tool_prefix}otool; ac_word=$2 | ||
7821 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7822 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7823 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7824 | -if test "${ac_cv_prog_OTOOL+set}" = set; then | ||
7825 | +if test "${ac_cv_prog_OTOOL+set}" = set; then : | ||
7826 | $as_echo_n "(cached) " >&6 | ||
7827 | else | ||
7828 | if test -n "$OTOOL"; then | ||
7829 | @@ -7381,24 +7703,24 @@ | ||
7830 | do | ||
7831 | IFS=$as_save_IFS | ||
7832 | test -z "$as_dir" && as_dir=. | ||
7833 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7834 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7835 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7836 | ac_cv_prog_OTOOL="${ac_tool_prefix}otool" | ||
7837 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7838 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7839 | break 2 | ||
7840 | fi | ||
7841 | done | ||
7842 | -done | ||
7843 | + done | ||
7844 | IFS=$as_save_IFS | ||
7845 | |||
7846 | fi | ||
7847 | fi | ||
7848 | OTOOL=$ac_cv_prog_OTOOL | ||
7849 | if test -n "$OTOOL"; then | ||
7850 | - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 | ||
7851 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 | ||
7852 | $as_echo "$OTOOL" >&6; } | ||
7853 | else | ||
7854 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7855 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7856 | $as_echo "no" >&6; } | ||
7857 | fi | ||
7858 | |||
7859 | @@ -7408,9 +7730,9 @@ | ||
7860 | ac_ct_OTOOL=$OTOOL | ||
7861 | # Extract the first word of "otool", so it can be a program name with args. | ||
7862 | set dummy otool; ac_word=$2 | ||
7863 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7864 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7865 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7866 | -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then | ||
7867 | +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : | ||
7868 | $as_echo_n "(cached) " >&6 | ||
7869 | else | ||
7870 | if test -n "$ac_ct_OTOOL"; then | ||
7871 | @@ -7421,24 +7743,24 @@ | ||
7872 | do | ||
7873 | IFS=$as_save_IFS | ||
7874 | test -z "$as_dir" && as_dir=. | ||
7875 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7876 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7877 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7878 | ac_cv_prog_ac_ct_OTOOL="otool" | ||
7879 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7880 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7881 | break 2 | ||
7882 | fi | ||
7883 | done | ||
7884 | -done | ||
7885 | + done | ||
7886 | IFS=$as_save_IFS | ||
7887 | |||
7888 | fi | ||
7889 | fi | ||
7890 | ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL | ||
7891 | if test -n "$ac_ct_OTOOL"; then | ||
7892 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 | ||
7893 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 | ||
7894 | $as_echo "$ac_ct_OTOOL" >&6; } | ||
7895 | else | ||
7896 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7897 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7898 | $as_echo "no" >&6; } | ||
7899 | fi | ||
7900 | |||
7901 | @@ -7447,7 +7769,7 @@ | ||
7902 | else | ||
7903 | case $cross_compiling:$ac_tool_warned in | ||
7904 | yes:) | ||
7905 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7906 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7907 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
7908 | ac_tool_warned=yes ;; | ||
7909 | esac | ||
7910 | @@ -7460,9 +7782,9 @@ | ||
7911 | if test -n "$ac_tool_prefix"; then | ||
7912 | # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. | ||
7913 | set dummy ${ac_tool_prefix}otool64; ac_word=$2 | ||
7914 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7915 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7916 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7917 | -if test "${ac_cv_prog_OTOOL64+set}" = set; then | ||
7918 | +if test "${ac_cv_prog_OTOOL64+set}" = set; then : | ||
7919 | $as_echo_n "(cached) " >&6 | ||
7920 | else | ||
7921 | if test -n "$OTOOL64"; then | ||
7922 | @@ -7473,24 +7795,24 @@ | ||
7923 | do | ||
7924 | IFS=$as_save_IFS | ||
7925 | test -z "$as_dir" && as_dir=. | ||
7926 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7927 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7928 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7929 | ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" | ||
7930 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7931 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7932 | break 2 | ||
7933 | fi | ||
7934 | done | ||
7935 | -done | ||
7936 | + done | ||
7937 | IFS=$as_save_IFS | ||
7938 | |||
7939 | fi | ||
7940 | fi | ||
7941 | OTOOL64=$ac_cv_prog_OTOOL64 | ||
7942 | if test -n "$OTOOL64"; then | ||
7943 | - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 | ||
7944 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 | ||
7945 | $as_echo "$OTOOL64" >&6; } | ||
7946 | else | ||
7947 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7948 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7949 | $as_echo "no" >&6; } | ||
7950 | fi | ||
7951 | |||
7952 | @@ -7500,9 +7822,9 @@ | ||
7953 | ac_ct_OTOOL64=$OTOOL64 | ||
7954 | # Extract the first word of "otool64", so it can be a program name with args. | ||
7955 | set dummy otool64; ac_word=$2 | ||
7956 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
7957 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
7958 | $as_echo_n "checking for $ac_word... " >&6; } | ||
7959 | -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then | ||
7960 | +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : | ||
7961 | $as_echo_n "(cached) " >&6 | ||
7962 | else | ||
7963 | if test -n "$ac_ct_OTOOL64"; then | ||
7964 | @@ -7513,24 +7835,24 @@ | ||
7965 | do | ||
7966 | IFS=$as_save_IFS | ||
7967 | test -z "$as_dir" && as_dir=. | ||
7968 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
7969 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
7970 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
7971 | ac_cv_prog_ac_ct_OTOOL64="otool64" | ||
7972 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7973 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
7974 | break 2 | ||
7975 | fi | ||
7976 | done | ||
7977 | -done | ||
7978 | + done | ||
7979 | IFS=$as_save_IFS | ||
7980 | |||
7981 | fi | ||
7982 | fi | ||
7983 | ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 | ||
7984 | if test -n "$ac_ct_OTOOL64"; then | ||
7985 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 | ||
7986 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 | ||
7987 | $as_echo "$ac_ct_OTOOL64" >&6; } | ||
7988 | else | ||
7989 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
7990 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
7991 | $as_echo "no" >&6; } | ||
7992 | fi | ||
7993 | |||
7994 | @@ -7539,7 +7861,7 @@ | ||
7995 | else | ||
7996 | case $cross_compiling:$ac_tool_warned in | ||
7997 | yes:) | ||
7998 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
7999 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
8000 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
8001 | ac_tool_warned=yes ;; | ||
8002 | esac | ||
8003 | @@ -7575,9 +7897,9 @@ | ||
8004 | |||
8005 | |||
8006 | |||
8007 | - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 | ||
8008 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 | ||
8009 | $as_echo_n "checking for -single_module linker flag... " >&6; } | ||
8010 | -if test "${lt_cv_apple_cc_single_mod+set}" = set; then | ||
8011 | +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : | ||
8012 | $as_echo_n "(cached) " >&6 | ||
8013 | else | ||
8014 | lt_cv_apple_cc_single_mod=no | ||
8015 | @@ -7602,22 +7924,18 @@ | ||
8016 | rm -f conftest.* | ||
8017 | fi | ||
8018 | fi | ||
8019 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 | ||
8020 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 | ||
8021 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } | ||
8022 | - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 | ||
8023 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 | ||
8024 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } | ||
8025 | -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then | ||
8026 | +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : | ||
8027 | $as_echo_n "(cached) " >&6 | ||
8028 | else | ||
8029 | lt_cv_ld_exported_symbols_list=no | ||
8030 | save_LDFLAGS=$LDFLAGS | ||
8031 | echo "_main" > conftest.sym | ||
8032 | LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" | ||
8033 | - cat >conftest.$ac_ext <<_ACEOF | ||
8034 | -/* confdefs.h. */ | ||
8035 | -_ACEOF | ||
8036 | -cat confdefs.h >>conftest.$ac_ext | ||
8037 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8038 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8039 | /* end confdefs.h. */ | ||
8040 | |||
8041 | int | ||
8042 | @@ -7628,42 +7946,17 @@ | ||
8043 | return 0; | ||
8044 | } | ||
8045 | _ACEOF | ||
8046 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
8047 | -if { (ac_try="$ac_link" | ||
8048 | -case "(($ac_try" in | ||
8049 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8050 | - *) ac_try_echo=$ac_try;; | ||
8051 | -esac | ||
8052 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8053 | -$as_echo "$ac_try_echo") >&5 | ||
8054 | - (eval "$ac_link") 2>conftest.er1 | ||
8055 | - ac_status=$? | ||
8056 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8057 | - rm -f conftest.er1 | ||
8058 | - cat conftest.err >&5 | ||
8059 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8060 | - (exit $ac_status); } && { | ||
8061 | - test -z "$ac_c_werror_flag" || | ||
8062 | - test ! -s conftest.err | ||
8063 | - } && test -s conftest$ac_exeext && { | ||
8064 | - test "$cross_compiling" = yes || | ||
8065 | - $as_test_x conftest$ac_exeext | ||
8066 | - }; then | ||
8067 | +if ac_fn_c_try_link "$LINENO"; then : | ||
8068 | lt_cv_ld_exported_symbols_list=yes | ||
8069 | else | ||
8070 | - $as_echo "$as_me: failed program was:" >&5 | ||
8071 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8072 | - | ||
8073 | - lt_cv_ld_exported_symbols_list=no | ||
8074 | + lt_cv_ld_exported_symbols_list=no | ||
8075 | fi | ||
8076 | - | ||
8077 | -rm -rf conftest.dSYM | ||
8078 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
8079 | - conftest$ac_exeext conftest.$ac_ext | ||
8080 | +rm -f core conftest.err conftest.$ac_objext \ | ||
8081 | + conftest$ac_exeext conftest.$ac_ext | ||
8082 | LDFLAGS="$save_LDFLAGS" | ||
8083 | |||
8084 | fi | ||
8085 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 | ||
8086 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 | ||
8087 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | ||
8088 | case $host_os in | ||
8089 | rhapsody* | darwin1.[012]) | ||
8090 | @@ -7705,14 +7998,14 @@ | ||
8091 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
8092 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
8093 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
8094 | -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | ||
8095 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 | ||
8096 | $as_echo_n "checking how to run the C preprocessor... " >&6; } | ||
8097 | # On Suns, sometimes $CPP names a directory. | ||
8098 | if test -n "$CPP" && test -d "$CPP"; then | ||
8099 | CPP= | ||
8100 | fi | ||
8101 | if test -z "$CPP"; then | ||
8102 | - if test "${ac_cv_prog_CPP+set}" = set; then | ||
8103 | + if test "${ac_cv_prog_CPP+set}" = set; then : | ||
8104 | $as_echo_n "(cached) " >&6 | ||
8105 | else | ||
8106 | # Double quotes because CPP needs to be expanded | ||
8107 | @@ -7727,11 +8020,7 @@ | ||
8108 | # <limits.h> exists even on freestanding compilers. | ||
8109 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
8110 | # not just through cpp. "Syntax error" is here to catch this case. | ||
8111 | - cat >conftest.$ac_ext <<_ACEOF | ||
8112 | -/* confdefs.h. */ | ||
8113 | -_ACEOF | ||
8114 | -cat confdefs.h >>conftest.$ac_ext | ||
8115 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8116 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8117 | /* end confdefs.h. */ | ||
8118 | #ifdef __STDC__ | ||
8119 | # include <limits.h> | ||
8120 | @@ -7740,78 +8029,34 @@ | ||
8121 | #endif | ||
8122 | Syntax error | ||
8123 | _ACEOF | ||
8124 | -if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
8125 | -case "(($ac_try" in | ||
8126 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8127 | - *) ac_try_echo=$ac_try;; | ||
8128 | -esac | ||
8129 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8130 | -$as_echo "$ac_try_echo") >&5 | ||
8131 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
8132 | - ac_status=$? | ||
8133 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8134 | - rm -f conftest.er1 | ||
8135 | - cat conftest.err >&5 | ||
8136 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8137 | - (exit $ac_status); } >/dev/null && { | ||
8138 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
8139 | - test ! -s conftest.err | ||
8140 | - }; then | ||
8141 | - : | ||
8142 | -else | ||
8143 | - $as_echo "$as_me: failed program was:" >&5 | ||
8144 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8145 | +if ac_fn_c_try_cpp "$LINENO"; then : | ||
8146 | |||
8147 | +else | ||
8148 | # Broken: fails on valid input. | ||
8149 | continue | ||
8150 | fi | ||
8151 | - | ||
8152 | -rm -f conftest.err conftest.$ac_ext | ||
8153 | +rm -f conftest.err conftest.i conftest.$ac_ext | ||
8154 | |||
8155 | # OK, works on sane cases. Now check whether nonexistent headers | ||
8156 | # can be detected and how. | ||
8157 | - cat >conftest.$ac_ext <<_ACEOF | ||
8158 | -/* confdefs.h. */ | ||
8159 | -_ACEOF | ||
8160 | -cat confdefs.h >>conftest.$ac_ext | ||
8161 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8162 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8163 | /* end confdefs.h. */ | ||
8164 | #include <ac_nonexistent.h> | ||
8165 | _ACEOF | ||
8166 | -if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
8167 | -case "(($ac_try" in | ||
8168 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8169 | - *) ac_try_echo=$ac_try;; | ||
8170 | -esac | ||
8171 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8172 | -$as_echo "$ac_try_echo") >&5 | ||
8173 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
8174 | - ac_status=$? | ||
8175 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8176 | - rm -f conftest.er1 | ||
8177 | - cat conftest.err >&5 | ||
8178 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8179 | - (exit $ac_status); } >/dev/null && { | ||
8180 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
8181 | - test ! -s conftest.err | ||
8182 | - }; then | ||
8183 | +if ac_fn_c_try_cpp "$LINENO"; then : | ||
8184 | # Broken: success on invalid input. | ||
8185 | continue | ||
8186 | else | ||
8187 | - $as_echo "$as_me: failed program was:" >&5 | ||
8188 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8189 | - | ||
8190 | # Passes both tests. | ||
8191 | ac_preproc_ok=: | ||
8192 | break | ||
8193 | fi | ||
8194 | - | ||
8195 | -rm -f conftest.err conftest.$ac_ext | ||
8196 | +rm -f conftest.err conftest.i conftest.$ac_ext | ||
8197 | |||
8198 | done | ||
8199 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | ||
8200 | -rm -f conftest.err conftest.$ac_ext | ||
8201 | -if $ac_preproc_ok; then | ||
8202 | +rm -f conftest.i conftest.err conftest.$ac_ext | ||
8203 | +if $ac_preproc_ok; then : | ||
8204 | break | ||
8205 | fi | ||
8206 | |||
8207 | @@ -7823,7 +8068,7 @@ | ||
8208 | else | ||
8209 | ac_cv_prog_CPP=$CPP | ||
8210 | fi | ||
8211 | -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 | ||
8212 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 | ||
8213 | $as_echo "$CPP" >&6; } | ||
8214 | ac_preproc_ok=false | ||
8215 | for ac_c_preproc_warn_flag in '' yes | ||
8216 | @@ -7834,11 +8079,7 @@ | ||
8217 | # <limits.h> exists even on freestanding compilers. | ||
8218 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
8219 | # not just through cpp. "Syntax error" is here to catch this case. | ||
8220 | - cat >conftest.$ac_ext <<_ACEOF | ||
8221 | -/* confdefs.h. */ | ||
8222 | -_ACEOF | ||
8223 | -cat confdefs.h >>conftest.$ac_ext | ||
8224 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8225 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8226 | /* end confdefs.h. */ | ||
8227 | #ifdef __STDC__ | ||
8228 | # include <limits.h> | ||
8229 | @@ -7847,87 +8088,40 @@ | ||
8230 | #endif | ||
8231 | Syntax error | ||
8232 | _ACEOF | ||
8233 | -if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
8234 | -case "(($ac_try" in | ||
8235 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8236 | - *) ac_try_echo=$ac_try;; | ||
8237 | -esac | ||
8238 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8239 | -$as_echo "$ac_try_echo") >&5 | ||
8240 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
8241 | - ac_status=$? | ||
8242 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8243 | - rm -f conftest.er1 | ||
8244 | - cat conftest.err >&5 | ||
8245 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8246 | - (exit $ac_status); } >/dev/null && { | ||
8247 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
8248 | - test ! -s conftest.err | ||
8249 | - }; then | ||
8250 | - : | ||
8251 | -else | ||
8252 | - $as_echo "$as_me: failed program was:" >&5 | ||
8253 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8254 | +if ac_fn_c_try_cpp "$LINENO"; then : | ||
8255 | |||
8256 | +else | ||
8257 | # Broken: fails on valid input. | ||
8258 | continue | ||
8259 | fi | ||
8260 | - | ||
8261 | -rm -f conftest.err conftest.$ac_ext | ||
8262 | +rm -f conftest.err conftest.i conftest.$ac_ext | ||
8263 | |||
8264 | # OK, works on sane cases. Now check whether nonexistent headers | ||
8265 | # can be detected and how. | ||
8266 | - cat >conftest.$ac_ext <<_ACEOF | ||
8267 | -/* confdefs.h. */ | ||
8268 | -_ACEOF | ||
8269 | -cat confdefs.h >>conftest.$ac_ext | ||
8270 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8271 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8272 | /* end confdefs.h. */ | ||
8273 | #include <ac_nonexistent.h> | ||
8274 | _ACEOF | ||
8275 | -if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
8276 | -case "(($ac_try" in | ||
8277 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8278 | - *) ac_try_echo=$ac_try;; | ||
8279 | -esac | ||
8280 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8281 | -$as_echo "$ac_try_echo") >&5 | ||
8282 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
8283 | - ac_status=$? | ||
8284 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8285 | - rm -f conftest.er1 | ||
8286 | - cat conftest.err >&5 | ||
8287 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8288 | - (exit $ac_status); } >/dev/null && { | ||
8289 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
8290 | - test ! -s conftest.err | ||
8291 | - }; then | ||
8292 | +if ac_fn_c_try_cpp "$LINENO"; then : | ||
8293 | # Broken: success on invalid input. | ||
8294 | continue | ||
8295 | else | ||
8296 | - $as_echo "$as_me: failed program was:" >&5 | ||
8297 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8298 | - | ||
8299 | # Passes both tests. | ||
8300 | ac_preproc_ok=: | ||
8301 | break | ||
8302 | fi | ||
8303 | - | ||
8304 | -rm -f conftest.err conftest.$ac_ext | ||
8305 | +rm -f conftest.err conftest.i conftest.$ac_ext | ||
8306 | |||
8307 | done | ||
8308 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | ||
8309 | -rm -f conftest.err conftest.$ac_ext | ||
8310 | -if $ac_preproc_ok; then | ||
8311 | - : | ||
8312 | +rm -f conftest.i conftest.err conftest.$ac_ext | ||
8313 | +if $ac_preproc_ok; then : | ||
8314 | + | ||
8315 | else | ||
8316 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
8317 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
8318 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
8319 | -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | ||
8320 | -See \`config.log' for more details." >&5 | ||
8321 | -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | ||
8322 | -See \`config.log' for more details." >&2;} | ||
8323 | - { (exit 1); exit 1; }; }; } | ||
8324 | +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check | ||
8325 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
8326 | fi | ||
8327 | |||
8328 | ac_ext=c | ||
8329 | @@ -7937,16 +8131,12 @@ | ||
8330 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
8331 | |||
8332 | |||
8333 | -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | ||
8334 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 | ||
8335 | $as_echo_n "checking for ANSI C header files... " >&6; } | ||
8336 | -if test "${ac_cv_header_stdc+set}" = set; then | ||
8337 | +if test "${ac_cv_header_stdc+set}" = set; then : | ||
8338 | $as_echo_n "(cached) " >&6 | ||
8339 | else | ||
8340 | - cat >conftest.$ac_ext <<_ACEOF | ||
8341 | -/* confdefs.h. */ | ||
8342 | -_ACEOF | ||
8343 | -cat confdefs.h >>conftest.$ac_ext | ||
8344 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8345 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8346 | /* end confdefs.h. */ | ||
8347 | #include <stdlib.h> | ||
8348 | #include <stdarg.h> | ||
8349 | @@ -7961,48 +8151,23 @@ | ||
8350 | return 0; | ||
8351 | } | ||
8352 | _ACEOF | ||
8353 | -rm -f conftest.$ac_objext | ||
8354 | -if { (ac_try="$ac_compile" | ||
8355 | -case "(($ac_try" in | ||
8356 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8357 | - *) ac_try_echo=$ac_try;; | ||
8358 | -esac | ||
8359 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8360 | -$as_echo "$ac_try_echo") >&5 | ||
8361 | - (eval "$ac_compile") 2>conftest.er1 | ||
8362 | - ac_status=$? | ||
8363 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8364 | - rm -f conftest.er1 | ||
8365 | - cat conftest.err >&5 | ||
8366 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8367 | - (exit $ac_status); } && { | ||
8368 | - test -z "$ac_c_werror_flag" || | ||
8369 | - test ! -s conftest.err | ||
8370 | - } && test -s conftest.$ac_objext; then | ||
8371 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
8372 | ac_cv_header_stdc=yes | ||
8373 | else | ||
8374 | - $as_echo "$as_me: failed program was:" >&5 | ||
8375 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8376 | - | ||
8377 | - ac_cv_header_stdc=no | ||
8378 | + ac_cv_header_stdc=no | ||
8379 | fi | ||
8380 | - | ||
8381 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8382 | |||
8383 | if test $ac_cv_header_stdc = yes; then | ||
8384 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
8385 | - cat >conftest.$ac_ext <<_ACEOF | ||
8386 | -/* confdefs.h. */ | ||
8387 | -_ACEOF | ||
8388 | -cat confdefs.h >>conftest.$ac_ext | ||
8389 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8390 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8391 | /* end confdefs.h. */ | ||
8392 | #include <string.h> | ||
8393 | |||
8394 | _ACEOF | ||
8395 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
8396 | - $EGREP "memchr" >/dev/null 2>&1; then | ||
8397 | - : | ||
8398 | + $EGREP "memchr" >/dev/null 2>&1; then : | ||
8399 | + | ||
8400 | else | ||
8401 | ac_cv_header_stdc=no | ||
8402 | fi | ||
8403 | @@ -8012,18 +8177,14 @@ | ||
8404 | |||
8405 | if test $ac_cv_header_stdc = yes; then | ||
8406 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
8407 | - cat >conftest.$ac_ext <<_ACEOF | ||
8408 | -/* confdefs.h. */ | ||
8409 | -_ACEOF | ||
8410 | -cat confdefs.h >>conftest.$ac_ext | ||
8411 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8412 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8413 | /* end confdefs.h. */ | ||
8414 | #include <stdlib.h> | ||
8415 | |||
8416 | _ACEOF | ||
8417 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
8418 | - $EGREP "free" >/dev/null 2>&1; then | ||
8419 | - : | ||
8420 | + $EGREP "free" >/dev/null 2>&1; then : | ||
8421 | + | ||
8422 | else | ||
8423 | ac_cv_header_stdc=no | ||
8424 | fi | ||
8425 | @@ -8033,14 +8194,10 @@ | ||
8426 | |||
8427 | if test $ac_cv_header_stdc = yes; then | ||
8428 | # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
8429 | - if test "$cross_compiling" = yes; then | ||
8430 | + if test "$cross_compiling" = yes; then : | ||
8431 | : | ||
8432 | else | ||
8433 | - cat >conftest.$ac_ext <<_ACEOF | ||
8434 | -/* confdefs.h. */ | ||
8435 | -_ACEOF | ||
8436 | -cat confdefs.h >>conftest.$ac_ext | ||
8437 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8438 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8439 | /* end confdefs.h. */ | ||
8440 | #include <ctype.h> | ||
8441 | #include <stdlib.h> | ||
8442 | @@ -8067,118 +8224,33 @@ | ||
8443 | return 0; | ||
8444 | } | ||
8445 | _ACEOF | ||
8446 | -rm -f conftest$ac_exeext | ||
8447 | -if { (ac_try="$ac_link" | ||
8448 | -case "(($ac_try" in | ||
8449 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8450 | - *) ac_try_echo=$ac_try;; | ||
8451 | -esac | ||
8452 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8453 | -$as_echo "$ac_try_echo") >&5 | ||
8454 | - (eval "$ac_link") 2>&5 | ||
8455 | - ac_status=$? | ||
8456 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8457 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
8458 | - { (case "(($ac_try" in | ||
8459 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8460 | - *) ac_try_echo=$ac_try;; | ||
8461 | -esac | ||
8462 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8463 | -$as_echo "$ac_try_echo") >&5 | ||
8464 | - (eval "$ac_try") 2>&5 | ||
8465 | - ac_status=$? | ||
8466 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8467 | - (exit $ac_status); }; }; then | ||
8468 | - : | ||
8469 | -else | ||
8470 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
8471 | -$as_echo "$as_me: failed program was:" >&5 | ||
8472 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8473 | +if ac_fn_c_try_run "$LINENO"; then : | ||
8474 | |||
8475 | -( exit $ac_status ) | ||
8476 | -ac_cv_header_stdc=no | ||
8477 | +else | ||
8478 | + ac_cv_header_stdc=no | ||
8479 | fi | ||
8480 | -rm -rf conftest.dSYM | ||
8481 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8482 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
8483 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
8484 | fi | ||
8485 | |||
8486 | - | ||
8487 | fi | ||
8488 | fi | ||
8489 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | ||
8490 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 | ||
8491 | $as_echo "$ac_cv_header_stdc" >&6; } | ||
8492 | if test $ac_cv_header_stdc = yes; then | ||
8493 | |||
8494 | -cat >>confdefs.h <<\_ACEOF | ||
8495 | -#define STDC_HEADERS 1 | ||
8496 | -_ACEOF | ||
8497 | +$as_echo "#define STDC_HEADERS 1" >>confdefs.h | ||
8498 | |||
8499 | fi | ||
8500 | |||
8501 | # On IRIX 5.3, sys/types and inttypes.h are conflicting. | ||
8502 | - | ||
8503 | - | ||
8504 | - | ||
8505 | - | ||
8506 | - | ||
8507 | - | ||
8508 | - | ||
8509 | - | ||
8510 | - | ||
8511 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
8512 | inttypes.h stdint.h unistd.h | ||
8513 | -do | ||
8514 | -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8515 | -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
8516 | -$as_echo_n "checking for $ac_header... " >&6; } | ||
8517 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
8518 | - $as_echo_n "(cached) " >&6 | ||
8519 | -else | ||
8520 | - cat >conftest.$ac_ext <<_ACEOF | ||
8521 | -/* confdefs.h. */ | ||
8522 | -_ACEOF | ||
8523 | -cat confdefs.h >>conftest.$ac_ext | ||
8524 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8525 | -/* end confdefs.h. */ | ||
8526 | -$ac_includes_default | ||
8527 | - | ||
8528 | -#include <$ac_header> | ||
8529 | -_ACEOF | ||
8530 | -rm -f conftest.$ac_objext | ||
8531 | -if { (ac_try="$ac_compile" | ||
8532 | -case "(($ac_try" in | ||
8533 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8534 | - *) ac_try_echo=$ac_try;; | ||
8535 | -esac | ||
8536 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8537 | -$as_echo "$ac_try_echo") >&5 | ||
8538 | - (eval "$ac_compile") 2>conftest.er1 | ||
8539 | - ac_status=$? | ||
8540 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8541 | - rm -f conftest.er1 | ||
8542 | - cat conftest.err >&5 | ||
8543 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8544 | - (exit $ac_status); } && { | ||
8545 | - test -z "$ac_c_werror_flag" || | ||
8546 | - test ! -s conftest.err | ||
8547 | - } && test -s conftest.$ac_objext; then | ||
8548 | - eval "$as_ac_Header=yes" | ||
8549 | -else | ||
8550 | - $as_echo "$as_me: failed program was:" >&5 | ||
8551 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8552 | - | ||
8553 | - eval "$as_ac_Header=no" | ||
8554 | -fi | ||
8555 | - | ||
8556 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8557 | -fi | ||
8558 | -ac_res=`eval 'as_val=${'$as_ac_Header'} | ||
8559 | - $as_echo "$as_val"'` | ||
8560 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
8561 | -$as_echo "$ac_res" >&6; } | ||
8562 | -as_val=`eval 'as_val=${'$as_ac_Header'} | ||
8563 | - $as_echo "$as_val"'` | ||
8564 | - if test "x$as_val" = x""yes; then | ||
8565 | +do : | ||
8566 | + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8567 | +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default | ||
8568 | +" | ||
8569 | +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | ||
8570 | cat >>confdefs.h <<_ACEOF | ||
8571 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
8572 | _ACEOF | ||
8573 | @@ -8188,62 +8260,13 @@ | ||
8574 | done | ||
8575 | |||
8576 | |||
8577 | - | ||
8578 | for ac_header in dlfcn.h | ||
8579 | -do | ||
8580 | -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8581 | -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
8582 | -$as_echo_n "checking for $ac_header... " >&6; } | ||
8583 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
8584 | - $as_echo_n "(cached) " >&6 | ||
8585 | -else | ||
8586 | - cat >conftest.$ac_ext <<_ACEOF | ||
8587 | -/* confdefs.h. */ | ||
8588 | -_ACEOF | ||
8589 | -cat confdefs.h >>conftest.$ac_ext | ||
8590 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8591 | -/* end confdefs.h. */ | ||
8592 | -$ac_includes_default | ||
8593 | - | ||
8594 | -#include <$ac_header> | ||
8595 | -_ACEOF | ||
8596 | -rm -f conftest.$ac_objext | ||
8597 | -if { (ac_try="$ac_compile" | ||
8598 | -case "(($ac_try" in | ||
8599 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8600 | - *) ac_try_echo=$ac_try;; | ||
8601 | -esac | ||
8602 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8603 | -$as_echo "$ac_try_echo") >&5 | ||
8604 | - (eval "$ac_compile") 2>conftest.er1 | ||
8605 | - ac_status=$? | ||
8606 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8607 | - rm -f conftest.er1 | ||
8608 | - cat conftest.err >&5 | ||
8609 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8610 | - (exit $ac_status); } && { | ||
8611 | - test -z "$ac_c_werror_flag" || | ||
8612 | - test ! -s conftest.err | ||
8613 | - } && test -s conftest.$ac_objext; then | ||
8614 | - eval "$as_ac_Header=yes" | ||
8615 | -else | ||
8616 | - $as_echo "$as_me: failed program was:" >&5 | ||
8617 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8618 | - | ||
8619 | - eval "$as_ac_Header=no" | ||
8620 | -fi | ||
8621 | - | ||
8622 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8623 | -fi | ||
8624 | -ac_res=`eval 'as_val=${'$as_ac_Header'} | ||
8625 | - $as_echo "$as_val"'` | ||
8626 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
8627 | -$as_echo "$ac_res" >&6; } | ||
8628 | -as_val=`eval 'as_val=${'$as_ac_Header'} | ||
8629 | - $as_echo "$as_val"'` | ||
8630 | - if test "x$as_val" = x""yes; then | ||
8631 | +do : | ||
8632 | + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default | ||
8633 | +" | ||
8634 | +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : | ||
8635 | cat >>confdefs.h <<_ACEOF | ||
8636 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
8637 | +#define HAVE_DLFCN_H 1 | ||
8638 | _ACEOF | ||
8639 | |||
8640 | fi | ||
8641 | @@ -8262,7 +8285,7 @@ | ||
8642 | |||
8643 | |||
8644 | # Check whether --enable-static was given. | ||
8645 | -if test "${enable_static+set}" = set; then | ||
8646 | +if test "${enable_static+set}" = set; then : | ||
8647 | enableval=$enable_static; p=${PACKAGE-default} | ||
8648 | case $enableval in | ||
8649 | yes) enable_static=yes ;; | ||
8650 | @@ -8294,7 +8317,7 @@ | ||
8651 | |||
8652 | |||
8653 | # Check whether --with-pic was given. | ||
8654 | -if test "${with_pic+set}" = set; then | ||
8655 | +if test "${with_pic+set}" = set; then : | ||
8656 | withval=$with_pic; pic_mode="$withval" | ||
8657 | else | ||
8658 | pic_mode=default | ||
8659 | @@ -8310,7 +8333,7 @@ | ||
8660 | |||
8661 | |||
8662 | # Check whether --enable-fast-install was given. | ||
8663 | -if test "${enable_fast_install+set}" = set; then | ||
8664 | +if test "${enable_fast_install+set}" = set; then : | ||
8665 | enableval=$enable_fast_install; p=${PACKAGE-default} | ||
8666 | case $enableval in | ||
8667 | yes) enable_fast_install=yes ;; | ||
8668 | @@ -8391,9 +8414,9 @@ | ||
8669 | setopt NO_GLOB_SUBST | ||
8670 | fi | ||
8671 | |||
8672 | -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 | ||
8673 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 | ||
8674 | $as_echo_n "checking for objdir... " >&6; } | ||
8675 | -if test "${lt_cv_objdir+set}" = set; then | ||
8676 | +if test "${lt_cv_objdir+set}" = set; then : | ||
8677 | $as_echo_n "(cached) " >&6 | ||
8678 | else | ||
8679 | rm -f .libs 2>/dev/null | ||
8680 | @@ -8406,7 +8429,7 @@ | ||
8681 | fi | ||
8682 | rmdir .libs 2>/dev/null | ||
8683 | fi | ||
8684 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 | ||
8685 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 | ||
8686 | $as_echo "$lt_cv_objdir" >&6; } | ||
8687 | objdir=$lt_cv_objdir | ||
8688 | |||
8689 | @@ -8499,9 +8522,9 @@ | ||
8690 | case $deplibs_check_method in | ||
8691 | file_magic*) | ||
8692 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then | ||
8693 | - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 | ||
8694 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 | ||
8695 | $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } | ||
8696 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | ||
8697 | +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : | ||
8698 | $as_echo_n "(cached) " >&6 | ||
8699 | else | ||
8700 | case $MAGIC_CMD in | ||
8701 | @@ -8552,10 +8575,10 @@ | ||
8702 | |||
8703 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | ||
8704 | if test -n "$MAGIC_CMD"; then | ||
8705 | - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | ||
8706 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 | ||
8707 | $as_echo "$MAGIC_CMD" >&6; } | ||
8708 | else | ||
8709 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
8710 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8711 | $as_echo "no" >&6; } | ||
8712 | fi | ||
8713 | |||
8714 | @@ -8565,9 +8588,9 @@ | ||
8715 | |||
8716 | if test -z "$lt_cv_path_MAGIC_CMD"; then | ||
8717 | if test -n "$ac_tool_prefix"; then | ||
8718 | - { $as_echo "$as_me:$LINENO: checking for file" >&5 | ||
8719 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 | ||
8720 | $as_echo_n "checking for file... " >&6; } | ||
8721 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | ||
8722 | +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : | ||
8723 | $as_echo_n "(cached) " >&6 | ||
8724 | else | ||
8725 | case $MAGIC_CMD in | ||
8726 | @@ -8618,10 +8641,10 @@ | ||
8727 | |||
8728 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | ||
8729 | if test -n "$MAGIC_CMD"; then | ||
8730 | - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | ||
8731 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 | ||
8732 | $as_echo "$MAGIC_CMD" >&6; } | ||
8733 | else | ||
8734 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
8735 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8736 | $as_echo "no" >&6; } | ||
8737 | fi | ||
8738 | |||
8739 | @@ -8702,9 +8725,9 @@ | ||
8740 | if test "$GCC" = yes; then | ||
8741 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' | ||
8742 | |||
8743 | - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | ||
8744 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | ||
8745 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } | ||
8746 | -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then | ||
8747 | +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : | ||
8748 | $as_echo_n "(cached) " >&6 | ||
8749 | else | ||
8750 | lt_cv_prog_compiler_rtti_exceptions=no | ||
8751 | @@ -8720,11 +8743,11 @@ | ||
8752 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8753 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8754 | -e 's:$: $lt_compiler_flag:'` | ||
8755 | - (eval echo "\"\$as_me:8723: $lt_compile\"" >&5) | ||
8756 | + (eval echo "\"\$as_me:8746: $lt_compile\"" >&5) | ||
8757 | (eval "$lt_compile" 2>conftest.err) | ||
8758 | ac_status=$? | ||
8759 | cat conftest.err >&5 | ||
8760 | - echo "$as_me:8727: \$? = $ac_status" >&5 | ||
8761 | + echo "$as_me:8750: \$? = $ac_status" >&5 | ||
8762 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
8763 | # The compiler can only warn and ignore the option if not recognized | ||
8764 | # So say no if there are warnings other than the usual output. | ||
8765 | @@ -8737,7 +8760,7 @@ | ||
8766 | $RM conftest* | ||
8767 | |||
8768 | fi | ||
8769 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | ||
8770 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | ||
8771 | $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } | ||
8772 | |||
8773 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | ||
8774 | @@ -8757,7 +8780,7 @@ | ||
8775 | lt_prog_compiler_pic= | ||
8776 | lt_prog_compiler_static= | ||
8777 | |||
8778 | -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
8779 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
8780 | $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
8781 | |||
8782 | if test "$GCC" = yes; then | ||
8783 | @@ -9029,7 +9052,7 @@ | ||
8784 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
8785 | ;; | ||
8786 | esac | ||
8787 | -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 | ||
8788 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
8789 | $as_echo "$lt_prog_compiler_pic" >&6; } | ||
8790 | |||
8791 | |||
8792 | @@ -9041,9 +9064,9 @@ | ||
8793 | # Check to make sure the PIC flag actually works. | ||
8794 | # | ||
8795 | if test -n "$lt_prog_compiler_pic"; then | ||
8796 | - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | ||
8797 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | ||
8798 | $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } | ||
8799 | -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then | ||
8800 | +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : | ||
8801 | $as_echo_n "(cached) " >&6 | ||
8802 | else | ||
8803 | lt_cv_prog_compiler_pic_works=no | ||
8804 | @@ -9059,11 +9082,11 @@ | ||
8805 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8806 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8807 | -e 's:$: $lt_compiler_flag:'` | ||
8808 | - (eval echo "\"\$as_me:9062: $lt_compile\"" >&5) | ||
8809 | + (eval echo "\"\$as_me:9085: $lt_compile\"" >&5) | ||
8810 | (eval "$lt_compile" 2>conftest.err) | ||
8811 | ac_status=$? | ||
8812 | cat conftest.err >&5 | ||
8813 | - echo "$as_me:9066: \$? = $ac_status" >&5 | ||
8814 | + echo "$as_me:9089: \$? = $ac_status" >&5 | ||
8815 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
8816 | # The compiler can only warn and ignore the option if not recognized | ||
8817 | # So say no if there are warnings other than the usual output. | ||
8818 | @@ -9076,7 +9099,7 @@ | ||
8819 | $RM conftest* | ||
8820 | |||
8821 | fi | ||
8822 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 | ||
8823 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 | ||
8824 | $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } | ||
8825 | |||
8826 | if test x"$lt_cv_prog_compiler_pic_works" = xyes; then | ||
8827 | @@ -9100,9 +9123,9 @@ | ||
8828 | # Check to make sure the static flag actually works. | ||
8829 | # | ||
8830 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" | ||
8831 | -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
8832 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
8833 | $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } | ||
8834 | -if test "${lt_cv_prog_compiler_static_works+set}" = set; then | ||
8835 | +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : | ||
8836 | $as_echo_n "(cached) " >&6 | ||
8837 | else | ||
8838 | lt_cv_prog_compiler_static_works=no | ||
8839 | @@ -9128,7 +9151,7 @@ | ||
8840 | LDFLAGS="$save_LDFLAGS" | ||
8841 | |||
8842 | fi | ||
8843 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 | ||
8844 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 | ||
8845 | $as_echo "$lt_cv_prog_compiler_static_works" >&6; } | ||
8846 | |||
8847 | if test x"$lt_cv_prog_compiler_static_works" = xyes; then | ||
8848 | @@ -9143,9 +9166,9 @@ | ||
8849 | |||
8850 | |||
8851 | |||
8852 | - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8853 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8854 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } | ||
8855 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then | ||
8856 | +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : | ||
8857 | $as_echo_n "(cached) " >&6 | ||
8858 | else | ||
8859 | lt_cv_prog_compiler_c_o=no | ||
8860 | @@ -9164,11 +9187,11 @@ | ||
8861 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8862 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8863 | -e 's:$: $lt_compiler_flag:'` | ||
8864 | - (eval echo "\"\$as_me:9167: $lt_compile\"" >&5) | ||
8865 | + (eval echo "\"\$as_me:9190: $lt_compile\"" >&5) | ||
8866 | (eval "$lt_compile" 2>out/conftest.err) | ||
8867 | ac_status=$? | ||
8868 | cat out/conftest.err >&5 | ||
8869 | - echo "$as_me:9171: \$? = $ac_status" >&5 | ||
8870 | + echo "$as_me:9194: \$? = $ac_status" >&5 | ||
8871 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
8872 | then | ||
8873 | # The compiler can only warn and ignore the option if not recognized | ||
8874 | @@ -9190,7 +9213,7 @@ | ||
8875 | $RM conftest* | ||
8876 | |||
8877 | fi | ||
8878 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 | ||
8879 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 | ||
8880 | $as_echo "$lt_cv_prog_compiler_c_o" >&6; } | ||
8881 | |||
8882 | |||
8883 | @@ -9198,9 +9221,9 @@ | ||
8884 | |||
8885 | |||
8886 | |||
8887 | - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8888 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8889 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } | ||
8890 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then | ||
8891 | +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : | ||
8892 | $as_echo_n "(cached) " >&6 | ||
8893 | else | ||
8894 | lt_cv_prog_compiler_c_o=no | ||
8895 | @@ -9219,11 +9242,11 @@ | ||
8896 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8897 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8898 | -e 's:$: $lt_compiler_flag:'` | ||
8899 | - (eval echo "\"\$as_me:9222: $lt_compile\"" >&5) | ||
8900 | + (eval echo "\"\$as_me:9245: $lt_compile\"" >&5) | ||
8901 | (eval "$lt_compile" 2>out/conftest.err) | ||
8902 | ac_status=$? | ||
8903 | cat out/conftest.err >&5 | ||
8904 | - echo "$as_me:9226: \$? = $ac_status" >&5 | ||
8905 | + echo "$as_me:9249: \$? = $ac_status" >&5 | ||
8906 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
8907 | then | ||
8908 | # The compiler can only warn and ignore the option if not recognized | ||
8909 | @@ -9245,7 +9268,7 @@ | ||
8910 | $RM conftest* | ||
8911 | |||
8912 | fi | ||
8913 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 | ||
8914 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 | ||
8915 | $as_echo "$lt_cv_prog_compiler_c_o" >&6; } | ||
8916 | |||
8917 | |||
8918 | @@ -9254,7 +9277,7 @@ | ||
8919 | hard_links="nottested" | ||
8920 | if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then | ||
8921 | # do not overwrite the value of need_locks provided by the user | ||
8922 | - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
8923 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 | ||
8924 | $as_echo_n "checking if we can lock with hard links... " >&6; } | ||
8925 | hard_links=yes | ||
8926 | $RM conftest* | ||
8927 | @@ -9262,10 +9285,10 @@ | ||
8928 | touch conftest.a | ||
8929 | ln conftest.a conftest.b 2>&5 || hard_links=no | ||
8930 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
8931 | - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
8932 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 | ||
8933 | $as_echo "$hard_links" >&6; } | ||
8934 | if test "$hard_links" = no; then | ||
8935 | - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
8936 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
8937 | $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | ||
8938 | need_locks=warn | ||
8939 | fi | ||
8940 | @@ -9278,7 +9301,7 @@ | ||
8941 | |||
8942 | |||
8943 | |||
8944 | - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8945 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8946 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | ||
8947 | |||
8948 | runpath_var= | ||
8949 | @@ -9724,11 +9747,7 @@ | ||
8950 | allow_undefined_flag='-berok' | ||
8951 | # Determine the default libpath from the value encoded in an | ||
8952 | # empty executable. | ||
8953 | - cat >conftest.$ac_ext <<_ACEOF | ||
8954 | -/* confdefs.h. */ | ||
8955 | -_ACEOF | ||
8956 | -cat confdefs.h >>conftest.$ac_ext | ||
8957 | -cat >>conftest.$ac_ext <<_ACEOF | ||
8958 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8959 | /* end confdefs.h. */ | ||
8960 | |||
8961 | int | ||
8962 | @@ -9739,27 +9758,7 @@ | ||
8963 | return 0; | ||
8964 | } | ||
8965 | _ACEOF | ||
8966 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
8967 | -if { (ac_try="$ac_link" | ||
8968 | -case "(($ac_try" in | ||
8969 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8970 | - *) ac_try_echo=$ac_try;; | ||
8971 | -esac | ||
8972 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
8973 | -$as_echo "$ac_try_echo") >&5 | ||
8974 | - (eval "$ac_link") 2>conftest.er1 | ||
8975 | - ac_status=$? | ||
8976 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
8977 | - rm -f conftest.er1 | ||
8978 | - cat conftest.err >&5 | ||
8979 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8980 | - (exit $ac_status); } && { | ||
8981 | - test -z "$ac_c_werror_flag" || | ||
8982 | - test ! -s conftest.err | ||
8983 | - } && test -s conftest$ac_exeext && { | ||
8984 | - test "$cross_compiling" = yes || | ||
8985 | - $as_test_x conftest$ac_exeext | ||
8986 | - }; then | ||
8987 | +if ac_fn_c_try_link "$LINENO"; then : | ||
8988 | |||
8989 | lt_aix_libpath_sed=' | ||
8990 | /Import File Strings/,/^$/ { | ||
8991 | @@ -9773,16 +9772,9 @@ | ||
8992 | if test -z "$aix_libpath"; then | ||
8993 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
8994 | fi | ||
8995 | -else | ||
8996 | - $as_echo "$as_me: failed program was:" >&5 | ||
8997 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
8998 | - | ||
8999 | - | ||
9000 | fi | ||
9001 | - | ||
9002 | -rm -rf conftest.dSYM | ||
9003 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9004 | - conftest$ac_exeext conftest.$ac_ext | ||
9005 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9006 | + conftest$ac_exeext conftest.$ac_ext | ||
9007 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9008 | |||
9009 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
9010 | @@ -9795,11 +9787,7 @@ | ||
9011 | else | ||
9012 | # Determine the default libpath from the value encoded in an | ||
9013 | # empty executable. | ||
9014 | - cat >conftest.$ac_ext <<_ACEOF | ||
9015 | -/* confdefs.h. */ | ||
9016 | -_ACEOF | ||
9017 | -cat confdefs.h >>conftest.$ac_ext | ||
9018 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9019 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9020 | /* end confdefs.h. */ | ||
9021 | |||
9022 | int | ||
9023 | @@ -9810,27 +9798,7 @@ | ||
9024 | return 0; | ||
9025 | } | ||
9026 | _ACEOF | ||
9027 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9028 | -if { (ac_try="$ac_link" | ||
9029 | -case "(($ac_try" in | ||
9030 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9031 | - *) ac_try_echo=$ac_try;; | ||
9032 | -esac | ||
9033 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9034 | -$as_echo "$ac_try_echo") >&5 | ||
9035 | - (eval "$ac_link") 2>conftest.er1 | ||
9036 | - ac_status=$? | ||
9037 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9038 | - rm -f conftest.er1 | ||
9039 | - cat conftest.err >&5 | ||
9040 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9041 | - (exit $ac_status); } && { | ||
9042 | - test -z "$ac_c_werror_flag" || | ||
9043 | - test ! -s conftest.err | ||
9044 | - } && test -s conftest$ac_exeext && { | ||
9045 | - test "$cross_compiling" = yes || | ||
9046 | - $as_test_x conftest$ac_exeext | ||
9047 | - }; then | ||
9048 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9049 | |||
9050 | lt_aix_libpath_sed=' | ||
9051 | /Import File Strings/,/^$/ { | ||
9052 | @@ -9844,16 +9812,9 @@ | ||
9053 | if test -z "$aix_libpath"; then | ||
9054 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
9055 | fi | ||
9056 | -else | ||
9057 | - $as_echo "$as_me: failed program was:" >&5 | ||
9058 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9059 | - | ||
9060 | - | ||
9061 | fi | ||
9062 | - | ||
9063 | -rm -rf conftest.dSYM | ||
9064 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9065 | - conftest$ac_exeext conftest.$ac_ext | ||
9066 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9067 | + conftest$ac_exeext conftest.$ac_ext | ||
9068 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
9069 | |||
9070 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
9071 | @@ -10065,42 +10026,16 @@ | ||
9072 | # implicitly export all symbols. | ||
9073 | save_LDFLAGS="$LDFLAGS" | ||
9074 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
9075 | - cat >conftest.$ac_ext <<_ACEOF | ||
9076 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9077 | +/* end confdefs.h. */ | ||
9078 | int foo(void) {} | ||
9079 | _ACEOF | ||
9080 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9081 | -if { (ac_try="$ac_link" | ||
9082 | -case "(($ac_try" in | ||
9083 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9084 | - *) ac_try_echo=$ac_try;; | ||
9085 | -esac | ||
9086 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9087 | -$as_echo "$ac_try_echo") >&5 | ||
9088 | - (eval "$ac_link") 2>conftest.er1 | ||
9089 | - ac_status=$? | ||
9090 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9091 | - rm -f conftest.er1 | ||
9092 | - cat conftest.err >&5 | ||
9093 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9094 | - (exit $ac_status); } && { | ||
9095 | - test -z "$ac_c_werror_flag" || | ||
9096 | - test ! -s conftest.err | ||
9097 | - } && test -s conftest$ac_exeext && { | ||
9098 | - test "$cross_compiling" = yes || | ||
9099 | - $as_test_x conftest$ac_exeext | ||
9100 | - }; then | ||
9101 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9102 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
9103 | |||
9104 | -else | ||
9105 | - $as_echo "$as_me: failed program was:" >&5 | ||
9106 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9107 | - | ||
9108 | - | ||
9109 | fi | ||
9110 | - | ||
9111 | -rm -rf conftest.dSYM | ||
9112 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9113 | - conftest$ac_exeext conftest.$ac_ext | ||
9114 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9115 | + conftest$ac_exeext conftest.$ac_ext | ||
9116 | LDFLAGS="$save_LDFLAGS" | ||
9117 | else | ||
9118 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' | ||
9119 | @@ -10356,7 +10291,7 @@ | ||
9120 | fi | ||
9121 | fi | ||
9122 | |||
9123 | -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 | ||
9124 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 | ||
9125 | $as_echo "$ld_shlibs" >&6; } | ||
9126 | test "$ld_shlibs" = no && can_build_shared=no | ||
9127 | |||
9128 | @@ -10393,16 +10328,16 @@ | ||
9129 | # Test whether the compiler implicitly links with -lc since on some | ||
9130 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | ||
9131 | # to ld, don't add -lc before -lgcc. | ||
9132 | - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
9133 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 | ||
9134 | $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } | ||
9135 | $RM conftest* | ||
9136 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
9137 | |||
9138 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
9139 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
9140 | (eval $ac_compile) 2>&5 | ||
9141 | ac_status=$? | ||
9142 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9143 | - (exit $ac_status); } 2>conftest.err; then | ||
9144 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
9145 | + test $ac_status = 0; } 2>conftest.err; then | ||
9146 | soname=conftest | ||
9147 | lib=conftest | ||
9148 | libobjs=conftest.$ac_objext | ||
9149 | @@ -10416,11 +10351,11 @@ | ||
9150 | libname=conftest | ||
9151 | lt_save_allow_undefined_flag=$allow_undefined_flag | ||
9152 | allow_undefined_flag= | ||
9153 | - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 | ||
9154 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 | ||
9155 | (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 | ||
9156 | ac_status=$? | ||
9157 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9158 | - (exit $ac_status); } | ||
9159 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
9160 | + test $ac_status = 0; } | ||
9161 | then | ||
9162 | archive_cmds_need_lc=no | ||
9163 | else | ||
9164 | @@ -10431,7 +10366,7 @@ | ||
9165 | cat conftest.err 1>&5 | ||
9166 | fi | ||
9167 | $RM conftest* | ||
9168 | - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 | ||
9169 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 | ||
9170 | $as_echo "$archive_cmds_need_lc" >&6; } | ||
9171 | ;; | ||
9172 | esac | ||
9173 | @@ -10595,7 +10530,7 @@ | ||
9174 | |||
9175 | |||
9176 | |||
9177 | - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
9178 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | ||
9179 | $as_echo_n "checking dynamic linker characteristics... " >&6; } | ||
9180 | |||
9181 | if test "$GCC" = yes; then | ||
9182 | @@ -11017,11 +10952,7 @@ | ||
9183 | save_libdir=$libdir | ||
9184 | eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ | ||
9185 | LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" | ||
9186 | - cat >conftest.$ac_ext <<_ACEOF | ||
9187 | -/* confdefs.h. */ | ||
9188 | -_ACEOF | ||
9189 | -cat confdefs.h >>conftest.$ac_ext | ||
9190 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9191 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9192 | /* end confdefs.h. */ | ||
9193 | |||
9194 | int | ||
9195 | @@ -11032,41 +10963,13 @@ | ||
9196 | return 0; | ||
9197 | } | ||
9198 | _ACEOF | ||
9199 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9200 | -if { (ac_try="$ac_link" | ||
9201 | -case "(($ac_try" in | ||
9202 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9203 | - *) ac_try_echo=$ac_try;; | ||
9204 | -esac | ||
9205 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9206 | -$as_echo "$ac_try_echo") >&5 | ||
9207 | - (eval "$ac_link") 2>conftest.er1 | ||
9208 | - ac_status=$? | ||
9209 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9210 | - rm -f conftest.er1 | ||
9211 | - cat conftest.err >&5 | ||
9212 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9213 | - (exit $ac_status); } && { | ||
9214 | - test -z "$ac_c_werror_flag" || | ||
9215 | - test ! -s conftest.err | ||
9216 | - } && test -s conftest$ac_exeext && { | ||
9217 | - test "$cross_compiling" = yes || | ||
9218 | - $as_test_x conftest$ac_exeext | ||
9219 | - }; then | ||
9220 | - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then | ||
9221 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9222 | + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : | ||
9223 | shlibpath_overrides_runpath=yes | ||
9224 | fi | ||
9225 | - | ||
9226 | -else | ||
9227 | - $as_echo "$as_me: failed program was:" >&5 | ||
9228 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9229 | - | ||
9230 | - | ||
9231 | fi | ||
9232 | - | ||
9233 | -rm -rf conftest.dSYM | ||
9234 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9235 | - conftest$ac_exeext conftest.$ac_ext | ||
9236 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9237 | + conftest$ac_exeext conftest.$ac_ext | ||
9238 | LDFLAGS=$save_LDFLAGS | ||
9239 | libdir=$save_libdir | ||
9240 | |||
9241 | @@ -11290,7 +11193,7 @@ | ||
9242 | dynamic_linker=no | ||
9243 | ;; | ||
9244 | esac | ||
9245 | -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
9246 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 | ||
9247 | $as_echo "$dynamic_linker" >&6; } | ||
9248 | test "$dynamic_linker" = no && can_build_shared=no | ||
9249 | |||
9250 | @@ -11392,7 +11295,7 @@ | ||
9251 | |||
9252 | |||
9253 | |||
9254 | - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
9255 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 | ||
9256 | $as_echo_n "checking how to hardcode library paths into programs... " >&6; } | ||
9257 | hardcode_action= | ||
9258 | if test -n "$hardcode_libdir_flag_spec" || | ||
9259 | @@ -11417,7 +11320,7 @@ | ||
9260 | # directories. | ||
9261 | hardcode_action=unsupported | ||
9262 | fi | ||
9263 | -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 | ||
9264 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 | ||
9265 | $as_echo "$hardcode_action" >&6; } | ||
9266 | |||
9267 | if test "$hardcode_action" = relink || | ||
9268 | @@ -11462,18 +11365,14 @@ | ||
9269 | |||
9270 | darwin*) | ||
9271 | # if libdl is installed we need to link against it | ||
9272 | - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | ||
9273 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 | ||
9274 | $as_echo_n "checking for dlopen in -ldl... " >&6; } | ||
9275 | -if test "${ac_cv_lib_dl_dlopen+set}" = set; then | ||
9276 | +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : | ||
9277 | $as_echo_n "(cached) " >&6 | ||
9278 | else | ||
9279 | ac_check_lib_save_LIBS=$LIBS | ||
9280 | LIBS="-ldl $LIBS" | ||
9281 | -cat >conftest.$ac_ext <<_ACEOF | ||
9282 | -/* confdefs.h. */ | ||
9283 | -_ACEOF | ||
9284 | -cat confdefs.h >>conftest.$ac_ext | ||
9285 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9286 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9287 | /* end confdefs.h. */ | ||
9288 | |||
9289 | /* Override any GCC internal prototype to avoid an error. | ||
9290 | @@ -11491,43 +11390,18 @@ | ||
9291 | return 0; | ||
9292 | } | ||
9293 | _ACEOF | ||
9294 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9295 | -if { (ac_try="$ac_link" | ||
9296 | -case "(($ac_try" in | ||
9297 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9298 | - *) ac_try_echo=$ac_try;; | ||
9299 | -esac | ||
9300 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9301 | -$as_echo "$ac_try_echo") >&5 | ||
9302 | - (eval "$ac_link") 2>conftest.er1 | ||
9303 | - ac_status=$? | ||
9304 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9305 | - rm -f conftest.er1 | ||
9306 | - cat conftest.err >&5 | ||
9307 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9308 | - (exit $ac_status); } && { | ||
9309 | - test -z "$ac_c_werror_flag" || | ||
9310 | - test ! -s conftest.err | ||
9311 | - } && test -s conftest$ac_exeext && { | ||
9312 | - test "$cross_compiling" = yes || | ||
9313 | - $as_test_x conftest$ac_exeext | ||
9314 | - }; then | ||
9315 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9316 | ac_cv_lib_dl_dlopen=yes | ||
9317 | else | ||
9318 | - $as_echo "$as_me: failed program was:" >&5 | ||
9319 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9320 | - | ||
9321 | - ac_cv_lib_dl_dlopen=no | ||
9322 | + ac_cv_lib_dl_dlopen=no | ||
9323 | fi | ||
9324 | - | ||
9325 | -rm -rf conftest.dSYM | ||
9326 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9327 | - conftest$ac_exeext conftest.$ac_ext | ||
9328 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9329 | + conftest$ac_exeext conftest.$ac_ext | ||
9330 | LIBS=$ac_check_lib_save_LIBS | ||
9331 | fi | ||
9332 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | ||
9333 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 | ||
9334 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } | ||
9335 | -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then | ||
9336 | +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : | ||
9337 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | ||
9338 | else | ||
9339 | |||
9340 | @@ -11540,106 +11414,18 @@ | ||
9341 | ;; | ||
9342 | |||
9343 | *) | ||
9344 | - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 | ||
9345 | -$as_echo_n "checking for shl_load... " >&6; } | ||
9346 | -if test "${ac_cv_func_shl_load+set}" = set; then | ||
9347 | - $as_echo_n "(cached) " >&6 | ||
9348 | -else | ||
9349 | - cat >conftest.$ac_ext <<_ACEOF | ||
9350 | -/* confdefs.h. */ | ||
9351 | -_ACEOF | ||
9352 | -cat confdefs.h >>conftest.$ac_ext | ||
9353 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9354 | -/* end confdefs.h. */ | ||
9355 | -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. | ||
9356 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
9357 | -#define shl_load innocuous_shl_load | ||
9358 | - | ||
9359 | -/* System header to define __stub macros and hopefully few prototypes, | ||
9360 | - which can conflict with char shl_load (); below. | ||
9361 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
9362 | - <limits.h> exists even on freestanding compilers. */ | ||
9363 | - | ||
9364 | -#ifdef __STDC__ | ||
9365 | -# include <limits.h> | ||
9366 | -#else | ||
9367 | -# include <assert.h> | ||
9368 | -#endif | ||
9369 | - | ||
9370 | -#undef shl_load | ||
9371 | - | ||
9372 | -/* Override any GCC internal prototype to avoid an error. | ||
9373 | - Use char because int might match the return type of a GCC | ||
9374 | - builtin and then its argument prototype would still apply. */ | ||
9375 | -#ifdef __cplusplus | ||
9376 | -extern "C" | ||
9377 | -#endif | ||
9378 | -char shl_load (); | ||
9379 | -/* The GNU C library defines this for functions which it implements | ||
9380 | - to always fail with ENOSYS. Some functions are actually named | ||
9381 | - something starting with __ and the normal name is an alias. */ | ||
9382 | -#if defined __stub_shl_load || defined __stub___shl_load | ||
9383 | -choke me | ||
9384 | -#endif | ||
9385 | - | ||
9386 | -int | ||
9387 | -main () | ||
9388 | -{ | ||
9389 | -return shl_load (); | ||
9390 | - ; | ||
9391 | - return 0; | ||
9392 | -} | ||
9393 | -_ACEOF | ||
9394 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9395 | -if { (ac_try="$ac_link" | ||
9396 | -case "(($ac_try" in | ||
9397 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9398 | - *) ac_try_echo=$ac_try;; | ||
9399 | -esac | ||
9400 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9401 | -$as_echo "$ac_try_echo") >&5 | ||
9402 | - (eval "$ac_link") 2>conftest.er1 | ||
9403 | - ac_status=$? | ||
9404 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9405 | - rm -f conftest.er1 | ||
9406 | - cat conftest.err >&5 | ||
9407 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9408 | - (exit $ac_status); } && { | ||
9409 | - test -z "$ac_c_werror_flag" || | ||
9410 | - test ! -s conftest.err | ||
9411 | - } && test -s conftest$ac_exeext && { | ||
9412 | - test "$cross_compiling" = yes || | ||
9413 | - $as_test_x conftest$ac_exeext | ||
9414 | - }; then | ||
9415 | - ac_cv_func_shl_load=yes | ||
9416 | -else | ||
9417 | - $as_echo "$as_me: failed program was:" >&5 | ||
9418 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9419 | - | ||
9420 | - ac_cv_func_shl_load=no | ||
9421 | -fi | ||
9422 | - | ||
9423 | -rm -rf conftest.dSYM | ||
9424 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9425 | - conftest$ac_exeext conftest.$ac_ext | ||
9426 | -fi | ||
9427 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | ||
9428 | -$as_echo "$ac_cv_func_shl_load" >&6; } | ||
9429 | -if test "x$ac_cv_func_shl_load" = x""yes; then | ||
9430 | + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" | ||
9431 | +if test "x$ac_cv_func_shl_load" = x""yes; then : | ||
9432 | lt_cv_dlopen="shl_load" | ||
9433 | else | ||
9434 | - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 | ||
9435 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 | ||
9436 | $as_echo_n "checking for shl_load in -ldld... " >&6; } | ||
9437 | -if test "${ac_cv_lib_dld_shl_load+set}" = set; then | ||
9438 | +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : | ||
9439 | $as_echo_n "(cached) " >&6 | ||
9440 | else | ||
9441 | ac_check_lib_save_LIBS=$LIBS | ||
9442 | LIBS="-ldld $LIBS" | ||
9443 | -cat >conftest.$ac_ext <<_ACEOF | ||
9444 | -/* confdefs.h. */ | ||
9445 | -_ACEOF | ||
9446 | -cat confdefs.h >>conftest.$ac_ext | ||
9447 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9448 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9449 | /* end confdefs.h. */ | ||
9450 | |||
9451 | /* Override any GCC internal prototype to avoid an error. | ||
9452 | @@ -11657,145 +11443,32 @@ | ||
9453 | return 0; | ||
9454 | } | ||
9455 | _ACEOF | ||
9456 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9457 | -if { (ac_try="$ac_link" | ||
9458 | -case "(($ac_try" in | ||
9459 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9460 | - *) ac_try_echo=$ac_try;; | ||
9461 | -esac | ||
9462 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9463 | -$as_echo "$ac_try_echo") >&5 | ||
9464 | - (eval "$ac_link") 2>conftest.er1 | ||
9465 | - ac_status=$? | ||
9466 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9467 | - rm -f conftest.er1 | ||
9468 | - cat conftest.err >&5 | ||
9469 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9470 | - (exit $ac_status); } && { | ||
9471 | - test -z "$ac_c_werror_flag" || | ||
9472 | - test ! -s conftest.err | ||
9473 | - } && test -s conftest$ac_exeext && { | ||
9474 | - test "$cross_compiling" = yes || | ||
9475 | - $as_test_x conftest$ac_exeext | ||
9476 | - }; then | ||
9477 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9478 | ac_cv_lib_dld_shl_load=yes | ||
9479 | else | ||
9480 | - $as_echo "$as_me: failed program was:" >&5 | ||
9481 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9482 | - | ||
9483 | - ac_cv_lib_dld_shl_load=no | ||
9484 | + ac_cv_lib_dld_shl_load=no | ||
9485 | fi | ||
9486 | - | ||
9487 | -rm -rf conftest.dSYM | ||
9488 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9489 | - conftest$ac_exeext conftest.$ac_ext | ||
9490 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9491 | + conftest$ac_exeext conftest.$ac_ext | ||
9492 | LIBS=$ac_check_lib_save_LIBS | ||
9493 | fi | ||
9494 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 | ||
9495 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 | ||
9496 | $as_echo "$ac_cv_lib_dld_shl_load" >&6; } | ||
9497 | -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then | ||
9498 | +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : | ||
9499 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" | ||
9500 | else | ||
9501 | - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 | ||
9502 | -$as_echo_n "checking for dlopen... " >&6; } | ||
9503 | -if test "${ac_cv_func_dlopen+set}" = set; then | ||
9504 | - $as_echo_n "(cached) " >&6 | ||
9505 | -else | ||
9506 | - cat >conftest.$ac_ext <<_ACEOF | ||
9507 | -/* confdefs.h. */ | ||
9508 | -_ACEOF | ||
9509 | -cat confdefs.h >>conftest.$ac_ext | ||
9510 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9511 | -/* end confdefs.h. */ | ||
9512 | -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. | ||
9513 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
9514 | -#define dlopen innocuous_dlopen | ||
9515 | - | ||
9516 | -/* System header to define __stub macros and hopefully few prototypes, | ||
9517 | - which can conflict with char dlopen (); below. | ||
9518 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
9519 | - <limits.h> exists even on freestanding compilers. */ | ||
9520 | - | ||
9521 | -#ifdef __STDC__ | ||
9522 | -# include <limits.h> | ||
9523 | -#else | ||
9524 | -# include <assert.h> | ||
9525 | -#endif | ||
9526 | - | ||
9527 | -#undef dlopen | ||
9528 | - | ||
9529 | -/* Override any GCC internal prototype to avoid an error. | ||
9530 | - Use char because int might match the return type of a GCC | ||
9531 | - builtin and then its argument prototype would still apply. */ | ||
9532 | -#ifdef __cplusplus | ||
9533 | -extern "C" | ||
9534 | -#endif | ||
9535 | -char dlopen (); | ||
9536 | -/* The GNU C library defines this for functions which it implements | ||
9537 | - to always fail with ENOSYS. Some functions are actually named | ||
9538 | - something starting with __ and the normal name is an alias. */ | ||
9539 | -#if defined __stub_dlopen || defined __stub___dlopen | ||
9540 | -choke me | ||
9541 | -#endif | ||
9542 | - | ||
9543 | -int | ||
9544 | -main () | ||
9545 | -{ | ||
9546 | -return dlopen (); | ||
9547 | - ; | ||
9548 | - return 0; | ||
9549 | -} | ||
9550 | -_ACEOF | ||
9551 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9552 | -if { (ac_try="$ac_link" | ||
9553 | -case "(($ac_try" in | ||
9554 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9555 | - *) ac_try_echo=$ac_try;; | ||
9556 | -esac | ||
9557 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9558 | -$as_echo "$ac_try_echo") >&5 | ||
9559 | - (eval "$ac_link") 2>conftest.er1 | ||
9560 | - ac_status=$? | ||
9561 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9562 | - rm -f conftest.er1 | ||
9563 | - cat conftest.err >&5 | ||
9564 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9565 | - (exit $ac_status); } && { | ||
9566 | - test -z "$ac_c_werror_flag" || | ||
9567 | - test ! -s conftest.err | ||
9568 | - } && test -s conftest$ac_exeext && { | ||
9569 | - test "$cross_compiling" = yes || | ||
9570 | - $as_test_x conftest$ac_exeext | ||
9571 | - }; then | ||
9572 | - ac_cv_func_dlopen=yes | ||
9573 | -else | ||
9574 | - $as_echo "$as_me: failed program was:" >&5 | ||
9575 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9576 | - | ||
9577 | - ac_cv_func_dlopen=no | ||
9578 | -fi | ||
9579 | - | ||
9580 | -rm -rf conftest.dSYM | ||
9581 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9582 | - conftest$ac_exeext conftest.$ac_ext | ||
9583 | -fi | ||
9584 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | ||
9585 | -$as_echo "$ac_cv_func_dlopen" >&6; } | ||
9586 | -if test "x$ac_cv_func_dlopen" = x""yes; then | ||
9587 | + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" | ||
9588 | +if test "x$ac_cv_func_dlopen" = x""yes; then : | ||
9589 | lt_cv_dlopen="dlopen" | ||
9590 | else | ||
9591 | - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | ||
9592 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 | ||
9593 | $as_echo_n "checking for dlopen in -ldl... " >&6; } | ||
9594 | -if test "${ac_cv_lib_dl_dlopen+set}" = set; then | ||
9595 | +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : | ||
9596 | $as_echo_n "(cached) " >&6 | ||
9597 | else | ||
9598 | ac_check_lib_save_LIBS=$LIBS | ||
9599 | LIBS="-ldl $LIBS" | ||
9600 | -cat >conftest.$ac_ext <<_ACEOF | ||
9601 | -/* confdefs.h. */ | ||
9602 | -_ACEOF | ||
9603 | -cat confdefs.h >>conftest.$ac_ext | ||
9604 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9605 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9606 | /* end confdefs.h. */ | ||
9607 | |||
9608 | /* Override any GCC internal prototype to avoid an error. | ||
9609 | @@ -11813,57 +11486,28 @@ | ||
9610 | return 0; | ||
9611 | } | ||
9612 | _ACEOF | ||
9613 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9614 | -if { (ac_try="$ac_link" | ||
9615 | -case "(($ac_try" in | ||
9616 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9617 | - *) ac_try_echo=$ac_try;; | ||
9618 | -esac | ||
9619 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9620 | -$as_echo "$ac_try_echo") >&5 | ||
9621 | - (eval "$ac_link") 2>conftest.er1 | ||
9622 | - ac_status=$? | ||
9623 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9624 | - rm -f conftest.er1 | ||
9625 | - cat conftest.err >&5 | ||
9626 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9627 | - (exit $ac_status); } && { | ||
9628 | - test -z "$ac_c_werror_flag" || | ||
9629 | - test ! -s conftest.err | ||
9630 | - } && test -s conftest$ac_exeext && { | ||
9631 | - test "$cross_compiling" = yes || | ||
9632 | - $as_test_x conftest$ac_exeext | ||
9633 | - }; then | ||
9634 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9635 | ac_cv_lib_dl_dlopen=yes | ||
9636 | else | ||
9637 | - $as_echo "$as_me: failed program was:" >&5 | ||
9638 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9639 | - | ||
9640 | - ac_cv_lib_dl_dlopen=no | ||
9641 | + ac_cv_lib_dl_dlopen=no | ||
9642 | fi | ||
9643 | - | ||
9644 | -rm -rf conftest.dSYM | ||
9645 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9646 | - conftest$ac_exeext conftest.$ac_ext | ||
9647 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9648 | + conftest$ac_exeext conftest.$ac_ext | ||
9649 | LIBS=$ac_check_lib_save_LIBS | ||
9650 | fi | ||
9651 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | ||
9652 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 | ||
9653 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } | ||
9654 | -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then | ||
9655 | +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : | ||
9656 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | ||
9657 | else | ||
9658 | - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 | ||
9659 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 | ||
9660 | $as_echo_n "checking for dlopen in -lsvld... " >&6; } | ||
9661 | -if test "${ac_cv_lib_svld_dlopen+set}" = set; then | ||
9662 | +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : | ||
9663 | $as_echo_n "(cached) " >&6 | ||
9664 | else | ||
9665 | ac_check_lib_save_LIBS=$LIBS | ||
9666 | LIBS="-lsvld $LIBS" | ||
9667 | -cat >conftest.$ac_ext <<_ACEOF | ||
9668 | -/* confdefs.h. */ | ||
9669 | -_ACEOF | ||
9670 | -cat confdefs.h >>conftest.$ac_ext | ||
9671 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9672 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9673 | /* end confdefs.h. */ | ||
9674 | |||
9675 | /* Override any GCC internal prototype to avoid an error. | ||
9676 | @@ -11881,57 +11525,28 @@ | ||
9677 | return 0; | ||
9678 | } | ||
9679 | _ACEOF | ||
9680 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9681 | -if { (ac_try="$ac_link" | ||
9682 | -case "(($ac_try" in | ||
9683 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9684 | - *) ac_try_echo=$ac_try;; | ||
9685 | -esac | ||
9686 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9687 | -$as_echo "$ac_try_echo") >&5 | ||
9688 | - (eval "$ac_link") 2>conftest.er1 | ||
9689 | - ac_status=$? | ||
9690 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9691 | - rm -f conftest.er1 | ||
9692 | - cat conftest.err >&5 | ||
9693 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9694 | - (exit $ac_status); } && { | ||
9695 | - test -z "$ac_c_werror_flag" || | ||
9696 | - test ! -s conftest.err | ||
9697 | - } && test -s conftest$ac_exeext && { | ||
9698 | - test "$cross_compiling" = yes || | ||
9699 | - $as_test_x conftest$ac_exeext | ||
9700 | - }; then | ||
9701 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9702 | ac_cv_lib_svld_dlopen=yes | ||
9703 | else | ||
9704 | - $as_echo "$as_me: failed program was:" >&5 | ||
9705 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9706 | - | ||
9707 | - ac_cv_lib_svld_dlopen=no | ||
9708 | + ac_cv_lib_svld_dlopen=no | ||
9709 | fi | ||
9710 | - | ||
9711 | -rm -rf conftest.dSYM | ||
9712 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9713 | - conftest$ac_exeext conftest.$ac_ext | ||
9714 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9715 | + conftest$ac_exeext conftest.$ac_ext | ||
9716 | LIBS=$ac_check_lib_save_LIBS | ||
9717 | fi | ||
9718 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 | ||
9719 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 | ||
9720 | $as_echo "$ac_cv_lib_svld_dlopen" >&6; } | ||
9721 | -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then | ||
9722 | +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : | ||
9723 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" | ||
9724 | else | ||
9725 | - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 | ||
9726 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 | ||
9727 | $as_echo_n "checking for dld_link in -ldld... " >&6; } | ||
9728 | -if test "${ac_cv_lib_dld_dld_link+set}" = set; then | ||
9729 | +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : | ||
9730 | $as_echo_n "(cached) " >&6 | ||
9731 | else | ||
9732 | ac_check_lib_save_LIBS=$LIBS | ||
9733 | LIBS="-ldld $LIBS" | ||
9734 | -cat >conftest.$ac_ext <<_ACEOF | ||
9735 | -/* confdefs.h. */ | ||
9736 | -_ACEOF | ||
9737 | -cat confdefs.h >>conftest.$ac_ext | ||
9738 | -cat >>conftest.$ac_ext <<_ACEOF | ||
9739 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9740 | /* end confdefs.h. */ | ||
9741 | |||
9742 | /* Override any GCC internal prototype to avoid an error. | ||
9743 | @@ -11949,43 +11564,18 @@ | ||
9744 | return 0; | ||
9745 | } | ||
9746 | _ACEOF | ||
9747 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
9748 | -if { (ac_try="$ac_link" | ||
9749 | -case "(($ac_try" in | ||
9750 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9751 | - *) ac_try_echo=$ac_try;; | ||
9752 | -esac | ||
9753 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
9754 | -$as_echo "$ac_try_echo") >&5 | ||
9755 | - (eval "$ac_link") 2>conftest.er1 | ||
9756 | - ac_status=$? | ||
9757 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
9758 | - rm -f conftest.er1 | ||
9759 | - cat conftest.err >&5 | ||
9760 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9761 | - (exit $ac_status); } && { | ||
9762 | - test -z "$ac_c_werror_flag" || | ||
9763 | - test ! -s conftest.err | ||
9764 | - } && test -s conftest$ac_exeext && { | ||
9765 | - test "$cross_compiling" = yes || | ||
9766 | - $as_test_x conftest$ac_exeext | ||
9767 | - }; then | ||
9768 | +if ac_fn_c_try_link "$LINENO"; then : | ||
9769 | ac_cv_lib_dld_dld_link=yes | ||
9770 | else | ||
9771 | - $as_echo "$as_me: failed program was:" >&5 | ||
9772 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
9773 | - | ||
9774 | - ac_cv_lib_dld_dld_link=no | ||
9775 | + ac_cv_lib_dld_dld_link=no | ||
9776 | fi | ||
9777 | - | ||
9778 | -rm -rf conftest.dSYM | ||
9779 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9780 | - conftest$ac_exeext conftest.$ac_ext | ||
9781 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9782 | + conftest$ac_exeext conftest.$ac_ext | ||
9783 | LIBS=$ac_check_lib_save_LIBS | ||
9784 | fi | ||
9785 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 | ||
9786 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 | ||
9787 | $as_echo "$ac_cv_lib_dld_dld_link" >&6; } | ||
9788 | -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then | ||
9789 | +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : | ||
9790 | lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" | ||
9791 | fi | ||
9792 | |||
9793 | @@ -12024,9 +11614,9 @@ | ||
9794 | save_LIBS="$LIBS" | ||
9795 | LIBS="$lt_cv_dlopen_libs $LIBS" | ||
9796 | |||
9797 | - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 | ||
9798 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 | ||
9799 | $as_echo_n "checking whether a program can dlopen itself... " >&6; } | ||
9800 | -if test "${lt_cv_dlopen_self+set}" = set; then | ||
9801 | +if test "${lt_cv_dlopen_self+set}" = set; then : | ||
9802 | $as_echo_n "(cached) " >&6 | ||
9803 | else | ||
9804 | if test "$cross_compiling" = yes; then : | ||
9805 | @@ -12035,7 +11625,7 @@ | ||
9806 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
9807 | lt_status=$lt_dlunknown | ||
9808 | cat > conftest.$ac_ext <<_LT_EOF | ||
9809 | -#line 12038 "configure" | ||
9810 | +#line 11628 "configure" | ||
9811 | #include "confdefs.h" | ||
9812 | |||
9813 | #if HAVE_DLFCN_H | ||
9814 | @@ -12094,11 +11684,11 @@ | ||
9815 | return status; | ||
9816 | } | ||
9817 | _LT_EOF | ||
9818 | - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
9819 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
9820 | (eval $ac_link) 2>&5 | ||
9821 | ac_status=$? | ||
9822 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9823 | - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then | ||
9824 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
9825 | + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then | ||
9826 | (./conftest; exit; ) >&5 2>/dev/null | ||
9827 | lt_status=$? | ||
9828 | case x$lt_status in | ||
9829 | @@ -12115,14 +11705,14 @@ | ||
9830 | |||
9831 | |||
9832 | fi | ||
9833 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 | ||
9834 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 | ||
9835 | $as_echo "$lt_cv_dlopen_self" >&6; } | ||
9836 | |||
9837 | if test "x$lt_cv_dlopen_self" = xyes; then | ||
9838 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" | ||
9839 | - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 | ||
9840 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 | ||
9841 | $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } | ||
9842 | -if test "${lt_cv_dlopen_self_static+set}" = set; then | ||
9843 | +if test "${lt_cv_dlopen_self_static+set}" = set; then : | ||
9844 | $as_echo_n "(cached) " >&6 | ||
9845 | else | ||
9846 | if test "$cross_compiling" = yes; then : | ||
9847 | @@ -12131,7 +11721,7 @@ | ||
9848 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
9849 | lt_status=$lt_dlunknown | ||
9850 | cat > conftest.$ac_ext <<_LT_EOF | ||
9851 | -#line 12134 "configure" | ||
9852 | +#line 11724 "configure" | ||
9853 | #include "confdefs.h" | ||
9854 | |||
9855 | #if HAVE_DLFCN_H | ||
9856 | @@ -12190,11 +11780,11 @@ | ||
9857 | return status; | ||
9858 | } | ||
9859 | _LT_EOF | ||
9860 | - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
9861 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
9862 | (eval $ac_link) 2>&5 | ||
9863 | ac_status=$? | ||
9864 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9865 | - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then | ||
9866 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
9867 | + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then | ||
9868 | (./conftest; exit; ) >&5 2>/dev/null | ||
9869 | lt_status=$? | ||
9870 | case x$lt_status in | ||
9871 | @@ -12211,7 +11801,7 @@ | ||
9872 | |||
9873 | |||
9874 | fi | ||
9875 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 | ||
9876 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 | ||
9877 | $as_echo "$lt_cv_dlopen_self_static" >&6; } | ||
9878 | fi | ||
9879 | |||
9880 | @@ -12250,12 +11840,12 @@ | ||
9881 | |||
9882 | striplib= | ||
9883 | old_striplib= | ||
9884 | -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | ||
9885 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 | ||
9886 | $as_echo_n "checking whether stripping libraries is possible... " >&6; } | ||
9887 | if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then | ||
9888 | test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | ||
9889 | test -z "$striplib" && striplib="$STRIP --strip-unneeded" | ||
9890 | - { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
9891 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
9892 | $as_echo "yes" >&6; } | ||
9893 | else | ||
9894 | # FIXME - insert some real tests, host_os isn't really good enough | ||
9895 | @@ -12264,15 +11854,15 @@ | ||
9896 | if test -n "$STRIP" ; then | ||
9897 | striplib="$STRIP -x" | ||
9898 | old_striplib="$STRIP -S" | ||
9899 | - { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
9900 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
9901 | $as_echo "yes" >&6; } | ||
9902 | else | ||
9903 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
9904 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
9905 | $as_echo "no" >&6; } | ||
9906 | fi | ||
9907 | ;; | ||
9908 | *) | ||
9909 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
9910 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
9911 | $as_echo "no" >&6; } | ||
9912 | ;; | ||
9913 | esac | ||
9914 | @@ -12290,12 +11880,12 @@ | ||
9915 | |||
9916 | |||
9917 | # Report which library types will actually be built | ||
9918 | - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | ||
9919 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 | ||
9920 | $as_echo_n "checking if libtool supports shared libraries... " >&6; } | ||
9921 | - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 | ||
9922 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 | ||
9923 | $as_echo "$can_build_shared" >&6; } | ||
9924 | |||
9925 | - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | ||
9926 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 | ||
9927 | $as_echo_n "checking whether to build shared libraries... " >&6; } | ||
9928 | test "$can_build_shared" = "no" && enable_shared=no | ||
9929 | |||
9930 | @@ -12316,14 +11906,14 @@ | ||
9931 | fi | ||
9932 | ;; | ||
9933 | esac | ||
9934 | - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 | ||
9935 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 | ||
9936 | $as_echo "$enable_shared" >&6; } | ||
9937 | |||
9938 | - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | ||
9939 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 | ||
9940 | $as_echo_n "checking whether to build static libraries... " >&6; } | ||
9941 | # Make sure either enable_shared or enable_static is yes. | ||
9942 | test "$enable_shared" = yes || enable_static=yes | ||
9943 | - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 | ||
9944 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 | ||
9945 | $as_echo "$enable_static" >&6; } | ||
9946 | |||
9947 | |||
9948 | @@ -12361,9 +11951,9 @@ | ||
9949 | |||
9950 | # Extract the first word of "ocamlc", so it can be a program name with args. | ||
9951 | set dummy ocamlc; ac_word=$2 | ||
9952 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9953 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
9954 | $as_echo_n "checking for $ac_word... " >&6; } | ||
9955 | -if test "${ac_cv_prog_OCAMLC+set}" = set; then | ||
9956 | +if test "${ac_cv_prog_OCAMLC+set}" = set; then : | ||
9957 | $as_echo_n "(cached) " >&6 | ||
9958 | else | ||
9959 | if test -n "$OCAMLC"; then | ||
9960 | @@ -12374,33 +11964,33 @@ | ||
9961 | do | ||
9962 | IFS=$as_save_IFS | ||
9963 | test -z "$as_dir" && as_dir=. | ||
9964 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
9965 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
9966 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
9967 | ac_cv_prog_OCAMLC="ocamlc" | ||
9968 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
9969 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
9970 | break 2 | ||
9971 | fi | ||
9972 | done | ||
9973 | -done | ||
9974 | + done | ||
9975 | IFS=$as_save_IFS | ||
9976 | |||
9977 | fi | ||
9978 | fi | ||
9979 | OCAMLC=$ac_cv_prog_OCAMLC | ||
9980 | if test -n "$OCAMLC"; then | ||
9981 | - { $as_echo "$as_me:$LINENO: result: $OCAMLC" >&5 | ||
9982 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLC" >&5 | ||
9983 | $as_echo "$OCAMLC" >&6; } | ||
9984 | else | ||
9985 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
9986 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
9987 | $as_echo "no" >&6; } | ||
9988 | fi | ||
9989 | |||
9990 | |||
9991 | # Extract the first word of "ocamlopt", so it can be a program name with args. | ||
9992 | set dummy ocamlopt; ac_word=$2 | ||
9993 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9994 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
9995 | $as_echo_n "checking for $ac_word... " >&6; } | ||
9996 | -if test "${ac_cv_prog_OCAMLOPT+set}" = set; then | ||
9997 | +if test "${ac_cv_prog_OCAMLOPT+set}" = set; then : | ||
9998 | $as_echo_n "(cached) " >&6 | ||
9999 | else | ||
10000 | if test -n "$OCAMLOPT"; then | ||
10001 | @@ -12411,33 +12001,33 @@ | ||
10002 | do | ||
10003 | IFS=$as_save_IFS | ||
10004 | test -z "$as_dir" && as_dir=. | ||
10005 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10006 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10007 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10008 | ac_cv_prog_OCAMLOPT="ocamlopt" | ||
10009 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10010 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10011 | break 2 | ||
10012 | fi | ||
10013 | done | ||
10014 | -done | ||
10015 | + done | ||
10016 | IFS=$as_save_IFS | ||
10017 | |||
10018 | fi | ||
10019 | fi | ||
10020 | OCAMLOPT=$ac_cv_prog_OCAMLOPT | ||
10021 | if test -n "$OCAMLOPT"; then | ||
10022 | - { $as_echo "$as_me:$LINENO: result: $OCAMLOPT" >&5 | ||
10023 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPT" >&5 | ||
10024 | $as_echo "$OCAMLOPT" >&6; } | ||
10025 | else | ||
10026 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
10027 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10028 | $as_echo "no" >&6; } | ||
10029 | fi | ||
10030 | |||
10031 | |||
10032 | # Extract the first word of "ocamldep", so it can be a program name with args. | ||
10033 | set dummy ocamldep; ac_word=$2 | ||
10034 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10035 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10036 | $as_echo_n "checking for $ac_word... " >&6; } | ||
10037 | -if test "${ac_cv_prog_OCAMLDEP+set}" = set; then | ||
10038 | +if test "${ac_cv_prog_OCAMLDEP+set}" = set; then : | ||
10039 | $as_echo_n "(cached) " >&6 | ||
10040 | else | ||
10041 | if test -n "$OCAMLDEP"; then | ||
10042 | @@ -12448,24 +12038,24 @@ | ||
10043 | do | ||
10044 | IFS=$as_save_IFS | ||
10045 | test -z "$as_dir" && as_dir=. | ||
10046 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10047 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10048 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10049 | ac_cv_prog_OCAMLDEP="ocamldep" | ||
10050 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10051 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10052 | break 2 | ||
10053 | fi | ||
10054 | done | ||
10055 | -done | ||
10056 | + done | ||
10057 | IFS=$as_save_IFS | ||
10058 | |||
10059 | fi | ||
10060 | fi | ||
10061 | OCAMLDEP=$ac_cv_prog_OCAMLDEP | ||
10062 | if test -n "$OCAMLDEP"; then | ||
10063 | - { $as_echo "$as_me:$LINENO: result: $OCAMLDEP" >&5 | ||
10064 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEP" >&5 | ||
10065 | $as_echo "$OCAMLDEP" >&6; } | ||
10066 | else | ||
10067 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
10068 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10069 | $as_echo "no" >&6; } | ||
10070 | fi | ||
10071 | |||
10072 | @@ -12478,7 +12068,7 @@ | ||
10073 | |||
10074 | |||
10075 | # Check whether --enable-mpi was given. | ||
10076 | -if test "${enable_mpi+set}" = set; then | ||
10077 | +if test "${enable_mpi+set}" = set; then : | ||
10078 | enableval=$enable_mpi; enable_mpi=$enableval | ||
10079 | else | ||
10080 | enable_mpi=no | ||
10081 | @@ -12495,9 +12085,9 @@ | ||
10082 | do | ||
10083 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
10084 | set dummy $ac_prog; ac_word=$2 | ||
10085 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10086 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10087 | $as_echo_n "checking for $ac_word... " >&6; } | ||
10088 | -if test "${ac_cv_prog_MPICC+set}" = set; then | ||
10089 | +if test "${ac_cv_prog_MPICC+set}" = set; then : | ||
10090 | $as_echo_n "(cached) " >&6 | ||
10091 | else | ||
10092 | if test -n "$MPICC"; then | ||
10093 | @@ -12508,24 +12098,24 @@ | ||
10094 | do | ||
10095 | IFS=$as_save_IFS | ||
10096 | test -z "$as_dir" && as_dir=. | ||
10097 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10098 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10099 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10100 | ac_cv_prog_MPICC="$ac_prog" | ||
10101 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10102 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10103 | break 2 | ||
10104 | fi | ||
10105 | done | ||
10106 | -done | ||
10107 | + done | ||
10108 | IFS=$as_save_IFS | ||
10109 | |||
10110 | fi | ||
10111 | fi | ||
10112 | MPICC=$ac_cv_prog_MPICC | ||
10113 | if test -n "$MPICC"; then | ||
10114 | - { $as_echo "$as_me:$LINENO: result: $MPICC" >&5 | ||
10115 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPICC" >&5 | ||
10116 | $as_echo "$MPICC" >&6; } | ||
10117 | else | ||
10118 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
10119 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10120 | $as_echo "no" >&6; } | ||
10121 | fi | ||
10122 | |||
10123 | @@ -12540,109 +12130,21 @@ | ||
10124 | |||
10125 | |||
10126 | if test x = x"$MPILIBS"; then | ||
10127 | - { $as_echo "$as_me:$LINENO: checking for MPI_Init" >&5 | ||
10128 | -$as_echo_n "checking for MPI_Init... " >&6; } | ||
10129 | -if test "${ac_cv_func_MPI_Init+set}" = set; then | ||
10130 | - $as_echo_n "(cached) " >&6 | ||
10131 | -else | ||
10132 | - cat >conftest.$ac_ext <<_ACEOF | ||
10133 | -/* confdefs.h. */ | ||
10134 | -_ACEOF | ||
10135 | -cat confdefs.h >>conftest.$ac_ext | ||
10136 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10137 | -/* end confdefs.h. */ | ||
10138 | -/* Define MPI_Init to an innocuous variant, in case <limits.h> declares MPI_Init. | ||
10139 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10140 | -#define MPI_Init innocuous_MPI_Init | ||
10141 | - | ||
10142 | -/* System header to define __stub macros and hopefully few prototypes, | ||
10143 | - which can conflict with char MPI_Init (); below. | ||
10144 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
10145 | - <limits.h> exists even on freestanding compilers. */ | ||
10146 | - | ||
10147 | -#ifdef __STDC__ | ||
10148 | -# include <limits.h> | ||
10149 | -#else | ||
10150 | -# include <assert.h> | ||
10151 | -#endif | ||
10152 | - | ||
10153 | -#undef MPI_Init | ||
10154 | - | ||
10155 | -/* Override any GCC internal prototype to avoid an error. | ||
10156 | - Use char because int might match the return type of a GCC | ||
10157 | - builtin and then its argument prototype would still apply. */ | ||
10158 | -#ifdef __cplusplus | ||
10159 | -extern "C" | ||
10160 | -#endif | ||
10161 | -char MPI_Init (); | ||
10162 | -/* The GNU C library defines this for functions which it implements | ||
10163 | - to always fail with ENOSYS. Some functions are actually named | ||
10164 | - something starting with __ and the normal name is an alias. */ | ||
10165 | -#if defined __stub_MPI_Init || defined __stub___MPI_Init | ||
10166 | -choke me | ||
10167 | -#endif | ||
10168 | - | ||
10169 | -int | ||
10170 | -main () | ||
10171 | -{ | ||
10172 | -return MPI_Init (); | ||
10173 | - ; | ||
10174 | - return 0; | ||
10175 | -} | ||
10176 | -_ACEOF | ||
10177 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
10178 | -if { (ac_try="$ac_link" | ||
10179 | -case "(($ac_try" in | ||
10180 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10181 | - *) ac_try_echo=$ac_try;; | ||
10182 | -esac | ||
10183 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10184 | -$as_echo "$ac_try_echo") >&5 | ||
10185 | - (eval "$ac_link") 2>conftest.er1 | ||
10186 | - ac_status=$? | ||
10187 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10188 | - rm -f conftest.er1 | ||
10189 | - cat conftest.err >&5 | ||
10190 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10191 | - (exit $ac_status); } && { | ||
10192 | - test -z "$ac_c_werror_flag" || | ||
10193 | - test ! -s conftest.err | ||
10194 | - } && test -s conftest$ac_exeext && { | ||
10195 | - test "$cross_compiling" = yes || | ||
10196 | - $as_test_x conftest$ac_exeext | ||
10197 | - }; then | ||
10198 | - ac_cv_func_MPI_Init=yes | ||
10199 | -else | ||
10200 | - $as_echo "$as_me: failed program was:" >&5 | ||
10201 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10202 | - | ||
10203 | - ac_cv_func_MPI_Init=no | ||
10204 | -fi | ||
10205 | - | ||
10206 | -rm -rf conftest.dSYM | ||
10207 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10208 | - conftest$ac_exeext conftest.$ac_ext | ||
10209 | -fi | ||
10210 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_MPI_Init" >&5 | ||
10211 | -$as_echo "$ac_cv_func_MPI_Init" >&6; } | ||
10212 | -if test "x$ac_cv_func_MPI_Init" = x""yes; then | ||
10213 | + ac_fn_c_check_func "$LINENO" "MPI_Init" "ac_cv_func_MPI_Init" | ||
10214 | +if test "x$ac_cv_func_MPI_Init" = x""yes; then : | ||
10215 | MPILIBS=" " | ||
10216 | fi | ||
10217 | |||
10218 | fi | ||
10219 | if test x = x"$MPILIBS"; then | ||
10220 | - { $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 | ||
10221 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5 | ||
10222 | $as_echo_n "checking for MPI_Init in -lmpi... " >&6; } | ||
10223 | -if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then | ||
10224 | +if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then : | ||
10225 | $as_echo_n "(cached) " >&6 | ||
10226 | else | ||
10227 | ac_check_lib_save_LIBS=$LIBS | ||
10228 | LIBS="-lmpi $LIBS" | ||
10229 | -cat >conftest.$ac_ext <<_ACEOF | ||
10230 | -/* confdefs.h. */ | ||
10231 | -_ACEOF | ||
10232 | -cat confdefs.h >>conftest.$ac_ext | ||
10233 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10234 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10235 | /* end confdefs.h. */ | ||
10236 | |||
10237 | /* Override any GCC internal prototype to avoid an error. | ||
10238 | @@ -12660,60 +12162,31 @@ | ||
10239 | return 0; | ||
10240 | } | ||
10241 | _ACEOF | ||
10242 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
10243 | -if { (ac_try="$ac_link" | ||
10244 | -case "(($ac_try" in | ||
10245 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10246 | - *) ac_try_echo=$ac_try;; | ||
10247 | -esac | ||
10248 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10249 | -$as_echo "$ac_try_echo") >&5 | ||
10250 | - (eval "$ac_link") 2>conftest.er1 | ||
10251 | - ac_status=$? | ||
10252 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10253 | - rm -f conftest.er1 | ||
10254 | - cat conftest.err >&5 | ||
10255 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10256 | - (exit $ac_status); } && { | ||
10257 | - test -z "$ac_c_werror_flag" || | ||
10258 | - test ! -s conftest.err | ||
10259 | - } && test -s conftest$ac_exeext && { | ||
10260 | - test "$cross_compiling" = yes || | ||
10261 | - $as_test_x conftest$ac_exeext | ||
10262 | - }; then | ||
10263 | +if ac_fn_c_try_link "$LINENO"; then : | ||
10264 | ac_cv_lib_mpi_MPI_Init=yes | ||
10265 | else | ||
10266 | - $as_echo "$as_me: failed program was:" >&5 | ||
10267 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10268 | - | ||
10269 | - ac_cv_lib_mpi_MPI_Init=no | ||
10270 | + ac_cv_lib_mpi_MPI_Init=no | ||
10271 | fi | ||
10272 | - | ||
10273 | -rm -rf conftest.dSYM | ||
10274 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10275 | - conftest$ac_exeext conftest.$ac_ext | ||
10276 | +rm -f core conftest.err conftest.$ac_objext \ | ||
10277 | + conftest$ac_exeext conftest.$ac_ext | ||
10278 | LIBS=$ac_check_lib_save_LIBS | ||
10279 | fi | ||
10280 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 | ||
10281 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpi_MPI_Init" >&5 | ||
10282 | $as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; } | ||
10283 | -if test "x$ac_cv_lib_mpi_MPI_Init" = x""yes; then | ||
10284 | +if test "x$ac_cv_lib_mpi_MPI_Init" = x""yes; then : | ||
10285 | MPILIBS="-lmpi" | ||
10286 | fi | ||
10287 | |||
10288 | fi | ||
10289 | if test x = x"$MPILIBS"; then | ||
10290 | - { $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 | ||
10291 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpich" >&5 | ||
10292 | $as_echo_n "checking for MPI_Init in -lmpich... " >&6; } | ||
10293 | -if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then | ||
10294 | +if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then : | ||
10295 | $as_echo_n "(cached) " >&6 | ||
10296 | else | ||
10297 | ac_check_lib_save_LIBS=$LIBS | ||
10298 | LIBS="-lmpich $LIBS" | ||
10299 | -cat >conftest.$ac_ext <<_ACEOF | ||
10300 | -/* confdefs.h. */ | ||
10301 | -_ACEOF | ||
10302 | -cat confdefs.h >>conftest.$ac_ext | ||
10303 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10304 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10305 | /* end confdefs.h. */ | ||
10306 | |||
10307 | /* Override any GCC internal prototype to avoid an error. | ||
10308 | @@ -12731,56 +12204,27 @@ | ||
10309 | return 0; | ||
10310 | } | ||
10311 | _ACEOF | ||
10312 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
10313 | -if { (ac_try="$ac_link" | ||
10314 | -case "(($ac_try" in | ||
10315 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10316 | - *) ac_try_echo=$ac_try;; | ||
10317 | -esac | ||
10318 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10319 | -$as_echo "$ac_try_echo") >&5 | ||
10320 | - (eval "$ac_link") 2>conftest.er1 | ||
10321 | - ac_status=$? | ||
10322 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10323 | - rm -f conftest.er1 | ||
10324 | - cat conftest.err >&5 | ||
10325 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10326 | - (exit $ac_status); } && { | ||
10327 | - test -z "$ac_c_werror_flag" || | ||
10328 | - test ! -s conftest.err | ||
10329 | - } && test -s conftest$ac_exeext && { | ||
10330 | - test "$cross_compiling" = yes || | ||
10331 | - $as_test_x conftest$ac_exeext | ||
10332 | - }; then | ||
10333 | +if ac_fn_c_try_link "$LINENO"; then : | ||
10334 | ac_cv_lib_mpich_MPI_Init=yes | ||
10335 | else | ||
10336 | - $as_echo "$as_me: failed program was:" >&5 | ||
10337 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10338 | - | ||
10339 | - ac_cv_lib_mpich_MPI_Init=no | ||
10340 | + ac_cv_lib_mpich_MPI_Init=no | ||
10341 | fi | ||
10342 | - | ||
10343 | -rm -rf conftest.dSYM | ||
10344 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10345 | - conftest$ac_exeext conftest.$ac_ext | ||
10346 | +rm -f core conftest.err conftest.$ac_objext \ | ||
10347 | + conftest$ac_exeext conftest.$ac_ext | ||
10348 | LIBS=$ac_check_lib_save_LIBS | ||
10349 | fi | ||
10350 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 | ||
10351 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpich_MPI_Init" >&5 | ||
10352 | $as_echo "$ac_cv_lib_mpich_MPI_Init" >&6; } | ||
10353 | -if test "x$ac_cv_lib_mpich_MPI_Init" = x""yes; then | ||
10354 | +if test "x$ac_cv_lib_mpich_MPI_Init" = x""yes; then : | ||
10355 | MPILIBS="-lmpich" | ||
10356 | fi | ||
10357 | |||
10358 | fi | ||
10359 | |||
10360 | if test x != x"$MPILIBS"; then | ||
10361 | - { $as_echo "$as_me:$LINENO: checking for mpi.h" >&5 | ||
10362 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpi.h" >&5 | ||
10363 | $as_echo_n "checking for mpi.h... " >&6; } | ||
10364 | - cat >conftest.$ac_ext <<_ACEOF | ||
10365 | -/* confdefs.h. */ | ||
10366 | -_ACEOF | ||
10367 | -cat confdefs.h >>conftest.$ac_ext | ||
10368 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10369 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10370 | /* end confdefs.h. */ | ||
10371 | #include <mpi.h> | ||
10372 | int | ||
10373 | @@ -12791,35 +12235,14 @@ | ||
10374 | return 0; | ||
10375 | } | ||
10376 | _ACEOF | ||
10377 | -rm -f conftest.$ac_objext | ||
10378 | -if { (ac_try="$ac_compile" | ||
10379 | -case "(($ac_try" in | ||
10380 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10381 | - *) ac_try_echo=$ac_try;; | ||
10382 | -esac | ||
10383 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10384 | -$as_echo "$ac_try_echo") >&5 | ||
10385 | - (eval "$ac_compile") 2>conftest.er1 | ||
10386 | - ac_status=$? | ||
10387 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10388 | - rm -f conftest.er1 | ||
10389 | - cat conftest.err >&5 | ||
10390 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10391 | - (exit $ac_status); } && { | ||
10392 | - test -z "$ac_c_werror_flag" || | ||
10393 | - test ! -s conftest.err | ||
10394 | - } && test -s conftest.$ac_objext; then | ||
10395 | - { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
10396 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10397 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
10398 | $as_echo "yes" >&6; } | ||
10399 | else | ||
10400 | - $as_echo "$as_me: failed program was:" >&5 | ||
10401 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10402 | - | ||
10403 | - MPILIBS="" | ||
10404 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
10405 | + MPILIBS="" | ||
10406 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10407 | $as_echo "no" >&6; } | ||
10408 | fi | ||
10409 | - | ||
10410 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10411 | fi | ||
10412 | |||
10413 | @@ -12829,24 +12252,20 @@ | ||
10414 | |||
10415 | # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: | ||
10416 | if test x = x"$MPILIBS"; then | ||
10417 | - { { $as_echo "$as_me:$LINENO: error: could not find mpi library for --enable-mpi" >&5 | ||
10418 | -$as_echo "$as_me: error: could not find mpi library for --enable-mpi" >&2;} | ||
10419 | - { (exit 1); exit 1; }; } | ||
10420 | + as_fn_error $? "could not find mpi library for --enable-mpi" "$LINENO" 5 | ||
10421 | : | ||
10422 | else | ||
10423 | |||
10424 | -cat >>confdefs.h <<\_ACEOF | ||
10425 | -#define HAVE_MPI 1 | ||
10426 | -_ACEOF | ||
10427 | +$as_echo "#define HAVE_MPI 1" >>confdefs.h | ||
10428 | |||
10429 | : | ||
10430 | fi | ||
10431 | |||
10432 | # Extract the first word of "mpirun", so it can be a program name with args. | ||
10433 | set dummy mpirun; ac_word=$2 | ||
10434 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10435 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10436 | $as_echo_n "checking for $ac_word... " >&6; } | ||
10437 | -if test "${ac_cv_prog_MPIRUN+set}" = set; then | ||
10438 | +if test "${ac_cv_prog_MPIRUN+set}" = set; then : | ||
10439 | $as_echo_n "(cached) " >&6 | ||
10440 | else | ||
10441 | if test -n "$MPIRUN"; then | ||
10442 | @@ -12857,24 +12276,24 @@ | ||
10443 | do | ||
10444 | IFS=$as_save_IFS | ||
10445 | test -z "$as_dir" && as_dir=. | ||
10446 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10447 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10448 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10449 | ac_cv_prog_MPIRUN="mpirun" | ||
10450 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10451 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10452 | break 2 | ||
10453 | fi | ||
10454 | done | ||
10455 | -done | ||
10456 | + done | ||
10457 | IFS=$as_save_IFS | ||
10458 | |||
10459 | fi | ||
10460 | fi | ||
10461 | MPIRUN=$ac_cv_prog_MPIRUN | ||
10462 | if test -n "$MPIRUN"; then | ||
10463 | - { $as_echo "$as_me:$LINENO: result: $MPIRUN" >&5 | ||
10464 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPIRUN" >&5 | ||
10465 | $as_echo "$MPIRUN" >&6; } | ||
10466 | else | ||
10467 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
10468 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10469 | $as_echo "no" >&6; } | ||
10470 | fi | ||
10471 | |||
10472 | @@ -12897,7 +12316,7 @@ | ||
10473 | |||
10474 | |||
10475 | # Check whether --enable-portable-binary was given. | ||
10476 | -if test "${enable_portable_binary+set}" = set; then | ||
10477 | +if test "${enable_portable_binary+set}" = set; then : | ||
10478 | enableval=$enable_portable_binary; acx_maxopt_portable=$enableval | ||
10479 | else | ||
10480 | acx_maxopt_portable=no | ||
10481 | @@ -12928,15 +12347,11 @@ | ||
10482 | else | ||
10483 | xlc_opt="-qtune=auto" | ||
10484 | fi | ||
10485 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts $xlc_opt" >&5 | ||
10486 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $xlc_opt" >&5 | ||
10487 | $as_echo_n "checking whether C compiler accepts $xlc_opt... " >&6; } | ||
10488 | ax_save_FLAGS=$CFLAGS | ||
10489 | CFLAGS="$xlc_opt" | ||
10490 | - cat >conftest.$ac_ext <<_ACEOF | ||
10491 | -/* confdefs.h. */ | ||
10492 | -_ACEOF | ||
10493 | -cat confdefs.h >>conftest.$ac_ext | ||
10494 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10495 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10496 | /* end confdefs.h. */ | ||
10497 | |||
10498 | int | ||
10499 | @@ -12947,36 +12362,15 @@ | ||
10500 | return 0; | ||
10501 | } | ||
10502 | _ACEOF | ||
10503 | -rm -f conftest.$ac_objext | ||
10504 | -if { (ac_try="$ac_compile" | ||
10505 | -case "(($ac_try" in | ||
10506 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10507 | - *) ac_try_echo=$ac_try;; | ||
10508 | -esac | ||
10509 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10510 | -$as_echo "$ac_try_echo") >&5 | ||
10511 | - (eval "$ac_compile") 2>conftest.er1 | ||
10512 | - ac_status=$? | ||
10513 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10514 | - rm -f conftest.er1 | ||
10515 | - cat conftest.err >&5 | ||
10516 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10517 | - (exit $ac_status); } && { | ||
10518 | - test -z "$ac_c_werror_flag" || | ||
10519 | - test ! -s conftest.err | ||
10520 | - } && test -s conftest.$ac_objext; then | ||
10521 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10522 | eval `$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=yes | ||
10523 | else | ||
10524 | - $as_echo "$as_me: failed program was:" >&5 | ||
10525 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10526 | - | ||
10527 | - eval `$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=no | ||
10528 | + eval `$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=no | ||
10529 | fi | ||
10530 | - | ||
10531 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10532 | CFLAGS=$ax_save_FLAGS | ||
10533 | eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh` | ||
10534 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
10535 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
10536 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
10537 | if test "x$ax_check_compiler_flags" = xyes; then | ||
10538 | CFLAGS="-O3 -qansialias -w $xlc_opt" | ||
10539 | @@ -13000,15 +12394,11 @@ | ||
10540 | # Intel seems to have changed the spelling of this flag recently | ||
10541 | icc_ansi_alias="unknown" | ||
10542 | for flag in -ansi-alias -ansi_alias; do | ||
10543 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 | ||
10544 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 | ||
10545 | $as_echo_n "checking whether C compiler accepts $flag... " >&6; } | ||
10546 | ax_save_FLAGS=$CFLAGS | ||
10547 | CFLAGS="$flag" | ||
10548 | - cat >conftest.$ac_ext <<_ACEOF | ||
10549 | -/* confdefs.h. */ | ||
10550 | -_ACEOF | ||
10551 | -cat confdefs.h >>conftest.$ac_ext | ||
10552 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10553 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10554 | /* end confdefs.h. */ | ||
10555 | |||
10556 | int | ||
10557 | @@ -13019,36 +12409,15 @@ | ||
10558 | return 0; | ||
10559 | } | ||
10560 | _ACEOF | ||
10561 | -rm -f conftest.$ac_objext | ||
10562 | -if { (ac_try="$ac_compile" | ||
10563 | -case "(($ac_try" in | ||
10564 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10565 | - *) ac_try_echo=$ac_try;; | ||
10566 | -esac | ||
10567 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10568 | -$as_echo "$ac_try_echo") >&5 | ||
10569 | - (eval "$ac_compile") 2>conftest.er1 | ||
10570 | - ac_status=$? | ||
10571 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10572 | - rm -f conftest.er1 | ||
10573 | - cat conftest.err >&5 | ||
10574 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10575 | - (exit $ac_status); } && { | ||
10576 | - test -z "$ac_c_werror_flag" || | ||
10577 | - test ! -s conftest.err | ||
10578 | - } && test -s conftest.$ac_objext; then | ||
10579 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10580 | eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes | ||
10581 | else | ||
10582 | - $as_echo "$as_me: failed program was:" >&5 | ||
10583 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10584 | - | ||
10585 | - eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no | ||
10586 | + eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no | ||
10587 | fi | ||
10588 | - | ||
10589 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10590 | CFLAGS=$ax_save_FLAGS | ||
10591 | eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh` | ||
10592 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
10593 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
10594 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
10595 | if test "x$ax_check_compiler_flags" = xyes; then | ||
10596 | icc_ansi_alias=$flag; break | ||
10597 | @@ -13060,19 +12429,15 @@ | ||
10598 | if test "x$icc_ansi_alias" != xunknown; then | ||
10599 | CFLAGS="$CFLAGS $icc_ansi_alias" | ||
10600 | fi | ||
10601 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -malign-double" >&5 | ||
10602 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5 | ||
10603 | $as_echo_n "checking whether C compiler accepts -malign-double... " >&6; } | ||
10604 | -if test "${ax_cv_c_flags__malign_double+set}" = set; then | ||
10605 | +if test "${ax_cv_c_flags__malign_double+set}" = set; then : | ||
10606 | $as_echo_n "(cached) " >&6 | ||
10607 | else | ||
10608 | |||
10609 | ax_save_FLAGS=$CFLAGS | ||
10610 | CFLAGS="-malign-double" | ||
10611 | - cat >conftest.$ac_ext <<_ACEOF | ||
10612 | -/* confdefs.h. */ | ||
10613 | -_ACEOF | ||
10614 | -cat confdefs.h >>conftest.$ac_ext | ||
10615 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10616 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10617 | /* end confdefs.h. */ | ||
10618 | |||
10619 | int | ||
10620 | @@ -13083,38 +12448,17 @@ | ||
10621 | return 0; | ||
10622 | } | ||
10623 | _ACEOF | ||
10624 | -rm -f conftest.$ac_objext | ||
10625 | -if { (ac_try="$ac_compile" | ||
10626 | -case "(($ac_try" in | ||
10627 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10628 | - *) ac_try_echo=$ac_try;; | ||
10629 | -esac | ||
10630 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10631 | -$as_echo "$ac_try_echo") >&5 | ||
10632 | - (eval "$ac_compile") 2>conftest.er1 | ||
10633 | - ac_status=$? | ||
10634 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10635 | - rm -f conftest.er1 | ||
10636 | - cat conftest.err >&5 | ||
10637 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10638 | - (exit $ac_status); } && { | ||
10639 | - test -z "$ac_c_werror_flag" || | ||
10640 | - test ! -s conftest.err | ||
10641 | - } && test -s conftest.$ac_objext; then | ||
10642 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10643 | ax_cv_c_flags__malign_double=yes | ||
10644 | else | ||
10645 | - $as_echo "$as_me: failed program was:" >&5 | ||
10646 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10647 | - | ||
10648 | - ax_cv_c_flags__malign_double=no | ||
10649 | + ax_cv_c_flags__malign_double=no | ||
10650 | fi | ||
10651 | - | ||
10652 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10653 | CFLAGS=$ax_save_FLAGS | ||
10654 | fi | ||
10655 | |||
10656 | eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double | ||
10657 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
10658 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
10659 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
10660 | if test "x$ax_check_compiler_flags" = xyes; then | ||
10661 | CFLAGS="$CFLAGS -malign-double" | ||
10662 | @@ -13136,19 +12480,15 @@ | ||
10663 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
10664 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
10665 | |||
10666 | -{ $as_echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5 | ||
10667 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5 | ||
10668 | $as_echo_n "checking for x86 cpuid 0 output... " >&6; } | ||
10669 | -if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then | ||
10670 | +if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then : | ||
10671 | $as_echo_n "(cached) " >&6 | ||
10672 | else | ||
10673 | - if test "$cross_compiling" = yes; then | ||
10674 | + if test "$cross_compiling" = yes; then : | ||
10675 | ax_cv_gcc_x86_cpuid_0=unknown | ||
10676 | else | ||
10677 | - cat >conftest.$ac_ext <<_ACEOF | ||
10678 | -/* confdefs.h. */ | ||
10679 | -_ACEOF | ||
10680 | -cat confdefs.h >>conftest.$ac_ext | ||
10681 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10682 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10683 | /* end confdefs.h. */ | ||
10684 | #include <stdio.h> | ||
10685 | int | ||
10686 | @@ -13191,44 +12531,17 @@ | ||
10687 | return 0; | ||
10688 | } | ||
10689 | _ACEOF | ||
10690 | -rm -f conftest$ac_exeext | ||
10691 | -if { (ac_try="$ac_link" | ||
10692 | -case "(($ac_try" in | ||
10693 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10694 | - *) ac_try_echo=$ac_try;; | ||
10695 | -esac | ||
10696 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10697 | -$as_echo "$ac_try_echo") >&5 | ||
10698 | - (eval "$ac_link") 2>&5 | ||
10699 | - ac_status=$? | ||
10700 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10701 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
10702 | - { (case "(($ac_try" in | ||
10703 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10704 | - *) ac_try_echo=$ac_try;; | ||
10705 | -esac | ||
10706 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10707 | -$as_echo "$ac_try_echo") >&5 | ||
10708 | - (eval "$ac_try") 2>&5 | ||
10709 | - ac_status=$? | ||
10710 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10711 | - (exit $ac_status); }; }; then | ||
10712 | +if ac_fn_c_try_run "$LINENO"; then : | ||
10713 | ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid | ||
10714 | else | ||
10715 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
10716 | -$as_echo "$as_me: failed program was:" >&5 | ||
10717 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10718 | - | ||
10719 | -( exit $ac_status ) | ||
10720 | -ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid | ||
10721 | + ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid | ||
10722 | fi | ||
10723 | -rm -rf conftest.dSYM | ||
10724 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
10725 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
10726 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
10727 | fi | ||
10728 | |||
10729 | - | ||
10730 | fi | ||
10731 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5 | ||
10732 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0" >&5 | ||
10733 | $as_echo "$ax_cv_gcc_x86_cpuid_0" >&6; } | ||
10734 | ac_ext=c | ||
10735 | ac_cpp='$CPP $CPPFLAGS' | ||
10736 | @@ -13244,19 +12557,15 @@ | ||
10737 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
10738 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
10739 | |||
10740 | -{ $as_echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5 | ||
10741 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5 | ||
10742 | $as_echo_n "checking for x86 cpuid 1 output... " >&6; } | ||
10743 | -if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then | ||
10744 | +if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then : | ||
10745 | $as_echo_n "(cached) " >&6 | ||
10746 | else | ||
10747 | - if test "$cross_compiling" = yes; then | ||
10748 | + if test "$cross_compiling" = yes; then : | ||
10749 | ax_cv_gcc_x86_cpuid_1=unknown | ||
10750 | else | ||
10751 | - cat >conftest.$ac_ext <<_ACEOF | ||
10752 | -/* confdefs.h. */ | ||
10753 | -_ACEOF | ||
10754 | -cat confdefs.h >>conftest.$ac_ext | ||
10755 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10756 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10757 | /* end confdefs.h. */ | ||
10758 | #include <stdio.h> | ||
10759 | int | ||
10760 | @@ -13299,44 +12608,17 @@ | ||
10761 | return 0; | ||
10762 | } | ||
10763 | _ACEOF | ||
10764 | -rm -f conftest$ac_exeext | ||
10765 | -if { (ac_try="$ac_link" | ||
10766 | -case "(($ac_try" in | ||
10767 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10768 | - *) ac_try_echo=$ac_try;; | ||
10769 | -esac | ||
10770 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10771 | -$as_echo "$ac_try_echo") >&5 | ||
10772 | - (eval "$ac_link") 2>&5 | ||
10773 | - ac_status=$? | ||
10774 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10775 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
10776 | - { (case "(($ac_try" in | ||
10777 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10778 | - *) ac_try_echo=$ac_try;; | ||
10779 | -esac | ||
10780 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10781 | -$as_echo "$ac_try_echo") >&5 | ||
10782 | - (eval "$ac_try") 2>&5 | ||
10783 | - ac_status=$? | ||
10784 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10785 | - (exit $ac_status); }; }; then | ||
10786 | +if ac_fn_c_try_run "$LINENO"; then : | ||
10787 | ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid | ||
10788 | else | ||
10789 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
10790 | -$as_echo "$as_me: failed program was:" >&5 | ||
10791 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10792 | - | ||
10793 | -( exit $ac_status ) | ||
10794 | -ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid | ||
10795 | + ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid | ||
10796 | fi | ||
10797 | -rm -rf conftest.dSYM | ||
10798 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
10799 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
10800 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
10801 | fi | ||
10802 | |||
10803 | - | ||
10804 | fi | ||
10805 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5 | ||
10806 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_1" >&5 | ||
10807 | $as_echo "$ax_cv_gcc_x86_cpuid_1" >&6; } | ||
10808 | ac_ext=c | ||
10809 | ac_cpp='$CPP $CPPFLAGS' | ||
10810 | @@ -13358,15 +12640,11 @@ | ||
10811 | icc_flags="-xHost $icc_flags" | ||
10812 | if test "x$icc_flags" != x; then | ||
10813 | for flag in $icc_flags; do | ||
10814 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 | ||
10815 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 | ||
10816 | $as_echo_n "checking whether C compiler accepts $flag... " >&6; } | ||
10817 | ax_save_FLAGS=$CFLAGS | ||
10818 | CFLAGS="$flag" | ||
10819 | - cat >conftest.$ac_ext <<_ACEOF | ||
10820 | -/* confdefs.h. */ | ||
10821 | -_ACEOF | ||
10822 | -cat confdefs.h >>conftest.$ac_ext | ||
10823 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10824 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10825 | /* end confdefs.h. */ | ||
10826 | |||
10827 | int | ||
10828 | @@ -13377,36 +12655,15 @@ | ||
10829 | return 0; | ||
10830 | } | ||
10831 | _ACEOF | ||
10832 | -rm -f conftest.$ac_objext | ||
10833 | -if { (ac_try="$ac_compile" | ||
10834 | -case "(($ac_try" in | ||
10835 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10836 | - *) ac_try_echo=$ac_try;; | ||
10837 | -esac | ||
10838 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10839 | -$as_echo "$ac_try_echo") >&5 | ||
10840 | - (eval "$ac_compile") 2>conftest.er1 | ||
10841 | - ac_status=$? | ||
10842 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10843 | - rm -f conftest.er1 | ||
10844 | - cat conftest.err >&5 | ||
10845 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10846 | - (exit $ac_status); } && { | ||
10847 | - test -z "$ac_c_werror_flag" || | ||
10848 | - test ! -s conftest.err | ||
10849 | - } && test -s conftest.$ac_objext; then | ||
10850 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10851 | eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes | ||
10852 | else | ||
10853 | - $as_echo "$as_me: failed program was:" >&5 | ||
10854 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10855 | - | ||
10856 | - eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no | ||
10857 | + eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no | ||
10858 | fi | ||
10859 | - | ||
10860 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10861 | CFLAGS=$ax_save_FLAGS | ||
10862 | eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh` | ||
10863 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
10864 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
10865 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
10866 | if test "x$ax_check_compiler_flags" = xyes; then | ||
10867 | icc_archflag=$flag; break | ||
10868 | @@ -13416,9 +12673,9 @@ | ||
10869 | |||
10870 | done | ||
10871 | fi | ||
10872 | - { $as_echo "$as_me:$LINENO: checking for icc architecture flag" >&5 | ||
10873 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icc architecture flag" >&5 | ||
10874 | $as_echo_n "checking for icc architecture flag... " >&6; } | ||
10875 | - { $as_echo "$as_me:$LINENO: result: $icc_archflag" >&5 | ||
10876 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icc_archflag" >&5 | ||
10877 | $as_echo "$icc_archflag" >&6; } | ||
10878 | if test "x$icc_archflag" != xunknown; then | ||
10879 | CFLAGS="$CFLAGS $icc_archflag" | ||
10880 | @@ -13431,19 +12688,15 @@ | ||
10881 | CFLAGS="-O3 -fomit-frame-pointer" | ||
10882 | |||
10883 | # -malign-double for x86 systems | ||
10884 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -malign-double" >&5 | ||
10885 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5 | ||
10886 | $as_echo_n "checking whether C compiler accepts -malign-double... " >&6; } | ||
10887 | -if test "${ax_cv_c_flags__malign_double+set}" = set; then | ||
10888 | +if test "${ax_cv_c_flags__malign_double+set}" = set; then : | ||
10889 | $as_echo_n "(cached) " >&6 | ||
10890 | else | ||
10891 | |||
10892 | ax_save_FLAGS=$CFLAGS | ||
10893 | CFLAGS="-malign-double" | ||
10894 | - cat >conftest.$ac_ext <<_ACEOF | ||
10895 | -/* confdefs.h. */ | ||
10896 | -_ACEOF | ||
10897 | -cat confdefs.h >>conftest.$ac_ext | ||
10898 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10899 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10900 | /* end confdefs.h. */ | ||
10901 | |||
10902 | int | ||
10903 | @@ -13454,38 +12707,17 @@ | ||
10904 | return 0; | ||
10905 | } | ||
10906 | _ACEOF | ||
10907 | -rm -f conftest.$ac_objext | ||
10908 | -if { (ac_try="$ac_compile" | ||
10909 | -case "(($ac_try" in | ||
10910 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10911 | - *) ac_try_echo=$ac_try;; | ||
10912 | -esac | ||
10913 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10914 | -$as_echo "$ac_try_echo") >&5 | ||
10915 | - (eval "$ac_compile") 2>conftest.er1 | ||
10916 | - ac_status=$? | ||
10917 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10918 | - rm -f conftest.er1 | ||
10919 | - cat conftest.err >&5 | ||
10920 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10921 | - (exit $ac_status); } && { | ||
10922 | - test -z "$ac_c_werror_flag" || | ||
10923 | - test ! -s conftest.err | ||
10924 | - } && test -s conftest.$ac_objext; then | ||
10925 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10926 | ax_cv_c_flags__malign_double=yes | ||
10927 | else | ||
10928 | - $as_echo "$as_me: failed program was:" >&5 | ||
10929 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10930 | - | ||
10931 | - ax_cv_c_flags__malign_double=no | ||
10932 | + ax_cv_c_flags__malign_double=no | ||
10933 | fi | ||
10934 | - | ||
10935 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10936 | CFLAGS=$ax_save_FLAGS | ||
10937 | fi | ||
10938 | |||
10939 | eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double | ||
10940 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
10941 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
10942 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
10943 | if test "x$ax_check_compiler_flags" = xyes; then | ||
10944 | CFLAGS="$CFLAGS -malign-double" | ||
10945 | @@ -13495,19 +12727,15 @@ | ||
10946 | |||
10947 | |||
10948 | # -fstrict-aliasing for gcc-2.95+ | ||
10949 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fstrict-aliasing" >&5 | ||
10950 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstrict-aliasing" >&5 | ||
10951 | $as_echo_n "checking whether C compiler accepts -fstrict-aliasing... " >&6; } | ||
10952 | -if test "${ax_cv_c_flags__fstrict_aliasing+set}" = set; then | ||
10953 | +if test "${ax_cv_c_flags__fstrict_aliasing+set}" = set; then : | ||
10954 | $as_echo_n "(cached) " >&6 | ||
10955 | else | ||
10956 | |||
10957 | ax_save_FLAGS=$CFLAGS | ||
10958 | CFLAGS="-fstrict-aliasing" | ||
10959 | - cat >conftest.$ac_ext <<_ACEOF | ||
10960 | -/* confdefs.h. */ | ||
10961 | -_ACEOF | ||
10962 | -cat confdefs.h >>conftest.$ac_ext | ||
10963 | -cat >>conftest.$ac_ext <<_ACEOF | ||
10964 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10965 | /* end confdefs.h. */ | ||
10966 | |||
10967 | int | ||
10968 | @@ -13518,38 +12746,17 @@ | ||
10969 | return 0; | ||
10970 | } | ||
10971 | _ACEOF | ||
10972 | -rm -f conftest.$ac_objext | ||
10973 | -if { (ac_try="$ac_compile" | ||
10974 | -case "(($ac_try" in | ||
10975 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10976 | - *) ac_try_echo=$ac_try;; | ||
10977 | -esac | ||
10978 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
10979 | -$as_echo "$ac_try_echo") >&5 | ||
10980 | - (eval "$ac_compile") 2>conftest.er1 | ||
10981 | - ac_status=$? | ||
10982 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
10983 | - rm -f conftest.er1 | ||
10984 | - cat conftest.err >&5 | ||
10985 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10986 | - (exit $ac_status); } && { | ||
10987 | - test -z "$ac_c_werror_flag" || | ||
10988 | - test ! -s conftest.err | ||
10989 | - } && test -s conftest.$ac_objext; then | ||
10990 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
10991 | ax_cv_c_flags__fstrict_aliasing=yes | ||
10992 | else | ||
10993 | - $as_echo "$as_me: failed program was:" >&5 | ||
10994 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
10995 | - | ||
10996 | - ax_cv_c_flags__fstrict_aliasing=no | ||
10997 | + ax_cv_c_flags__fstrict_aliasing=no | ||
10998 | fi | ||
10999 | - | ||
11000 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11001 | CFLAGS=$ax_save_FLAGS | ||
11002 | fi | ||
11003 | |||
11004 | eval ax_check_compiler_flags=$ax_cv_c_flags__fstrict_aliasing | ||
11005 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11006 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11007 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11008 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11009 | CFLAGS="$CFLAGS -fstrict-aliasing" | ||
11010 | @@ -13559,19 +12766,15 @@ | ||
11011 | |||
11012 | |||
11013 | # note that we enable "unsafe" fp optimization with other compilers, too | ||
11014 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -ffast-math" >&5 | ||
11015 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffast-math" >&5 | ||
11016 | $as_echo_n "checking whether C compiler accepts -ffast-math... " >&6; } | ||
11017 | -if test "${ax_cv_c_flags__ffast_math+set}" = set; then | ||
11018 | +if test "${ax_cv_c_flags__ffast_math+set}" = set; then : | ||
11019 | $as_echo_n "(cached) " >&6 | ||
11020 | else | ||
11021 | |||
11022 | ax_save_FLAGS=$CFLAGS | ||
11023 | CFLAGS="-ffast-math" | ||
11024 | - cat >conftest.$ac_ext <<_ACEOF | ||
11025 | -/* confdefs.h. */ | ||
11026 | -_ACEOF | ||
11027 | -cat confdefs.h >>conftest.$ac_ext | ||
11028 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11029 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11030 | /* end confdefs.h. */ | ||
11031 | |||
11032 | int | ||
11033 | @@ -13582,38 +12785,17 @@ | ||
11034 | return 0; | ||
11035 | } | ||
11036 | _ACEOF | ||
11037 | -rm -f conftest.$ac_objext | ||
11038 | -if { (ac_try="$ac_compile" | ||
11039 | -case "(($ac_try" in | ||
11040 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11041 | - *) ac_try_echo=$ac_try;; | ||
11042 | -esac | ||
11043 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11044 | -$as_echo "$ac_try_echo") >&5 | ||
11045 | - (eval "$ac_compile") 2>conftest.er1 | ||
11046 | - ac_status=$? | ||
11047 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11048 | - rm -f conftest.er1 | ||
11049 | - cat conftest.err >&5 | ||
11050 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11051 | - (exit $ac_status); } && { | ||
11052 | - test -z "$ac_c_werror_flag" || | ||
11053 | - test ! -s conftest.err | ||
11054 | - } && test -s conftest.$ac_objext; then | ||
11055 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11056 | ax_cv_c_flags__ffast_math=yes | ||
11057 | else | ||
11058 | - $as_echo "$as_me: failed program was:" >&5 | ||
11059 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11060 | - | ||
11061 | - ax_cv_c_flags__ffast_math=no | ||
11062 | + ax_cv_c_flags__ffast_math=no | ||
11063 | fi | ||
11064 | - | ||
11065 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11066 | CFLAGS=$ax_save_FLAGS | ||
11067 | fi | ||
11068 | |||
11069 | eval ax_check_compiler_flags=$ax_cv_c_flags__ffast_math | ||
11070 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11071 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11072 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11073 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11074 | CFLAGS="$CFLAGS -ffast-math" | ||
11075 | @@ -13627,18 +12809,18 @@ | ||
11076 | |||
11077 | |||
11078 | # Check whether --with-gcc-arch was given. | ||
11079 | -if test "${with_gcc_arch+set}" = set; then | ||
11080 | +if test "${with_gcc_arch+set}" = set; then : | ||
11081 | withval=$with_gcc_arch; ax_gcc_arch=$withval | ||
11082 | else | ||
11083 | ax_gcc_arch=yes | ||
11084 | fi | ||
11085 | |||
11086 | |||
11087 | -{ $as_echo "$as_me:$LINENO: checking for gcc architecture flag" >&5 | ||
11088 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc architecture flag" >&5 | ||
11089 | $as_echo_n "checking for gcc architecture flag... " >&6; } | ||
11090 | -{ $as_echo "$as_me:$LINENO: result: " >&5 | ||
11091 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 | ||
11092 | $as_echo "" >&6; } | ||
11093 | -if test "${ax_cv_gcc_archflag+set}" = set; then | ||
11094 | +if test "${ax_cv_gcc_archflag+set}" = set; then : | ||
11095 | $as_echo_n "(cached) " >&6 | ||
11096 | else | ||
11097 | |||
11098 | @@ -13658,19 +12840,15 @@ | ||
11099 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
11100 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
11101 | |||
11102 | -{ $as_echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5 | ||
11103 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5 | ||
11104 | $as_echo_n "checking for x86 cpuid 0 output... " >&6; } | ||
11105 | -if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then | ||
11106 | +if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then : | ||
11107 | $as_echo_n "(cached) " >&6 | ||
11108 | else | ||
11109 | - if test "$cross_compiling" = yes; then | ||
11110 | + if test "$cross_compiling" = yes; then : | ||
11111 | ax_cv_gcc_x86_cpuid_0=unknown | ||
11112 | else | ||
11113 | - cat >conftest.$ac_ext <<_ACEOF | ||
11114 | -/* confdefs.h. */ | ||
11115 | -_ACEOF | ||
11116 | -cat confdefs.h >>conftest.$ac_ext | ||
11117 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11118 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11119 | /* end confdefs.h. */ | ||
11120 | #include <stdio.h> | ||
11121 | int | ||
11122 | @@ -13713,44 +12891,17 @@ | ||
11123 | return 0; | ||
11124 | } | ||
11125 | _ACEOF | ||
11126 | -rm -f conftest$ac_exeext | ||
11127 | -if { (ac_try="$ac_link" | ||
11128 | -case "(($ac_try" in | ||
11129 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11130 | - *) ac_try_echo=$ac_try;; | ||
11131 | -esac | ||
11132 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11133 | -$as_echo "$ac_try_echo") >&5 | ||
11134 | - (eval "$ac_link") 2>&5 | ||
11135 | - ac_status=$? | ||
11136 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11137 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
11138 | - { (case "(($ac_try" in | ||
11139 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11140 | - *) ac_try_echo=$ac_try;; | ||
11141 | -esac | ||
11142 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11143 | -$as_echo "$ac_try_echo") >&5 | ||
11144 | - (eval "$ac_try") 2>&5 | ||
11145 | - ac_status=$? | ||
11146 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11147 | - (exit $ac_status); }; }; then | ||
11148 | +if ac_fn_c_try_run "$LINENO"; then : | ||
11149 | ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid | ||
11150 | else | ||
11151 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
11152 | -$as_echo "$as_me: failed program was:" >&5 | ||
11153 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11154 | - | ||
11155 | -( exit $ac_status ) | ||
11156 | -ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid | ||
11157 | + ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid | ||
11158 | fi | ||
11159 | -rm -rf conftest.dSYM | ||
11160 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
11161 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
11162 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
11163 | fi | ||
11164 | |||
11165 | - | ||
11166 | fi | ||
11167 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5 | ||
11168 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0" >&5 | ||
11169 | $as_echo "$ax_cv_gcc_x86_cpuid_0" >&6; } | ||
11170 | ac_ext=c | ||
11171 | ac_cpp='$CPP $CPPFLAGS' | ||
11172 | @@ -13766,19 +12917,15 @@ | ||
11173 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
11174 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
11175 | |||
11176 | -{ $as_echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5 | ||
11177 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5 | ||
11178 | $as_echo_n "checking for x86 cpuid 1 output... " >&6; } | ||
11179 | -if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then | ||
11180 | +if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then : | ||
11181 | $as_echo_n "(cached) " >&6 | ||
11182 | else | ||
11183 | - if test "$cross_compiling" = yes; then | ||
11184 | + if test "$cross_compiling" = yes; then : | ||
11185 | ax_cv_gcc_x86_cpuid_1=unknown | ||
11186 | else | ||
11187 | - cat >conftest.$ac_ext <<_ACEOF | ||
11188 | -/* confdefs.h. */ | ||
11189 | -_ACEOF | ||
11190 | -cat confdefs.h >>conftest.$ac_ext | ||
11191 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11192 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11193 | /* end confdefs.h. */ | ||
11194 | #include <stdio.h> | ||
11195 | int | ||
11196 | @@ -13821,44 +12968,17 @@ | ||
11197 | return 0; | ||
11198 | } | ||
11199 | _ACEOF | ||
11200 | -rm -f conftest$ac_exeext | ||
11201 | -if { (ac_try="$ac_link" | ||
11202 | -case "(($ac_try" in | ||
11203 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11204 | - *) ac_try_echo=$ac_try;; | ||
11205 | -esac | ||
11206 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11207 | -$as_echo "$ac_try_echo") >&5 | ||
11208 | - (eval "$ac_link") 2>&5 | ||
11209 | - ac_status=$? | ||
11210 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11211 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
11212 | - { (case "(($ac_try" in | ||
11213 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11214 | - *) ac_try_echo=$ac_try;; | ||
11215 | -esac | ||
11216 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11217 | -$as_echo "$ac_try_echo") >&5 | ||
11218 | - (eval "$ac_try") 2>&5 | ||
11219 | - ac_status=$? | ||
11220 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11221 | - (exit $ac_status); }; }; then | ||
11222 | +if ac_fn_c_try_run "$LINENO"; then : | ||
11223 | ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid | ||
11224 | else | ||
11225 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
11226 | -$as_echo "$as_me: failed program was:" >&5 | ||
11227 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11228 | - | ||
11229 | -( exit $ac_status ) | ||
11230 | -ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid | ||
11231 | + ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid | ||
11232 | fi | ||
11233 | -rm -rf conftest.dSYM | ||
11234 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
11235 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
11236 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
11237 | fi | ||
11238 | |||
11239 | - | ||
11240 | fi | ||
11241 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5 | ||
11242 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_1" >&5 | ||
11243 | $as_echo "$ax_cv_gcc_x86_cpuid_1" >&6; } | ||
11244 | ac_ext=c | ||
11245 | ac_cpp='$CPP $CPPFLAGS' | ||
11246 | @@ -13904,19 +13024,15 @@ | ||
11247 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
11248 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
11249 | |||
11250 | -{ $as_echo "$as_me:$LINENO: checking for x86 cpuid 0x80000006 output" >&5 | ||
11251 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0x80000006 output" >&5 | ||
11252 | $as_echo_n "checking for x86 cpuid 0x80000006 output... " >&6; } | ||
11253 | -if test "${ax_cv_gcc_x86_cpuid_0x80000006+set}" = set; then | ||
11254 | +if test "${ax_cv_gcc_x86_cpuid_0x80000006+set}" = set; then : | ||
11255 | $as_echo_n "(cached) " >&6 | ||
11256 | else | ||
11257 | - if test "$cross_compiling" = yes; then | ||
11258 | + if test "$cross_compiling" = yes; then : | ||
11259 | ax_cv_gcc_x86_cpuid_0x80000006=unknown | ||
11260 | else | ||
11261 | - cat >conftest.$ac_ext <<_ACEOF | ||
11262 | -/* confdefs.h. */ | ||
11263 | -_ACEOF | ||
11264 | -cat confdefs.h >>conftest.$ac_ext | ||
11265 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11266 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11267 | /* end confdefs.h. */ | ||
11268 | #include <stdio.h> | ||
11269 | int | ||
11270 | @@ -13959,44 +13075,17 @@ | ||
11271 | return 0; | ||
11272 | } | ||
11273 | _ACEOF | ||
11274 | -rm -f conftest$ac_exeext | ||
11275 | -if { (ac_try="$ac_link" | ||
11276 | -case "(($ac_try" in | ||
11277 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11278 | - *) ac_try_echo=$ac_try;; | ||
11279 | -esac | ||
11280 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11281 | -$as_echo "$ac_try_echo") >&5 | ||
11282 | - (eval "$ac_link") 2>&5 | ||
11283 | - ac_status=$? | ||
11284 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11285 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
11286 | - { (case "(($ac_try" in | ||
11287 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11288 | - *) ac_try_echo=$ac_try;; | ||
11289 | -esac | ||
11290 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11291 | -$as_echo "$ac_try_echo") >&5 | ||
11292 | - (eval "$ac_try") 2>&5 | ||
11293 | - ac_status=$? | ||
11294 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11295 | - (exit $ac_status); }; }; then | ||
11296 | +if ac_fn_c_try_run "$LINENO"; then : | ||
11297 | ax_cv_gcc_x86_cpuid_0x80000006=`cat conftest_cpuid`; rm -f conftest_cpuid | ||
11298 | else | ||
11299 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
11300 | -$as_echo "$as_me: failed program was:" >&5 | ||
11301 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11302 | - | ||
11303 | -( exit $ac_status ) | ||
11304 | -ax_cv_gcc_x86_cpuid_0x80000006=unknown; rm -f conftest_cpuid | ||
11305 | + ax_cv_gcc_x86_cpuid_0x80000006=unknown; rm -f conftest_cpuid | ||
11306 | fi | ||
11307 | -rm -rf conftest.dSYM | ||
11308 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
11309 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
11310 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
11311 | fi | ||
11312 | |||
11313 | - | ||
11314 | fi | ||
11315 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0x80000006" >&5 | ||
11316 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0x80000006" >&5 | ||
11317 | $as_echo "$ax_cv_gcc_x86_cpuid_0x80000006" >&6; } | ||
11318 | ac_ext=c | ||
11319 | ac_cpp='$CPP $CPPFLAGS' | ||
11320 | @@ -14035,9 +13124,9 @@ | ||
11321 | sparc*) | ||
11322 | # Extract the first word of "prtdiag", so it can be a program name with args. | ||
11323 | set dummy prtdiag; ac_word=$2 | ||
11324 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11325 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
11326 | $as_echo_n "checking for $ac_word... " >&6; } | ||
11327 | -if test "${ac_cv_path_PRTDIAG+set}" = set; then | ||
11328 | +if test "${ac_cv_path_PRTDIAG+set}" = set; then : | ||
11329 | $as_echo_n "(cached) " >&6 | ||
11330 | else | ||
11331 | case $PRTDIAG in | ||
11332 | @@ -14051,14 +13140,14 @@ | ||
11333 | do | ||
11334 | IFS=$as_save_IFS | ||
11335 | test -z "$as_dir" && as_dir=. | ||
11336 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
11337 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
11338 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11339 | ac_cv_path_PRTDIAG="$as_dir/$ac_word$ac_exec_ext" | ||
11340 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11341 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11342 | break 2 | ||
11343 | fi | ||
11344 | done | ||
11345 | -done | ||
11346 | + done | ||
11347 | IFS=$as_save_IFS | ||
11348 | |||
11349 | test -z "$ac_cv_path_PRTDIAG" && ac_cv_path_PRTDIAG="prtdiag" | ||
11350 | @@ -14067,10 +13156,10 @@ | ||
11351 | fi | ||
11352 | PRTDIAG=$ac_cv_path_PRTDIAG | ||
11353 | if test -n "$PRTDIAG"; then | ||
11354 | - { $as_echo "$as_me:$LINENO: result: $PRTDIAG" >&5 | ||
11355 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRTDIAG" >&5 | ||
11356 | $as_echo "$PRTDIAG" >&6; } | ||
11357 | else | ||
11358 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
11359 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
11360 | $as_echo "no" >&6; } | ||
11361 | fi | ||
11362 | |||
11363 | @@ -14129,15 +13218,11 @@ | ||
11364 | flags="-march=$arch -mcpu=$arch -m$arch" | ||
11365 | fi | ||
11366 | for flag in $flags; do | ||
11367 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 | ||
11368 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 | ||
11369 | $as_echo_n "checking whether C compiler accepts $flag... " >&6; } | ||
11370 | ax_save_FLAGS=$CFLAGS | ||
11371 | CFLAGS="$flag" | ||
11372 | - cat >conftest.$ac_ext <<_ACEOF | ||
11373 | -/* confdefs.h. */ | ||
11374 | -_ACEOF | ||
11375 | -cat confdefs.h >>conftest.$ac_ext | ||
11376 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11377 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11378 | /* end confdefs.h. */ | ||
11379 | |||
11380 | int | ||
11381 | @@ -14148,36 +13233,15 @@ | ||
11382 | return 0; | ||
11383 | } | ||
11384 | _ACEOF | ||
11385 | -rm -f conftest.$ac_objext | ||
11386 | -if { (ac_try="$ac_compile" | ||
11387 | -case "(($ac_try" in | ||
11388 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11389 | - *) ac_try_echo=$ac_try;; | ||
11390 | -esac | ||
11391 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11392 | -$as_echo "$ac_try_echo") >&5 | ||
11393 | - (eval "$ac_compile") 2>conftest.er1 | ||
11394 | - ac_status=$? | ||
11395 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11396 | - rm -f conftest.er1 | ||
11397 | - cat conftest.err >&5 | ||
11398 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11399 | - (exit $ac_status); } && { | ||
11400 | - test -z "$ac_c_werror_flag" || | ||
11401 | - test ! -s conftest.err | ||
11402 | - } && test -s conftest.$ac_objext; then | ||
11403 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11404 | eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes | ||
11405 | else | ||
11406 | - $as_echo "$as_me: failed program was:" >&5 | ||
11407 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11408 | - | ||
11409 | - eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no | ||
11410 | + eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no | ||
11411 | fi | ||
11412 | - | ||
11413 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11414 | CFLAGS=$ax_save_FLAGS | ||
11415 | eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh` | ||
11416 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11417 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11418 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11419 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11420 | ax_cv_gcc_archflag=$flag; break | ||
11421 | @@ -14194,9 +13258,9 @@ | ||
11422 | |||
11423 | fi | ||
11424 | |||
11425 | -{ $as_echo "$as_me:$LINENO: checking for gcc architecture flag" >&5 | ||
11426 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc architecture flag" >&5 | ||
11427 | $as_echo_n "checking for gcc architecture flag... " >&6; } | ||
11428 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_archflag" >&5 | ||
11429 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_archflag" >&5 | ||
11430 | $as_echo "$ax_cv_gcc_archflag" >&6; } | ||
11431 | if test "x$ax_cv_gcc_archflag" = xunknown; then | ||
11432 | : | ||
11433 | @@ -14218,15 +13282,11 @@ | ||
11434 | CFLAGS="-O3" | ||
11435 | fi | ||
11436 | |||
11437 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts $CFLAGS" >&5 | ||
11438 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CFLAGS" >&5 | ||
11439 | $as_echo_n "checking whether C compiler accepts $CFLAGS... " >&6; } | ||
11440 | ax_save_FLAGS=$CFLAGS | ||
11441 | CFLAGS="$CFLAGS" | ||
11442 | - cat >conftest.$ac_ext <<_ACEOF | ||
11443 | -/* confdefs.h. */ | ||
11444 | -_ACEOF | ||
11445 | -cat confdefs.h >>conftest.$ac_ext | ||
11446 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11447 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11448 | /* end confdefs.h. */ | ||
11449 | |||
11450 | int | ||
11451 | @@ -14237,36 +13297,15 @@ | ||
11452 | return 0; | ||
11453 | } | ||
11454 | _ACEOF | ||
11455 | -rm -f conftest.$ac_objext | ||
11456 | -if { (ac_try="$ac_compile" | ||
11457 | -case "(($ac_try" in | ||
11458 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11459 | - *) ac_try_echo=$ac_try;; | ||
11460 | -esac | ||
11461 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11462 | -$as_echo "$ac_try_echo") >&5 | ||
11463 | - (eval "$ac_compile") 2>conftest.er1 | ||
11464 | - ac_status=$? | ||
11465 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11466 | - rm -f conftest.er1 | ||
11467 | - cat conftest.err >&5 | ||
11468 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11469 | - (exit $ac_status); } && { | ||
11470 | - test -z "$ac_c_werror_flag" || | ||
11471 | - test ! -s conftest.err | ||
11472 | - } && test -s conftest.$ac_objext; then | ||
11473 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11474 | eval `$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=yes | ||
11475 | else | ||
11476 | - $as_echo "$as_me: failed program was:" >&5 | ||
11477 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11478 | - | ||
11479 | - eval `$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=no | ||
11480 | + eval `$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=no | ||
11481 | fi | ||
11482 | - | ||
11483 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11484 | CFLAGS=$ax_save_FLAGS | ||
11485 | eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh` | ||
11486 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11487 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11488 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11489 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11490 | : | ||
11491 | @@ -14289,6 +13328,114 @@ | ||
11492 | |||
11493 | # some additional FFTW-specific tweaks to the flags | ||
11494 | if test "$ac_test_CFLAGS" != "set"; then # if user didn't override CFLAGS | ||
11495 | + | ||
11496 | + if test "$have_neon" = "yes"; then | ||
11497 | + | ||
11498 | + case "${ax_cv_c_compiler_vendor}" in | ||
11499 | + gnu) | ||
11500 | + if test "x$ARM_CPU_TYPE" = x; then | ||
11501 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -march=armv7 -mfpu=neon" >&5 | ||
11502 | +$as_echo_n "checking whether C compiler accepts -march=armv7 -mfpu=neon... " >&6; } | ||
11503 | +ax_save_FLAGS=$CFLAGS | ||
11504 | + CFLAGS="-march=armv7 -mfpu=neon" | ||
11505 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11506 | +/* end confdefs.h. */ | ||
11507 | + | ||
11508 | +int | ||
11509 | +main () | ||
11510 | +{ | ||
11511 | + | ||
11512 | + ; | ||
11513 | + return 0; | ||
11514 | +} | ||
11515 | +_ACEOF | ||
11516 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11517 | + eval `$as_echo "ax_cv_c_flags_-march=armv7 -mfpu=neon" | $as_tr_sh`=yes | ||
11518 | +else | ||
11519 | + eval `$as_echo "ax_cv_c_flags_-march=armv7 -mfpu=neon" | $as_tr_sh`=no | ||
11520 | +fi | ||
11521 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11522 | + CFLAGS=$ax_save_FLAGS | ||
11523 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_-march=armv7 -mfpu=neon" | $as_tr_sh` | ||
11524 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11525 | +$as_echo "$ax_check_compiler_flags" >&6; } | ||
11526 | +if test "x$ax_check_compiler_flags" = xyes; then | ||
11527 | + CFLAGS="$CFLAGS -march=armv7 -mfpu=neon" | ||
11528 | +else | ||
11529 | + as_fn_error $? "Need a compiler with support for -march=armv7 -mfpu=neon" "$LINENO" 5 | ||
11530 | +fi | ||
11531 | + | ||
11532 | + else | ||
11533 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mcpu=$ARM_CPU_TYPE -mfpu=neon" >&5 | ||
11534 | +$as_echo_n "checking whether C compiler accepts -mcpu=$ARM_CPU_TYPE -mfpu=neon... " >&6; } | ||
11535 | +ax_save_FLAGS=$CFLAGS | ||
11536 | + CFLAGS="-mcpu=$ARM_CPU_TYPE -mfpu=neon" | ||
11537 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11538 | +/* end confdefs.h. */ | ||
11539 | + | ||
11540 | +int | ||
11541 | +main () | ||
11542 | +{ | ||
11543 | + | ||
11544 | + ; | ||
11545 | + return 0; | ||
11546 | +} | ||
11547 | +_ACEOF | ||
11548 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11549 | + eval `$as_echo "ax_cv_c_flags_-mcpu=$ARM_CPU_TYPE -mfpu=neon" | $as_tr_sh`=yes | ||
11550 | +else | ||
11551 | + eval `$as_echo "ax_cv_c_flags_-mcpu=$ARM_CPU_TYPE -mfpu=neon" | $as_tr_sh`=no | ||
11552 | +fi | ||
11553 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11554 | + CFLAGS=$ax_save_FLAGS | ||
11555 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_-mcpu=$ARM_CPU_TYPE -mfpu=neon" | $as_tr_sh` | ||
11556 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11557 | +$as_echo "$ax_check_compiler_flags" >&6; } | ||
11558 | +if test "x$ax_check_compiler_flags" = xyes; then | ||
11559 | + CFLAGS="$CFLAGS -mcpu=$ARM_CPU_TYPE -mfpu=neon" | ||
11560 | +else | ||
11561 | + as_fn_error $? "Need a compiler with support for -mcpu=$ARM_CPU_TYPE -mfpu=neon" "$LINENO" 5 | ||
11562 | +fi | ||
11563 | + | ||
11564 | + fi | ||
11565 | + if test "x$ARM_FLOAT_ABI" != x; then | ||
11566 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mfloat-abi=$ARM_FLOAT_ABI" >&5 | ||
11567 | +$as_echo_n "checking whether C compiler accepts -mfloat-abi=$ARM_FLOAT_ABI... " >&6; } | ||
11568 | +ax_save_FLAGS=$CFLAGS | ||
11569 | + CFLAGS="-mfloat-abi=$ARM_FLOAT_ABI" | ||
11570 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11571 | +/* end confdefs.h. */ | ||
11572 | + | ||
11573 | +int | ||
11574 | +main () | ||
11575 | +{ | ||
11576 | + | ||
11577 | + ; | ||
11578 | + return 0; | ||
11579 | +} | ||
11580 | +_ACEOF | ||
11581 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11582 | + eval `$as_echo "ax_cv_c_flags_-mfloat-abi=$ARM_FLOAT_ABI" | $as_tr_sh`=yes | ||
11583 | +else | ||
11584 | + eval `$as_echo "ax_cv_c_flags_-mfloat-abi=$ARM_FLOAT_ABI" | $as_tr_sh`=no | ||
11585 | +fi | ||
11586 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11587 | + CFLAGS=$ax_save_FLAGS | ||
11588 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_-mfloat-abi=$ARM_FLOAT_ABI" | $as_tr_sh` | ||
11589 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11590 | +$as_echo "$ax_check_compiler_flags" >&6; } | ||
11591 | +if test "x$ax_check_compiler_flags" = xyes; then | ||
11592 | + CFLAGS="$CFLAGS -mfloat-abi=$ARM_FLOAT_ABI" | ||
11593 | +else | ||
11594 | + as_fn_error $? "Need a compiler with support for -mfloat-abi=$ARM_FLOAT_ABI" "$LINENO" 5 | ||
11595 | +fi | ||
11596 | + | ||
11597 | + fi | ||
11598 | + ;; | ||
11599 | + esac | ||
11600 | + | ||
11601 | + fi | ||
11602 | + | ||
11603 | if test "x$CODELET_OPTIM" = x; then | ||
11604 | |||
11605 | case "${ax_cv_c_compiler_vendor}" in | ||
11606 | @@ -14301,19 +13448,15 @@ | ||
11607 | |||
11608 | # disable certain other gcc ``optimizations'' that produce worse | ||
11609 | # codelets | ||
11610 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-schedule-insns" >&5 | ||
11611 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-schedule-insns" >&5 | ||
11612 | $as_echo_n "checking whether C compiler accepts -fno-schedule-insns... " >&6; } | ||
11613 | -if test "${ax_cv_c_flags__fno_schedule_insns+set}" = set; then | ||
11614 | +if test "${ax_cv_c_flags__fno_schedule_insns+set}" = set; then : | ||
11615 | $as_echo_n "(cached) " >&6 | ||
11616 | else | ||
11617 | |||
11618 | ax_save_FLAGS=$CFLAGS | ||
11619 | CFLAGS="-fno-schedule-insns" | ||
11620 | - cat >conftest.$ac_ext <<_ACEOF | ||
11621 | -/* confdefs.h. */ | ||
11622 | -_ACEOF | ||
11623 | -cat confdefs.h >>conftest.$ac_ext | ||
11624 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11625 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11626 | /* end confdefs.h. */ | ||
11627 | |||
11628 | int | ||
11629 | @@ -14324,38 +13467,17 @@ | ||
11630 | return 0; | ||
11631 | } | ||
11632 | _ACEOF | ||
11633 | -rm -f conftest.$ac_objext | ||
11634 | -if { (ac_try="$ac_compile" | ||
11635 | -case "(($ac_try" in | ||
11636 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11637 | - *) ac_try_echo=$ac_try;; | ||
11638 | -esac | ||
11639 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11640 | -$as_echo "$ac_try_echo") >&5 | ||
11641 | - (eval "$ac_compile") 2>conftest.er1 | ||
11642 | - ac_status=$? | ||
11643 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11644 | - rm -f conftest.er1 | ||
11645 | - cat conftest.err >&5 | ||
11646 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11647 | - (exit $ac_status); } && { | ||
11648 | - test -z "$ac_c_werror_flag" || | ||
11649 | - test ! -s conftest.err | ||
11650 | - } && test -s conftest.$ac_objext; then | ||
11651 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11652 | ax_cv_c_flags__fno_schedule_insns=yes | ||
11653 | else | ||
11654 | - $as_echo "$as_me: failed program was:" >&5 | ||
11655 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11656 | - | ||
11657 | - ax_cv_c_flags__fno_schedule_insns=no | ||
11658 | + ax_cv_c_flags__fno_schedule_insns=no | ||
11659 | fi | ||
11660 | - | ||
11661 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11662 | CFLAGS=$ax_save_FLAGS | ||
11663 | fi | ||
11664 | |||
11665 | eval ax_check_compiler_flags=$ax_cv_c_flags__fno_schedule_insns | ||
11666 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11667 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11668 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11669 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11670 | CODELET_OPTIM="$CODELET_OPTIM -fno-schedule-insns" | ||
11671 | @@ -14363,19 +13485,15 @@ | ||
11672 | : | ||
11673 | fi | ||
11674 | |||
11675 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-web" >&5 | ||
11676 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-web" >&5 | ||
11677 | $as_echo_n "checking whether C compiler accepts -fno-web... " >&6; } | ||
11678 | -if test "${ax_cv_c_flags__fno_web+set}" = set; then | ||
11679 | +if test "${ax_cv_c_flags__fno_web+set}" = set; then : | ||
11680 | $as_echo_n "(cached) " >&6 | ||
11681 | else | ||
11682 | |||
11683 | ax_save_FLAGS=$CFLAGS | ||
11684 | CFLAGS="-fno-web" | ||
11685 | - cat >conftest.$ac_ext <<_ACEOF | ||
11686 | -/* confdefs.h. */ | ||
11687 | -_ACEOF | ||
11688 | -cat confdefs.h >>conftest.$ac_ext | ||
11689 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11690 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11691 | /* end confdefs.h. */ | ||
11692 | |||
11693 | int | ||
11694 | @@ -14386,38 +13504,17 @@ | ||
11695 | return 0; | ||
11696 | } | ||
11697 | _ACEOF | ||
11698 | -rm -f conftest.$ac_objext | ||
11699 | -if { (ac_try="$ac_compile" | ||
11700 | -case "(($ac_try" in | ||
11701 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11702 | - *) ac_try_echo=$ac_try;; | ||
11703 | -esac | ||
11704 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11705 | -$as_echo "$ac_try_echo") >&5 | ||
11706 | - (eval "$ac_compile") 2>conftest.er1 | ||
11707 | - ac_status=$? | ||
11708 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11709 | - rm -f conftest.er1 | ||
11710 | - cat conftest.err >&5 | ||
11711 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11712 | - (exit $ac_status); } && { | ||
11713 | - test -z "$ac_c_werror_flag" || | ||
11714 | - test ! -s conftest.err | ||
11715 | - } && test -s conftest.$ac_objext; then | ||
11716 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11717 | ax_cv_c_flags__fno_web=yes | ||
11718 | else | ||
11719 | - $as_echo "$as_me: failed program was:" >&5 | ||
11720 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11721 | - | ||
11722 | - ax_cv_c_flags__fno_web=no | ||
11723 | + ax_cv_c_flags__fno_web=no | ||
11724 | fi | ||
11725 | - | ||
11726 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11727 | CFLAGS=$ax_save_FLAGS | ||
11728 | fi | ||
11729 | |||
11730 | eval ax_check_compiler_flags=$ax_cv_c_flags__fno_web | ||
11731 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11732 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11733 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11734 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11735 | CODELET_OPTIM="$CODELET_OPTIM -fno-web" | ||
11736 | @@ -14425,19 +13522,15 @@ | ||
11737 | : | ||
11738 | fi | ||
11739 | |||
11740 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-loop-optimize" >&5 | ||
11741 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-loop-optimize" >&5 | ||
11742 | $as_echo_n "checking whether C compiler accepts -fno-loop-optimize... " >&6; } | ||
11743 | -if test "${ax_cv_c_flags__fno_loop_optimize+set}" = set; then | ||
11744 | +if test "${ax_cv_c_flags__fno_loop_optimize+set}" = set; then : | ||
11745 | $as_echo_n "(cached) " >&6 | ||
11746 | else | ||
11747 | |||
11748 | ax_save_FLAGS=$CFLAGS | ||
11749 | CFLAGS="-fno-loop-optimize" | ||
11750 | - cat >conftest.$ac_ext <<_ACEOF | ||
11751 | -/* confdefs.h. */ | ||
11752 | -_ACEOF | ||
11753 | -cat confdefs.h >>conftest.$ac_ext | ||
11754 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11755 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11756 | /* end confdefs.h. */ | ||
11757 | |||
11758 | int | ||
11759 | @@ -14448,38 +13541,17 @@ | ||
11760 | return 0; | ||
11761 | } | ||
11762 | _ACEOF | ||
11763 | -rm -f conftest.$ac_objext | ||
11764 | -if { (ac_try="$ac_compile" | ||
11765 | -case "(($ac_try" in | ||
11766 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11767 | - *) ac_try_echo=$ac_try;; | ||
11768 | -esac | ||
11769 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11770 | -$as_echo "$ac_try_echo") >&5 | ||
11771 | - (eval "$ac_compile") 2>conftest.er1 | ||
11772 | - ac_status=$? | ||
11773 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11774 | - rm -f conftest.er1 | ||
11775 | - cat conftest.err >&5 | ||
11776 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11777 | - (exit $ac_status); } && { | ||
11778 | - test -z "$ac_c_werror_flag" || | ||
11779 | - test ! -s conftest.err | ||
11780 | - } && test -s conftest.$ac_objext; then | ||
11781 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11782 | ax_cv_c_flags__fno_loop_optimize=yes | ||
11783 | else | ||
11784 | - $as_echo "$as_me: failed program was:" >&5 | ||
11785 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11786 | - | ||
11787 | - ax_cv_c_flags__fno_loop_optimize=no | ||
11788 | + ax_cv_c_flags__fno_loop_optimize=no | ||
11789 | fi | ||
11790 | - | ||
11791 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11792 | CFLAGS=$ax_save_FLAGS | ||
11793 | fi | ||
11794 | |||
11795 | eval ax_check_compiler_flags=$ax_cv_c_flags__fno_loop_optimize | ||
11796 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11797 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11798 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11799 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11800 | CODELET_OPTIM="$CODELET_OPTIM -fno-loop-optimize" | ||
11801 | @@ -14490,19 +13562,11 @@ | ||
11802 | |||
11803 | # The gcc-3.4 inliner is totally broken; it does not inline | ||
11804 | # small functions like VFMAI. | ||
11805 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts --param inline-unit-growth=1000" >&5 | ||
11806 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts --param inline-unit-growth=1000" >&5 | ||
11807 | $as_echo_n "checking whether C compiler accepts --param inline-unit-growth=1000... " >&6; } | ||
11808 | -if test "${ax_cv_c_flags___param_inline_unit_growth_1000+set}" = set; then | ||
11809 | - $as_echo_n "(cached) " >&6 | ||
11810 | -else | ||
11811 | - | ||
11812 | - ax_save_FLAGS=$CFLAGS | ||
11813 | - CFLAGS="--param inline-unit-growth=1000" | ||
11814 | - cat >conftest.$ac_ext <<_ACEOF | ||
11815 | -/* confdefs.h. */ | ||
11816 | -_ACEOF | ||
11817 | -cat confdefs.h >>conftest.$ac_ext | ||
11818 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11819 | +ax_save_FLAGS=$CFLAGS | ||
11820 | + CFLAGS="--param inline-unit-growth=1000" | ||
11821 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11822 | /* end confdefs.h. */ | ||
11823 | |||
11824 | int | ||
11825 | @@ -14513,38 +13577,15 @@ | ||
11826 | return 0; | ||
11827 | } | ||
11828 | _ACEOF | ||
11829 | -rm -f conftest.$ac_objext | ||
11830 | -if { (ac_try="$ac_compile" | ||
11831 | -case "(($ac_try" in | ||
11832 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11833 | - *) ac_try_echo=$ac_try;; | ||
11834 | -esac | ||
11835 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11836 | -$as_echo "$ac_try_echo") >&5 | ||
11837 | - (eval "$ac_compile") 2>conftest.er1 | ||
11838 | - ac_status=$? | ||
11839 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11840 | - rm -f conftest.er1 | ||
11841 | - cat conftest.err >&5 | ||
11842 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11843 | - (exit $ac_status); } && { | ||
11844 | - test -z "$ac_c_werror_flag" || | ||
11845 | - test ! -s conftest.err | ||
11846 | - } && test -s conftest.$ac_objext; then | ||
11847 | - ax_cv_c_flags___param_inline_unit_growth_1000=yes | ||
11848 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11849 | + eval `$as_echo "ax_cv_c_flags_--param inline-unit-growth=1000" | $as_tr_sh`=yes | ||
11850 | else | ||
11851 | - $as_echo "$as_me: failed program was:" >&5 | ||
11852 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11853 | - | ||
11854 | - ax_cv_c_flags___param_inline_unit_growth_1000=no | ||
11855 | + eval `$as_echo "ax_cv_c_flags_--param inline-unit-growth=1000" | $as_tr_sh`=no | ||
11856 | fi | ||
11857 | - | ||
11858 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11859 | - CFLAGS=$ax_save_FLAGS | ||
11860 | -fi | ||
11861 | - | ||
11862 | -eval ax_check_compiler_flags=$ax_cv_c_flags___param_inline_unit_growth_1000 | ||
11863 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11864 | + CFLAGS=$ax_save_FLAGS | ||
11865 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_--param inline-unit-growth=1000" | $as_tr_sh` | ||
11866 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11867 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11868 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11869 | CODELET_OPTIM="$CODELET_OPTIM --param inline-unit-growth=1000" | ||
11870 | @@ -14552,19 +13593,11 @@ | ||
11871 | : | ||
11872 | fi | ||
11873 | |||
11874 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts --param large-function-growth=1000" >&5 | ||
11875 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts --param large-function-growth=1000" >&5 | ||
11876 | $as_echo_n "checking whether C compiler accepts --param large-function-growth=1000... " >&6; } | ||
11877 | -if test "${ax_cv_c_flags___param_large_function_growth_1000+set}" = set; then | ||
11878 | - $as_echo_n "(cached) " >&6 | ||
11879 | -else | ||
11880 | - | ||
11881 | - ax_save_FLAGS=$CFLAGS | ||
11882 | - CFLAGS="--param large-function-growth=1000" | ||
11883 | - cat >conftest.$ac_ext <<_ACEOF | ||
11884 | -/* confdefs.h. */ | ||
11885 | -_ACEOF | ||
11886 | -cat confdefs.h >>conftest.$ac_ext | ||
11887 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11888 | +ax_save_FLAGS=$CFLAGS | ||
11889 | + CFLAGS="--param large-function-growth=1000" | ||
11890 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11891 | /* end confdefs.h. */ | ||
11892 | |||
11893 | int | ||
11894 | @@ -14575,38 +13608,15 @@ | ||
11895 | return 0; | ||
11896 | } | ||
11897 | _ACEOF | ||
11898 | -rm -f conftest.$ac_objext | ||
11899 | -if { (ac_try="$ac_compile" | ||
11900 | -case "(($ac_try" in | ||
11901 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11902 | - *) ac_try_echo=$ac_try;; | ||
11903 | -esac | ||
11904 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11905 | -$as_echo "$ac_try_echo") >&5 | ||
11906 | - (eval "$ac_compile") 2>conftest.er1 | ||
11907 | - ac_status=$? | ||
11908 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11909 | - rm -f conftest.er1 | ||
11910 | - cat conftest.err >&5 | ||
11911 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11912 | - (exit $ac_status); } && { | ||
11913 | - test -z "$ac_c_werror_flag" || | ||
11914 | - test ! -s conftest.err | ||
11915 | - } && test -s conftest.$ac_objext; then | ||
11916 | - ax_cv_c_flags___param_large_function_growth_1000=yes | ||
11917 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11918 | + eval `$as_echo "ax_cv_c_flags_--param large-function-growth=1000" | $as_tr_sh`=yes | ||
11919 | else | ||
11920 | - $as_echo "$as_me: failed program was:" >&5 | ||
11921 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11922 | - | ||
11923 | - ax_cv_c_flags___param_large_function_growth_1000=no | ||
11924 | + eval `$as_echo "ax_cv_c_flags_--param large-function-growth=1000" | $as_tr_sh`=no | ||
11925 | fi | ||
11926 | - | ||
11927 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11928 | - CFLAGS=$ax_save_FLAGS | ||
11929 | -fi | ||
11930 | - | ||
11931 | -eval ax_check_compiler_flags=$ax_cv_c_flags___param_large_function_growth_1000 | ||
11932 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
11933 | + CFLAGS=$ax_save_FLAGS | ||
11934 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_--param large-function-growth=1000" | $as_tr_sh` | ||
11935 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
11936 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
11937 | if test "x$ax_check_compiler_flags" = xyes; then | ||
11938 | CODELET_OPTIM="$CODELET_OPTIM --param large-function-growth=1000" | ||
11939 | @@ -14629,19 +13639,15 @@ | ||
11940 | case "${host_os}" in | ||
11941 | *darwin*) ;; # icc -no-gcc fails to compile some system headers | ||
11942 | *) | ||
11943 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -no-gcc" >&5 | ||
11944 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -no-gcc" >&5 | ||
11945 | $as_echo_n "checking whether C compiler accepts -no-gcc... " >&6; } | ||
11946 | -if test "${ax_cv_c_flags__no_gcc+set}" = set; then | ||
11947 | +if test "${ax_cv_c_flags__no_gcc+set}" = set; then : | ||
11948 | $as_echo_n "(cached) " >&6 | ||
11949 | else | ||
11950 | |||
11951 | ax_save_FLAGS=$CFLAGS | ||
11952 | CFLAGS="-no-gcc" | ||
11953 | - cat >conftest.$ac_ext <<_ACEOF | ||
11954 | -/* confdefs.h. */ | ||
11955 | -_ACEOF | ||
11956 | -cat confdefs.h >>conftest.$ac_ext | ||
11957 | -cat >>conftest.$ac_ext <<_ACEOF | ||
11958 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11959 | /* end confdefs.h. */ | ||
11960 | |||
11961 | int | ||
11962 | @@ -14652,38 +13658,17 @@ | ||
11963 | return 0; | ||
11964 | } | ||
11965 | _ACEOF | ||
11966 | -rm -f conftest.$ac_objext | ||
11967 | -if { (ac_try="$ac_compile" | ||
11968 | -case "(($ac_try" in | ||
11969 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11970 | - *) ac_try_echo=$ac_try;; | ||
11971 | -esac | ||
11972 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
11973 | -$as_echo "$ac_try_echo") >&5 | ||
11974 | - (eval "$ac_compile") 2>conftest.er1 | ||
11975 | - ac_status=$? | ||
11976 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11977 | - rm -f conftest.er1 | ||
11978 | - cat conftest.err >&5 | ||
11979 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11980 | - (exit $ac_status); } && { | ||
11981 | - test -z "$ac_c_werror_flag" || | ||
11982 | - test ! -s conftest.err | ||
11983 | - } && test -s conftest.$ac_objext; then | ||
11984 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
11985 | ax_cv_c_flags__no_gcc=yes | ||
11986 | else | ||
11987 | - $as_echo "$as_me: failed program was:" >&5 | ||
11988 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11989 | - | ||
11990 | - ax_cv_c_flags__no_gcc=no | ||
11991 | + ax_cv_c_flags__no_gcc=no | ||
11992 | fi | ||
11993 | - | ||
11994 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11995 | CFLAGS=$ax_save_FLAGS | ||
11996 | fi | ||
11997 | |||
11998 | eval ax_check_compiler_flags=$ax_cv_c_flags__no_gcc | ||
11999 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12000 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12001 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12002 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12003 | CC="$CC -no-gcc" | ||
12004 | @@ -14696,19 +13681,15 @@ | ||
12005 | ;; | ||
12006 | |||
12007 | hp) # must (sometimes) manually increase cpp limits to handle fftw3.h | ||
12008 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -Wp,-H128000" >&5 | ||
12009 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wp,-H128000" >&5 | ||
12010 | $as_echo_n "checking whether C compiler accepts -Wp,-H128000... " >&6; } | ||
12011 | -if test "${ax_cv_c_flags__Wp+set}" = set; then | ||
12012 | +if test "${ax_cv_c_flags__Wp+set}" = set; then : | ||
12013 | $as_echo_n "(cached) " >&6 | ||
12014 | else | ||
12015 | |||
12016 | ax_save_FLAGS=$CFLAGS | ||
12017 | CFLAGS="-Wp,-H128000" | ||
12018 | - cat >conftest.$ac_ext <<_ACEOF | ||
12019 | -/* confdefs.h. */ | ||
12020 | -_ACEOF | ||
12021 | -cat confdefs.h >>conftest.$ac_ext | ||
12022 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12023 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12024 | /* end confdefs.h. */ | ||
12025 | |||
12026 | int | ||
12027 | @@ -14719,38 +13700,17 @@ | ||
12028 | return 0; | ||
12029 | } | ||
12030 | _ACEOF | ||
12031 | -rm -f conftest.$ac_objext | ||
12032 | -if { (ac_try="$ac_compile" | ||
12033 | -case "(($ac_try" in | ||
12034 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12035 | - *) ac_try_echo=$ac_try;; | ||
12036 | -esac | ||
12037 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12038 | -$as_echo "$ac_try_echo") >&5 | ||
12039 | - (eval "$ac_compile") 2>conftest.er1 | ||
12040 | - ac_status=$? | ||
12041 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12042 | - rm -f conftest.er1 | ||
12043 | - cat conftest.err >&5 | ||
12044 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12045 | - (exit $ac_status); } && { | ||
12046 | - test -z "$ac_c_werror_flag" || | ||
12047 | - test ! -s conftest.err | ||
12048 | - } && test -s conftest.$ac_objext; then | ||
12049 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12050 | ax_cv_c_flags__Wp=yes | ||
12051 | else | ||
12052 | - $as_echo "$as_me: failed program was:" >&5 | ||
12053 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12054 | - | ||
12055 | - ax_cv_c_flags__Wp=no | ||
12056 | + ax_cv_c_flags__Wp=no | ||
12057 | fi | ||
12058 | - | ||
12059 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12060 | CFLAGS=$ax_save_FLAGS | ||
12061 | fi | ||
12062 | |||
12063 | eval ax_check_compiler_flags=$ax_cv_c_flags__Wp | ||
12064 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12065 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12066 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12067 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12068 | CC="$CC -Wp,-H128000" | ||
12069 | @@ -14761,19 +13721,15 @@ | ||
12070 | ;; | ||
12071 | |||
12072 | portland) # -Masmkeyword required for asm("") cycle counters | ||
12073 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -Masmkeyword" >&5 | ||
12074 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Masmkeyword" >&5 | ||
12075 | $as_echo_n "checking whether C compiler accepts -Masmkeyword... " >&6; } | ||
12076 | -if test "${ax_cv_c_flags__Masmkeyword+set}" = set; then | ||
12077 | +if test "${ax_cv_c_flags__Masmkeyword+set}" = set; then : | ||
12078 | $as_echo_n "(cached) " >&6 | ||
12079 | else | ||
12080 | |||
12081 | ax_save_FLAGS=$CFLAGS | ||
12082 | CFLAGS="-Masmkeyword" | ||
12083 | - cat >conftest.$ac_ext <<_ACEOF | ||
12084 | -/* confdefs.h. */ | ||
12085 | -_ACEOF | ||
12086 | -cat confdefs.h >>conftest.$ac_ext | ||
12087 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12088 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12089 | /* end confdefs.h. */ | ||
12090 | |||
12091 | int | ||
12092 | @@ -14784,38 +13740,17 @@ | ||
12093 | return 0; | ||
12094 | } | ||
12095 | _ACEOF | ||
12096 | -rm -f conftest.$ac_objext | ||
12097 | -if { (ac_try="$ac_compile" | ||
12098 | -case "(($ac_try" in | ||
12099 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12100 | - *) ac_try_echo=$ac_try;; | ||
12101 | -esac | ||
12102 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12103 | -$as_echo "$ac_try_echo") >&5 | ||
12104 | - (eval "$ac_compile") 2>conftest.er1 | ||
12105 | - ac_status=$? | ||
12106 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12107 | - rm -f conftest.er1 | ||
12108 | - cat conftest.err >&5 | ||
12109 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12110 | - (exit $ac_status); } && { | ||
12111 | - test -z "$ac_c_werror_flag" || | ||
12112 | - test ! -s conftest.err | ||
12113 | - } && test -s conftest.$ac_objext; then | ||
12114 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12115 | ax_cv_c_flags__Masmkeyword=yes | ||
12116 | else | ||
12117 | - $as_echo "$as_me: failed program was:" >&5 | ||
12118 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12119 | - | ||
12120 | - ax_cv_c_flags__Masmkeyword=no | ||
12121 | + ax_cv_c_flags__Masmkeyword=no | ||
12122 | fi | ||
12123 | - | ||
12124 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12125 | CFLAGS=$ax_save_FLAGS | ||
12126 | fi | ||
12127 | |||
12128 | eval ax_check_compiler_flags=$ax_cv_c_flags__Masmkeyword | ||
12129 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12130 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12131 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12132 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12133 | CC="$CC -Masmkeyword" | ||
12134 | @@ -14829,19 +13764,15 @@ | ||
12135 | if test "x$SIMD_CFLAGS" = x; then | ||
12136 | if test "${ax_cv_c_compiler_vendor}" = "gnu"; then | ||
12137 | if test "$have_sse" = "yes"; then | ||
12138 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -msse" >&5 | ||
12139 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -msse" >&5 | ||
12140 | $as_echo_n "checking whether C compiler accepts -msse... " >&6; } | ||
12141 | -if test "${ax_cv_c_flags__msse+set}" = set; then | ||
12142 | +if test "${ax_cv_c_flags__msse+set}" = set; then : | ||
12143 | $as_echo_n "(cached) " >&6 | ||
12144 | else | ||
12145 | |||
12146 | ax_save_FLAGS=$CFLAGS | ||
12147 | CFLAGS="-msse" | ||
12148 | - cat >conftest.$ac_ext <<_ACEOF | ||
12149 | -/* confdefs.h. */ | ||
12150 | -_ACEOF | ||
12151 | -cat confdefs.h >>conftest.$ac_ext | ||
12152 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12153 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12154 | /* end confdefs.h. */ | ||
12155 | |||
12156 | int | ||
12157 | @@ -14852,61 +13783,34 @@ | ||
12158 | return 0; | ||
12159 | } | ||
12160 | _ACEOF | ||
12161 | -rm -f conftest.$ac_objext | ||
12162 | -if { (ac_try="$ac_compile" | ||
12163 | -case "(($ac_try" in | ||
12164 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12165 | - *) ac_try_echo=$ac_try;; | ||
12166 | -esac | ||
12167 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12168 | -$as_echo "$ac_try_echo") >&5 | ||
12169 | - (eval "$ac_compile") 2>conftest.er1 | ||
12170 | - ac_status=$? | ||
12171 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12172 | - rm -f conftest.er1 | ||
12173 | - cat conftest.err >&5 | ||
12174 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12175 | - (exit $ac_status); } && { | ||
12176 | - test -z "$ac_c_werror_flag" || | ||
12177 | - test ! -s conftest.err | ||
12178 | - } && test -s conftest.$ac_objext; then | ||
12179 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12180 | ax_cv_c_flags__msse=yes | ||
12181 | else | ||
12182 | - $as_echo "$as_me: failed program was:" >&5 | ||
12183 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12184 | - | ||
12185 | - ax_cv_c_flags__msse=no | ||
12186 | + ax_cv_c_flags__msse=no | ||
12187 | fi | ||
12188 | - | ||
12189 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12190 | CFLAGS=$ax_save_FLAGS | ||
12191 | fi | ||
12192 | |||
12193 | eval ax_check_compiler_flags=$ax_cv_c_flags__msse | ||
12194 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12195 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12196 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12197 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12198 | SIMD_CFLAGS="-msse" | ||
12199 | else | ||
12200 | - { { $as_echo "$as_me:$LINENO: error: Need a version of gcc with -msse" >&5 | ||
12201 | -$as_echo "$as_me: error: Need a version of gcc with -msse" >&2;} | ||
12202 | - { (exit 1); exit 1; }; } | ||
12203 | + as_fn_error $? "Need a version of gcc with -msse" "$LINENO" 5 | ||
12204 | fi | ||
12205 | |||
12206 | elif test "$have_sse2" = "yes"; then | ||
12207 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -msse2" >&5 | ||
12208 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -msse2" >&5 | ||
12209 | $as_echo_n "checking whether C compiler accepts -msse2... " >&6; } | ||
12210 | -if test "${ax_cv_c_flags__msse2+set}" = set; then | ||
12211 | +if test "${ax_cv_c_flags__msse2+set}" = set; then : | ||
12212 | $as_echo_n "(cached) " >&6 | ||
12213 | else | ||
12214 | |||
12215 | ax_save_FLAGS=$CFLAGS | ||
12216 | CFLAGS="-msse2" | ||
12217 | - cat >conftest.$ac_ext <<_ACEOF | ||
12218 | -/* confdefs.h. */ | ||
12219 | -_ACEOF | ||
12220 | -cat confdefs.h >>conftest.$ac_ext | ||
12221 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12222 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12223 | /* end confdefs.h. */ | ||
12224 | |||
12225 | int | ||
12226 | @@ -14917,63 +13821,36 @@ | ||
12227 | return 0; | ||
12228 | } | ||
12229 | _ACEOF | ||
12230 | -rm -f conftest.$ac_objext | ||
12231 | -if { (ac_try="$ac_compile" | ||
12232 | -case "(($ac_try" in | ||
12233 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12234 | - *) ac_try_echo=$ac_try;; | ||
12235 | -esac | ||
12236 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12237 | -$as_echo "$ac_try_echo") >&5 | ||
12238 | - (eval "$ac_compile") 2>conftest.er1 | ||
12239 | - ac_status=$? | ||
12240 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12241 | - rm -f conftest.er1 | ||
12242 | - cat conftest.err >&5 | ||
12243 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12244 | - (exit $ac_status); } && { | ||
12245 | - test -z "$ac_c_werror_flag" || | ||
12246 | - test ! -s conftest.err | ||
12247 | - } && test -s conftest.$ac_objext; then | ||
12248 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12249 | ax_cv_c_flags__msse2=yes | ||
12250 | else | ||
12251 | - $as_echo "$as_me: failed program was:" >&5 | ||
12252 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12253 | - | ||
12254 | - ax_cv_c_flags__msse2=no | ||
12255 | + ax_cv_c_flags__msse2=no | ||
12256 | fi | ||
12257 | - | ||
12258 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12259 | CFLAGS=$ax_save_FLAGS | ||
12260 | fi | ||
12261 | |||
12262 | eval ax_check_compiler_flags=$ax_cv_c_flags__msse2 | ||
12263 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12264 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12265 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12266 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12267 | SIMD_CFLAGS="-msse2" | ||
12268 | else | ||
12269 | - { { $as_echo "$as_me:$LINENO: error: Need a version of gcc with -msse2" >&5 | ||
12270 | -$as_echo "$as_me: error: Need a version of gcc with -msse2" >&2;} | ||
12271 | - { (exit 1); exit 1; }; } | ||
12272 | + as_fn_error $? "Need a version of gcc with -msse2" "$LINENO" 5 | ||
12273 | fi | ||
12274 | |||
12275 | elif test "$have_altivec" = "yes"; then | ||
12276 | # -DFAKE__VEC__ is a workaround because gcc-3.3 does not | ||
12277 | # #define __VEC__ with -maltivec. | ||
12278 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -faltivec" >&5 | ||
12279 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -faltivec" >&5 | ||
12280 | $as_echo_n "checking whether C compiler accepts -faltivec... " >&6; } | ||
12281 | -if test "${ax_cv_c_flags__faltivec+set}" = set; then | ||
12282 | +if test "${ax_cv_c_flags__faltivec+set}" = set; then : | ||
12283 | $as_echo_n "(cached) " >&6 | ||
12284 | else | ||
12285 | |||
12286 | ax_save_FLAGS=$CFLAGS | ||
12287 | CFLAGS="-faltivec" | ||
12288 | - cat >conftest.$ac_ext <<_ACEOF | ||
12289 | -/* confdefs.h. */ | ||
12290 | -_ACEOF | ||
12291 | -cat confdefs.h >>conftest.$ac_ext | ||
12292 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12293 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12294 | /* end confdefs.h. */ | ||
12295 | |||
12296 | int | ||
12297 | @@ -14984,55 +13861,26 @@ | ||
12298 | return 0; | ||
12299 | } | ||
12300 | _ACEOF | ||
12301 | -rm -f conftest.$ac_objext | ||
12302 | -if { (ac_try="$ac_compile" | ||
12303 | -case "(($ac_try" in | ||
12304 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12305 | - *) ac_try_echo=$ac_try;; | ||
12306 | -esac | ||
12307 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12308 | -$as_echo "$ac_try_echo") >&5 | ||
12309 | - (eval "$ac_compile") 2>conftest.er1 | ||
12310 | - ac_status=$? | ||
12311 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12312 | - rm -f conftest.er1 | ||
12313 | - cat conftest.err >&5 | ||
12314 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12315 | - (exit $ac_status); } && { | ||
12316 | - test -z "$ac_c_werror_flag" || | ||
12317 | - test ! -s conftest.err | ||
12318 | - } && test -s conftest.$ac_objext; then | ||
12319 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12320 | ax_cv_c_flags__faltivec=yes | ||
12321 | else | ||
12322 | - $as_echo "$as_me: failed program was:" >&5 | ||
12323 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12324 | - | ||
12325 | - ax_cv_c_flags__faltivec=no | ||
12326 | + ax_cv_c_flags__faltivec=no | ||
12327 | fi | ||
12328 | - | ||
12329 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12330 | CFLAGS=$ax_save_FLAGS | ||
12331 | fi | ||
12332 | |||
12333 | eval ax_check_compiler_flags=$ax_cv_c_flags__faltivec | ||
12334 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12335 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12336 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12337 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12338 | SIMD_CFLAGS="-faltivec" | ||
12339 | else | ||
12340 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -maltivec -mabi=altivec" >&5 | ||
12341 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -maltivec -mabi=altivec" >&5 | ||
12342 | $as_echo_n "checking whether C compiler accepts -maltivec -mabi=altivec... " >&6; } | ||
12343 | -if test "${ax_cv_c_flags__maltivec__mabi_altivec+set}" = set; then | ||
12344 | - $as_echo_n "(cached) " >&6 | ||
12345 | -else | ||
12346 | - | ||
12347 | - ax_save_FLAGS=$CFLAGS | ||
12348 | - CFLAGS="-maltivec -mabi=altivec" | ||
12349 | - cat >conftest.$ac_ext <<_ACEOF | ||
12350 | -/* confdefs.h. */ | ||
12351 | -_ACEOF | ||
12352 | -cat confdefs.h >>conftest.$ac_ext | ||
12353 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12354 | +ax_save_FLAGS=$CFLAGS | ||
12355 | + CFLAGS="-maltivec -mabi=altivec" | ||
12356 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12357 | /* end confdefs.h. */ | ||
12358 | |||
12359 | int | ||
12360 | @@ -15043,55 +13891,28 @@ | ||
12361 | return 0; | ||
12362 | } | ||
12363 | _ACEOF | ||
12364 | -rm -f conftest.$ac_objext | ||
12365 | -if { (ac_try="$ac_compile" | ||
12366 | -case "(($ac_try" in | ||
12367 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12368 | - *) ac_try_echo=$ac_try;; | ||
12369 | -esac | ||
12370 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12371 | -$as_echo "$ac_try_echo") >&5 | ||
12372 | - (eval "$ac_compile") 2>conftest.er1 | ||
12373 | - ac_status=$? | ||
12374 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12375 | - rm -f conftest.er1 | ||
12376 | - cat conftest.err >&5 | ||
12377 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12378 | - (exit $ac_status); } && { | ||
12379 | - test -z "$ac_c_werror_flag" || | ||
12380 | - test ! -s conftest.err | ||
12381 | - } && test -s conftest.$ac_objext; then | ||
12382 | - ax_cv_c_flags__maltivec__mabi_altivec=yes | ||
12383 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12384 | + eval `$as_echo "ax_cv_c_flags_-maltivec -mabi=altivec" | $as_tr_sh`=yes | ||
12385 | else | ||
12386 | - $as_echo "$as_me: failed program was:" >&5 | ||
12387 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12388 | - | ||
12389 | - ax_cv_c_flags__maltivec__mabi_altivec=no | ||
12390 | + eval `$as_echo "ax_cv_c_flags_-maltivec -mabi=altivec" | $as_tr_sh`=no | ||
12391 | fi | ||
12392 | - | ||
12393 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12394 | - CFLAGS=$ax_save_FLAGS | ||
12395 | -fi | ||
12396 | - | ||
12397 | -eval ax_check_compiler_flags=$ax_cv_c_flags__maltivec__mabi_altivec | ||
12398 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12399 | + CFLAGS=$ax_save_FLAGS | ||
12400 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_-maltivec -mabi=altivec" | $as_tr_sh` | ||
12401 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12402 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12403 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12404 | SIMD_CFLAGS="-maltivec -mabi=altivec -DFAKE__VEC__" | ||
12405 | else | ||
12406 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fvec" >&5 | ||
12407 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvec" >&5 | ||
12408 | $as_echo_n "checking whether C compiler accepts -fvec... " >&6; } | ||
12409 | -if test "${ax_cv_c_flags__fvec+set}" = set; then | ||
12410 | +if test "${ax_cv_c_flags__fvec+set}" = set; then : | ||
12411 | $as_echo_n "(cached) " >&6 | ||
12412 | else | ||
12413 | |||
12414 | ax_save_FLAGS=$CFLAGS | ||
12415 | CFLAGS="-fvec" | ||
12416 | - cat >conftest.$ac_ext <<_ACEOF | ||
12417 | -/* confdefs.h. */ | ||
12418 | -_ACEOF | ||
12419 | -cat confdefs.h >>conftest.$ac_ext | ||
12420 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12421 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12422 | /* end confdefs.h. */ | ||
12423 | |||
12424 | int | ||
12425 | @@ -15102,45 +13923,22 @@ | ||
12426 | return 0; | ||
12427 | } | ||
12428 | _ACEOF | ||
12429 | -rm -f conftest.$ac_objext | ||
12430 | -if { (ac_try="$ac_compile" | ||
12431 | -case "(($ac_try" in | ||
12432 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12433 | - *) ac_try_echo=$ac_try;; | ||
12434 | -esac | ||
12435 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12436 | -$as_echo "$ac_try_echo") >&5 | ||
12437 | - (eval "$ac_compile") 2>conftest.er1 | ||
12438 | - ac_status=$? | ||
12439 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12440 | - rm -f conftest.er1 | ||
12441 | - cat conftest.err >&5 | ||
12442 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12443 | - (exit $ac_status); } && { | ||
12444 | - test -z "$ac_c_werror_flag" || | ||
12445 | - test ! -s conftest.err | ||
12446 | - } && test -s conftest.$ac_objext; then | ||
12447 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12448 | ax_cv_c_flags__fvec=yes | ||
12449 | else | ||
12450 | - $as_echo "$as_me: failed program was:" >&5 | ||
12451 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12452 | - | ||
12453 | - ax_cv_c_flags__fvec=no | ||
12454 | + ax_cv_c_flags__fvec=no | ||
12455 | fi | ||
12456 | - | ||
12457 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12458 | CFLAGS=$ax_save_FLAGS | ||
12459 | fi | ||
12460 | |||
12461 | eval ax_check_compiler_flags=$ax_cv_c_flags__fvec | ||
12462 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12463 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12464 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12465 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12466 | SIMD_CFLAGS="-fvec" | ||
12467 | else | ||
12468 | - { { $as_echo "$as_me:$LINENO: error: Need a version of gcc with -maltivec" >&5 | ||
12469 | -$as_echo "$as_me: error: Need a version of gcc with -maltivec" >&2;} | ||
12470 | - { (exit 1); exit 1; }; } | ||
12471 | + as_fn_error $? "Need a version of gcc with -maltivec" "$LINENO" 5 | ||
12472 | fi | ||
12473 | |||
12474 | fi | ||
12475 | @@ -15150,19 +13948,15 @@ | ||
12476 | elif test "$have_mips_ps" = "yes"; then | ||
12477 | # Just punt here and use only new 4.2 compiler :( | ||
12478 | # Should add section for older compilers... | ||
12479 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -mpaired-single" >&5 | ||
12480 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mpaired-single" >&5 | ||
12481 | $as_echo_n "checking whether C compiler accepts -mpaired-single... " >&6; } | ||
12482 | -if test "${ax_cv_c_flags__mpaired_single+set}" = set; then | ||
12483 | +if test "${ax_cv_c_flags__mpaired_single+set}" = set; then : | ||
12484 | $as_echo_n "(cached) " >&6 | ||
12485 | else | ||
12486 | |||
12487 | ax_save_FLAGS=$CFLAGS | ||
12488 | CFLAGS="-mpaired-single" | ||
12489 | - cat >conftest.$ac_ext <<_ACEOF | ||
12490 | -/* confdefs.h. */ | ||
12491 | -_ACEOF | ||
12492 | -cat confdefs.h >>conftest.$ac_ext | ||
12493 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12494 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12495 | /* end confdefs.h. */ | ||
12496 | |||
12497 | int | ||
12498 | @@ -15173,56 +13967,27 @@ | ||
12499 | return 0; | ||
12500 | } | ||
12501 | _ACEOF | ||
12502 | -rm -f conftest.$ac_objext | ||
12503 | -if { (ac_try="$ac_compile" | ||
12504 | -case "(($ac_try" in | ||
12505 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12506 | - *) ac_try_echo=$ac_try;; | ||
12507 | -esac | ||
12508 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12509 | -$as_echo "$ac_try_echo") >&5 | ||
12510 | - (eval "$ac_compile") 2>conftest.er1 | ||
12511 | - ac_status=$? | ||
12512 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12513 | - rm -f conftest.er1 | ||
12514 | - cat conftest.err >&5 | ||
12515 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12516 | - (exit $ac_status); } && { | ||
12517 | - test -z "$ac_c_werror_flag" || | ||
12518 | - test ! -s conftest.err | ||
12519 | - } && test -s conftest.$ac_objext; then | ||
12520 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12521 | ax_cv_c_flags__mpaired_single=yes | ||
12522 | else | ||
12523 | - $as_echo "$as_me: failed program was:" >&5 | ||
12524 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12525 | - | ||
12526 | - ax_cv_c_flags__mpaired_single=no | ||
12527 | + ax_cv_c_flags__mpaired_single=no | ||
12528 | fi | ||
12529 | - | ||
12530 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12531 | CFLAGS=$ax_save_FLAGS | ||
12532 | fi | ||
12533 | |||
12534 | eval ax_check_compiler_flags=$ax_cv_c_flags__mpaired_single | ||
12535 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12536 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12537 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12538 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12539 | SIMD_CFLAGS="-mpaired-single" | ||
12540 | else | ||
12541 | #[AC_MSG_ERROR([Need a version of gcc with -mpaired-single])]) | ||
12542 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -march=mips64" >&5 | ||
12543 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -march=mips64" >&5 | ||
12544 | $as_echo_n "checking whether C compiler accepts -march=mips64... " >&6; } | ||
12545 | -if test "${ax_cv_c_flags__march_mips64+set}" = set; then | ||
12546 | - $as_echo_n "(cached) " >&6 | ||
12547 | -else | ||
12548 | - | ||
12549 | - ax_save_FLAGS=$CFLAGS | ||
12550 | - CFLAGS="-march=mips64" | ||
12551 | - cat >conftest.$ac_ext <<_ACEOF | ||
12552 | -/* confdefs.h. */ | ||
12553 | -_ACEOF | ||
12554 | -cat confdefs.h >>conftest.$ac_ext | ||
12555 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12556 | +ax_save_FLAGS=$CFLAGS | ||
12557 | + CFLAGS="-march=mips64" | ||
12558 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12559 | /* end confdefs.h. */ | ||
12560 | |||
12561 | int | ||
12562 | @@ -15233,45 +13998,20 @@ | ||
12563 | return 0; | ||
12564 | } | ||
12565 | _ACEOF | ||
12566 | -rm -f conftest.$ac_objext | ||
12567 | -if { (ac_try="$ac_compile" | ||
12568 | -case "(($ac_try" in | ||
12569 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12570 | - *) ac_try_echo=$ac_try;; | ||
12571 | -esac | ||
12572 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12573 | -$as_echo "$ac_try_echo") >&5 | ||
12574 | - (eval "$ac_compile") 2>conftest.er1 | ||
12575 | - ac_status=$? | ||
12576 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12577 | - rm -f conftest.er1 | ||
12578 | - cat conftest.err >&5 | ||
12579 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12580 | - (exit $ac_status); } && { | ||
12581 | - test -z "$ac_c_werror_flag" || | ||
12582 | - test ! -s conftest.err | ||
12583 | - } && test -s conftest.$ac_objext; then | ||
12584 | - ax_cv_c_flags__march_mips64=yes | ||
12585 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12586 | + eval `$as_echo "ax_cv_c_flags_-march=mips64" | $as_tr_sh`=yes | ||
12587 | else | ||
12588 | - $as_echo "$as_me: failed program was:" >&5 | ||
12589 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12590 | - | ||
12591 | - ax_cv_c_flags__march_mips64=no | ||
12592 | + eval `$as_echo "ax_cv_c_flags_-march=mips64" | $as_tr_sh`=no | ||
12593 | fi | ||
12594 | - | ||
12595 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12596 | - CFLAGS=$ax_save_FLAGS | ||
12597 | -fi | ||
12598 | - | ||
12599 | -eval ax_check_compiler_flags=$ax_cv_c_flags__march_mips64 | ||
12600 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
12601 | + CFLAGS=$ax_save_FLAGS | ||
12602 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_-march=mips64" | $as_tr_sh` | ||
12603 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
12604 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
12605 | if test "x$ax_check_compiler_flags" = xyes; then | ||
12606 | SIMD_CFLAGS="-march=mips64" | ||
12607 | else | ||
12608 | - { { $as_echo "$as_me:$LINENO: error: Need a version of gcc with -mpaired-single or -march=mips64" >&5 | ||
12609 | -$as_echo "$as_me: error: Need a version of gcc with -mpaired-single or -march=mips64" >&2;} | ||
12610 | - { (exit 1); exit 1; }; } | ||
12611 | + as_fn_error $? "Need a version of gcc with -mpaired-single or -march=mips64" "$LINENO" 5 | ||
12612 | |||
12613 | fi | ||
12614 | |||
12615 | @@ -15282,16 +14022,12 @@ | ||
12616 | fi | ||
12617 | |||
12618 | |||
12619 | -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | ||
12620 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 | ||
12621 | $as_echo_n "checking for ANSI C header files... " >&6; } | ||
12622 | -if test "${ac_cv_header_stdc+set}" = set; then | ||
12623 | +if test "${ac_cv_header_stdc+set}" = set; then : | ||
12624 | $as_echo_n "(cached) " >&6 | ||
12625 | else | ||
12626 | - cat >conftest.$ac_ext <<_ACEOF | ||
12627 | -/* confdefs.h. */ | ||
12628 | -_ACEOF | ||
12629 | -cat confdefs.h >>conftest.$ac_ext | ||
12630 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12631 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12632 | /* end confdefs.h. */ | ||
12633 | #include <stdlib.h> | ||
12634 | #include <stdarg.h> | ||
12635 | @@ -15306,48 +14042,23 @@ | ||
12636 | return 0; | ||
12637 | } | ||
12638 | _ACEOF | ||
12639 | -rm -f conftest.$ac_objext | ||
12640 | -if { (ac_try="$ac_compile" | ||
12641 | -case "(($ac_try" in | ||
12642 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12643 | - *) ac_try_echo=$ac_try;; | ||
12644 | -esac | ||
12645 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12646 | -$as_echo "$ac_try_echo") >&5 | ||
12647 | - (eval "$ac_compile") 2>conftest.er1 | ||
12648 | - ac_status=$? | ||
12649 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12650 | - rm -f conftest.er1 | ||
12651 | - cat conftest.err >&5 | ||
12652 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12653 | - (exit $ac_status); } && { | ||
12654 | - test -z "$ac_c_werror_flag" || | ||
12655 | - test ! -s conftest.err | ||
12656 | - } && test -s conftest.$ac_objext; then | ||
12657 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12658 | ac_cv_header_stdc=yes | ||
12659 | else | ||
12660 | - $as_echo "$as_me: failed program was:" >&5 | ||
12661 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12662 | - | ||
12663 | - ac_cv_header_stdc=no | ||
12664 | + ac_cv_header_stdc=no | ||
12665 | fi | ||
12666 | - | ||
12667 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12668 | |||
12669 | if test $ac_cv_header_stdc = yes; then | ||
12670 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
12671 | - cat >conftest.$ac_ext <<_ACEOF | ||
12672 | -/* confdefs.h. */ | ||
12673 | -_ACEOF | ||
12674 | -cat confdefs.h >>conftest.$ac_ext | ||
12675 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12676 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12677 | /* end confdefs.h. */ | ||
12678 | #include <string.h> | ||
12679 | |||
12680 | _ACEOF | ||
12681 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
12682 | - $EGREP "memchr" >/dev/null 2>&1; then | ||
12683 | - : | ||
12684 | + $EGREP "memchr" >/dev/null 2>&1; then : | ||
12685 | + | ||
12686 | else | ||
12687 | ac_cv_header_stdc=no | ||
12688 | fi | ||
12689 | @@ -15357,18 +14068,14 @@ | ||
12690 | |||
12691 | if test $ac_cv_header_stdc = yes; then | ||
12692 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
12693 | - cat >conftest.$ac_ext <<_ACEOF | ||
12694 | -/* confdefs.h. */ | ||
12695 | -_ACEOF | ||
12696 | -cat confdefs.h >>conftest.$ac_ext | ||
12697 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12698 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12699 | /* end confdefs.h. */ | ||
12700 | #include <stdlib.h> | ||
12701 | |||
12702 | _ACEOF | ||
12703 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
12704 | - $EGREP "free" >/dev/null 2>&1; then | ||
12705 | - : | ||
12706 | + $EGREP "free" >/dev/null 2>&1; then : | ||
12707 | + | ||
12708 | else | ||
12709 | ac_cv_header_stdc=no | ||
12710 | fi | ||
12711 | @@ -15378,14 +14085,10 @@ | ||
12712 | |||
12713 | if test $ac_cv_header_stdc = yes; then | ||
12714 | # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
12715 | - if test "$cross_compiling" = yes; then | ||
12716 | + if test "$cross_compiling" = yes; then : | ||
12717 | : | ||
12718 | else | ||
12719 | - cat >conftest.$ac_ext <<_ACEOF | ||
12720 | -/* confdefs.h. */ | ||
12721 | -_ACEOF | ||
12722 | -cat confdefs.h >>conftest.$ac_ext | ||
12723 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12724 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12725 | /* end confdefs.h. */ | ||
12726 | #include <ctype.h> | ||
12727 | #include <stdlib.h> | ||
12728 | @@ -15412,390 +14115,302 @@ | ||
12729 | return 0; | ||
12730 | } | ||
12731 | _ACEOF | ||
12732 | -rm -f conftest$ac_exeext | ||
12733 | -if { (ac_try="$ac_link" | ||
12734 | -case "(($ac_try" in | ||
12735 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12736 | - *) ac_try_echo=$ac_try;; | ||
12737 | -esac | ||
12738 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12739 | -$as_echo "$ac_try_echo") >&5 | ||
12740 | - (eval "$ac_link") 2>&5 | ||
12741 | - ac_status=$? | ||
12742 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12743 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
12744 | - { (case "(($ac_try" in | ||
12745 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12746 | - *) ac_try_echo=$ac_try;; | ||
12747 | -esac | ||
12748 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12749 | -$as_echo "$ac_try_echo") >&5 | ||
12750 | - (eval "$ac_try") 2>&5 | ||
12751 | - ac_status=$? | ||
12752 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12753 | - (exit $ac_status); }; }; then | ||
12754 | - : | ||
12755 | -else | ||
12756 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
12757 | -$as_echo "$as_me: failed program was:" >&5 | ||
12758 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12759 | +if ac_fn_c_try_run "$LINENO"; then : | ||
12760 | |||
12761 | -( exit $ac_status ) | ||
12762 | -ac_cv_header_stdc=no | ||
12763 | +else | ||
12764 | + ac_cv_header_stdc=no | ||
12765 | fi | ||
12766 | -rm -rf conftest.dSYM | ||
12767 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
12768 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
12769 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
12770 | fi | ||
12771 | |||
12772 | - | ||
12773 | fi | ||
12774 | fi | ||
12775 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | ||
12776 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 | ||
12777 | $as_echo "$ac_cv_header_stdc" >&6; } | ||
12778 | if test $ac_cv_header_stdc = yes; then | ||
12779 | |||
12780 | -cat >>confdefs.h <<\_ACEOF | ||
12781 | -#define STDC_HEADERS 1 | ||
12782 | -_ACEOF | ||
12783 | +$as_echo "#define STDC_HEADERS 1" >>confdefs.h | ||
12784 | |||
12785 | fi | ||
12786 | |||
12787 | +for ac_header in libintl.h malloc.h stddef.h stdlib.h string.h strings.h sys/time.h unistd.h limits.h c_asm.h intrinsics.h stdint.h mach/mach_time.h sys/sysctl.h xmmintrin.h sys/syscall.h linux/perf_event.h | ||
12788 | +do : | ||
12789 | + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
12790 | +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | ||
12791 | +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | ||
12792 | + cat >>confdefs.h <<_ACEOF | ||
12793 | +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
12794 | +_ACEOF | ||
12795 | |||
12796 | +fi | ||
12797 | |||
12798 | +done | ||
12799 | |||
12800 | |||
12801 | +save_CFLAGS="$CFLAGS" | ||
12802 | +save_CPPFLAGS="$CPPFLAGS" | ||
12803 | +CFLAGS="$CFLAGS $SIMD_CFLAGS" | ||
12804 | +CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS" | ||
12805 | +for ac_header in altivec.h | ||
12806 | +do : | ||
12807 | + ac_fn_c_check_header_mongrel "$LINENO" "altivec.h" "ac_cv_header_altivec_h" "$ac_includes_default" | ||
12808 | +if test "x$ac_cv_header_altivec_h" = x""yes; then : | ||
12809 | + cat >>confdefs.h <<_ACEOF | ||
12810 | +#define HAVE_ALTIVEC_H 1 | ||
12811 | +_ACEOF | ||
12812 | |||
12813 | +fi | ||
12814 | |||
12815 | +done | ||
12816 | |||
12817 | +for ac_header in arm_neon.h | ||
12818 | +do : | ||
12819 | + ac_fn_c_check_header_mongrel "$LINENO" "arm_neon.h" "ac_cv_header_arm_neon_h" "$ac_includes_default" | ||
12820 | +if test "x$ac_cv_header_arm_neon_h" = x""yes; then : | ||
12821 | + cat >>confdefs.h <<_ACEOF | ||
12822 | +#define HAVE_ARM_NEON_H 1 | ||
12823 | +_ACEOF | ||
12824 | |||
12825 | +fi | ||
12826 | |||
12827 | +done | ||
12828 | |||
12829 | +CFLAGS="$save_CFLAGS" | ||
12830 | +CPPFLAGS="$save_CPPFLAGS" | ||
12831 | |||
12832 | |||
12833 | - | ||
12834 | - | ||
12835 | - | ||
12836 | -for ac_header in libintl.h malloc.h stddef.h stdlib.h string.h strings.h sys/time.h unistd.h limits.h c_asm.h intrinsics.h stdint.h mach/mach_time.h sys/sysctl.h xmmintrin.h | ||
12837 | -do | ||
12838 | -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
12839 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
12840 | - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
12841 | -$as_echo_n "checking for $ac_header... " >&6; } | ||
12842 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
12843 | +if test "$have_neon" = "yes"; then | ||
12844 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 | ||
12845 | +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } | ||
12846 | +if test "${ac_cv_c_bigendian+set}" = set; then : | ||
12847 | $as_echo_n "(cached) " >&6 | ||
12848 | -fi | ||
12849 | -ac_res=`eval 'as_val=${'$as_ac_Header'} | ||
12850 | - $as_echo "$as_val"'` | ||
12851 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
12852 | -$as_echo "$ac_res" >&6; } | ||
12853 | else | ||
12854 | - # Is the header compilable? | ||
12855 | -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
12856 | -$as_echo_n "checking $ac_header usability... " >&6; } | ||
12857 | -cat >conftest.$ac_ext <<_ACEOF | ||
12858 | -/* confdefs.h. */ | ||
12859 | -_ACEOF | ||
12860 | -cat confdefs.h >>conftest.$ac_ext | ||
12861 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12862 | + ac_cv_c_bigendian=unknown | ||
12863 | + # See if we're dealing with a universal compiler. | ||
12864 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12865 | /* end confdefs.h. */ | ||
12866 | -$ac_includes_default | ||
12867 | -#include <$ac_header> | ||
12868 | +#ifndef __APPLE_CC__ | ||
12869 | + not a universal capable compiler | ||
12870 | + #endif | ||
12871 | + typedef int dummy; | ||
12872 | + | ||
12873 | _ACEOF | ||
12874 | -rm -f conftest.$ac_objext | ||
12875 | -if { (ac_try="$ac_compile" | ||
12876 | -case "(($ac_try" in | ||
12877 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12878 | - *) ac_try_echo=$ac_try;; | ||
12879 | -esac | ||
12880 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12881 | -$as_echo "$ac_try_echo") >&5 | ||
12882 | - (eval "$ac_compile") 2>conftest.er1 | ||
12883 | - ac_status=$? | ||
12884 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12885 | - rm -f conftest.er1 | ||
12886 | - cat conftest.err >&5 | ||
12887 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12888 | - (exit $ac_status); } && { | ||
12889 | - test -z "$ac_c_werror_flag" || | ||
12890 | - test ! -s conftest.err | ||
12891 | - } && test -s conftest.$ac_objext; then | ||
12892 | - ac_header_compiler=yes | ||
12893 | -else | ||
12894 | - $as_echo "$as_me: failed program was:" >&5 | ||
12895 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12896 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12897 | |||
12898 | - ac_header_compiler=no | ||
12899 | + # Check for potential -arch flags. It is not universal unless | ||
12900 | + # there are at least two -arch flags with different values. | ||
12901 | + ac_arch= | ||
12902 | + ac_prev= | ||
12903 | + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do | ||
12904 | + if test -n "$ac_prev"; then | ||
12905 | + case $ac_word in | ||
12906 | + i?86 | x86_64 | ppc | ppc64) | ||
12907 | + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then | ||
12908 | + ac_arch=$ac_word | ||
12909 | + else | ||
12910 | + ac_cv_c_bigendian=universal | ||
12911 | + break | ||
12912 | + fi | ||
12913 | + ;; | ||
12914 | + esac | ||
12915 | + ac_prev= | ||
12916 | + elif test "x$ac_word" = "x-arch"; then | ||
12917 | + ac_prev=arch | ||
12918 | + fi | ||
12919 | + done | ||
12920 | fi | ||
12921 | - | ||
12922 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12923 | -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
12924 | -$as_echo "$ac_header_compiler" >&6; } | ||
12925 | + if test $ac_cv_c_bigendian = unknown; then | ||
12926 | + # See if sys/param.h defines the BYTE_ORDER macro. | ||
12927 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12928 | +/* end confdefs.h. */ | ||
12929 | +#include <sys/types.h> | ||
12930 | + #include <sys/param.h> | ||
12931 | |||
12932 | -# Is the header present? | ||
12933 | -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
12934 | -$as_echo_n "checking $ac_header presence... " >&6; } | ||
12935 | -cat >conftest.$ac_ext <<_ACEOF | ||
12936 | -/* confdefs.h. */ | ||
12937 | +int | ||
12938 | +main () | ||
12939 | +{ | ||
12940 | +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ | ||
12941 | + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ | ||
12942 | + && LITTLE_ENDIAN) | ||
12943 | + bogus endian macros | ||
12944 | + #endif | ||
12945 | + | ||
12946 | + ; | ||
12947 | + return 0; | ||
12948 | +} | ||
12949 | _ACEOF | ||
12950 | -cat confdefs.h >>conftest.$ac_ext | ||
12951 | -cat >>conftest.$ac_ext <<_ACEOF | ||
12952 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
12953 | + # It does; now see whether it defined to BIG_ENDIAN or not. | ||
12954 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
12955 | /* end confdefs.h. */ | ||
12956 | -#include <$ac_header> | ||
12957 | -_ACEOF | ||
12958 | -if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
12959 | -case "(($ac_try" in | ||
12960 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12961 | - *) ac_try_echo=$ac_try;; | ||
12962 | -esac | ||
12963 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
12964 | -$as_echo "$ac_try_echo") >&5 | ||
12965 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
12966 | - ac_status=$? | ||
12967 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
12968 | - rm -f conftest.er1 | ||
12969 | - cat conftest.err >&5 | ||
12970 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12971 | - (exit $ac_status); } >/dev/null && { | ||
12972 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
12973 | - test ! -s conftest.err | ||
12974 | - }; then | ||
12975 | - ac_header_preproc=yes | ||
12976 | -else | ||
12977 | - $as_echo "$as_me: failed program was:" >&5 | ||
12978 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
12979 | - | ||
12980 | - ac_header_preproc=no | ||
12981 | -fi | ||
12982 | +#include <sys/types.h> | ||
12983 | + #include <sys/param.h> | ||
12984 | |||
12985 | -rm -f conftest.err conftest.$ac_ext | ||
12986 | -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
12987 | -$as_echo "$ac_header_preproc" >&6; } | ||
12988 | +int | ||
12989 | +main () | ||
12990 | +{ | ||
12991 | +#if BYTE_ORDER != BIG_ENDIAN | ||
12992 | + not big endian | ||
12993 | + #endif | ||
12994 | |||
12995 | -# So? What about this header? | ||
12996 | -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
12997 | - yes:no: ) | ||
12998 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
12999 | -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
13000 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
13001 | -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
13002 | - ac_header_preproc=yes | ||
13003 | - ;; | ||
13004 | - no:yes:* ) | ||
13005 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
13006 | -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
13007 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
13008 | -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
13009 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
13010 | -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
13011 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
13012 | -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
13013 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
13014 | -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
13015 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
13016 | -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
13017 | - ( cat <<\_ASBOX | ||
13018 | -## ---------------------------- ## | ||
13019 | -## Report this to fftw@fftw.org ## | ||
13020 | -## ---------------------------- ## | ||
13021 | -_ASBOX | ||
13022 | - ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
13023 | - ;; | ||
13024 | -esac | ||
13025 | -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
13026 | -$as_echo_n "checking for $ac_header... " >&6; } | ||
13027 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
13028 | - $as_echo_n "(cached) " >&6 | ||
13029 | + ; | ||
13030 | + return 0; | ||
13031 | +} | ||
13032 | +_ACEOF | ||
13033 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
13034 | + ac_cv_c_bigendian=yes | ||
13035 | else | ||
13036 | - eval "$as_ac_Header=\$ac_header_preproc" | ||
13037 | -fi | ||
13038 | -ac_res=`eval 'as_val=${'$as_ac_Header'} | ||
13039 | - $as_echo "$as_val"'` | ||
13040 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
13041 | -$as_echo "$ac_res" >&6; } | ||
13042 | - | ||
13043 | + ac_cv_c_bigendian=no | ||
13044 | fi | ||
13045 | -as_val=`eval 'as_val=${'$as_ac_Header'} | ||
13046 | - $as_echo "$as_val"'` | ||
13047 | - if test "x$as_val" = x""yes; then | ||
13048 | - cat >>confdefs.h <<_ACEOF | ||
13049 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
13050 | -_ACEOF | ||
13051 | - | ||
13052 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13053 | fi | ||
13054 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13055 | + fi | ||
13056 | + if test $ac_cv_c_bigendian = unknown; then | ||
13057 | + # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). | ||
13058 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13059 | +/* end confdefs.h. */ | ||
13060 | +#include <limits.h> | ||
13061 | |||
13062 | -done | ||
13063 | - | ||
13064 | - | ||
13065 | -save_CFLAGS="$CFLAGS" | ||
13066 | -save_CPPFLAGS="$CPPFLAGS" | ||
13067 | -CFLAGS="$CFLAGS $SIMD_CFLAGS" | ||
13068 | -CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS" | ||
13069 | +int | ||
13070 | +main () | ||
13071 | +{ | ||
13072 | +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) | ||
13073 | + bogus endian macros | ||
13074 | + #endif | ||
13075 | |||
13076 | -for ac_header in altivec.h | ||
13077 | -do | ||
13078 | -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
13079 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
13080 | - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
13081 | -$as_echo_n "checking for $ac_header... " >&6; } | ||
13082 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
13083 | - $as_echo_n "(cached) " >&6 | ||
13084 | -fi | ||
13085 | -ac_res=`eval 'as_val=${'$as_ac_Header'} | ||
13086 | - $as_echo "$as_val"'` | ||
13087 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
13088 | -$as_echo "$ac_res" >&6; } | ||
13089 | -else | ||
13090 | - # Is the header compilable? | ||
13091 | -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
13092 | -$as_echo_n "checking $ac_header usability... " >&6; } | ||
13093 | -cat >conftest.$ac_ext <<_ACEOF | ||
13094 | -/* confdefs.h. */ | ||
13095 | + ; | ||
13096 | + return 0; | ||
13097 | +} | ||
13098 | _ACEOF | ||
13099 | -cat confdefs.h >>conftest.$ac_ext | ||
13100 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13101 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
13102 | + # It does; now see whether it defined to _BIG_ENDIAN or not. | ||
13103 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13104 | /* end confdefs.h. */ | ||
13105 | -$ac_includes_default | ||
13106 | -#include <$ac_header> | ||
13107 | +#include <limits.h> | ||
13108 | + | ||
13109 | +int | ||
13110 | +main () | ||
13111 | +{ | ||
13112 | +#ifndef _BIG_ENDIAN | ||
13113 | + not big endian | ||
13114 | + #endif | ||
13115 | + | ||
13116 | + ; | ||
13117 | + return 0; | ||
13118 | +} | ||
13119 | _ACEOF | ||
13120 | -rm -f conftest.$ac_objext | ||
13121 | -if { (ac_try="$ac_compile" | ||
13122 | -case "(($ac_try" in | ||
13123 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13124 | - *) ac_try_echo=$ac_try;; | ||
13125 | -esac | ||
13126 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13127 | -$as_echo "$ac_try_echo") >&5 | ||
13128 | - (eval "$ac_compile") 2>conftest.er1 | ||
13129 | - ac_status=$? | ||
13130 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13131 | - rm -f conftest.er1 | ||
13132 | - cat conftest.err >&5 | ||
13133 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13134 | - (exit $ac_status); } && { | ||
13135 | - test -z "$ac_c_werror_flag" || | ||
13136 | - test ! -s conftest.err | ||
13137 | - } && test -s conftest.$ac_objext; then | ||
13138 | - ac_header_compiler=yes | ||
13139 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
13140 | + ac_cv_c_bigendian=yes | ||
13141 | else | ||
13142 | - $as_echo "$as_me: failed program was:" >&5 | ||
13143 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13144 | - | ||
13145 | - ac_header_compiler=no | ||
13146 | + ac_cv_c_bigendian=no | ||
13147 | fi | ||
13148 | - | ||
13149 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13150 | -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
13151 | -$as_echo "$ac_header_compiler" >&6; } | ||
13152 | - | ||
13153 | -# Is the header present? | ||
13154 | -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
13155 | -$as_echo_n "checking $ac_header presence... " >&6; } | ||
13156 | -cat >conftest.$ac_ext <<_ACEOF | ||
13157 | -/* confdefs.h. */ | ||
13158 | -_ACEOF | ||
13159 | -cat confdefs.h >>conftest.$ac_ext | ||
13160 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13161 | +fi | ||
13162 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13163 | + fi | ||
13164 | + if test $ac_cv_c_bigendian = unknown; then | ||
13165 | + # Compile a test program. | ||
13166 | + if test "$cross_compiling" = yes; then : | ||
13167 | + # Try to guess by grepping values from an object file. | ||
13168 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13169 | /* end confdefs.h. */ | ||
13170 | -#include <$ac_header> | ||
13171 | -_ACEOF | ||
13172 | -if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
13173 | -case "(($ac_try" in | ||
13174 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13175 | - *) ac_try_echo=$ac_try;; | ||
13176 | -esac | ||
13177 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13178 | -$as_echo "$ac_try_echo") >&5 | ||
13179 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
13180 | - ac_status=$? | ||
13181 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13182 | - rm -f conftest.er1 | ||
13183 | - cat conftest.err >&5 | ||
13184 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13185 | - (exit $ac_status); } >/dev/null && { | ||
13186 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
13187 | - test ! -s conftest.err | ||
13188 | - }; then | ||
13189 | - ac_header_preproc=yes | ||
13190 | -else | ||
13191 | - $as_echo "$as_me: failed program was:" >&5 | ||
13192 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13193 | +short int ascii_mm[] = | ||
13194 | + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; | ||
13195 | + short int ascii_ii[] = | ||
13196 | + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; | ||
13197 | + int use_ascii (int i) { | ||
13198 | + return ascii_mm[i] + ascii_ii[i]; | ||
13199 | + } | ||
13200 | + short int ebcdic_ii[] = | ||
13201 | + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; | ||
13202 | + short int ebcdic_mm[] = | ||
13203 | + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; | ||
13204 | + int use_ebcdic (int i) { | ||
13205 | + return ebcdic_mm[i] + ebcdic_ii[i]; | ||
13206 | + } | ||
13207 | + extern int foo; | ||
13208 | |||
13209 | - ac_header_preproc=no | ||
13210 | +int | ||
13211 | +main () | ||
13212 | +{ | ||
13213 | +return use_ascii (foo) == use_ebcdic (foo); | ||
13214 | + ; | ||
13215 | + return 0; | ||
13216 | +} | ||
13217 | +_ACEOF | ||
13218 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
13219 | + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then | ||
13220 | + ac_cv_c_bigendian=yes | ||
13221 | + fi | ||
13222 | + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then | ||
13223 | + if test "$ac_cv_c_bigendian" = unknown; then | ||
13224 | + ac_cv_c_bigendian=no | ||
13225 | + else | ||
13226 | + # finding both strings is unlikely to happen, but who knows? | ||
13227 | + ac_cv_c_bigendian=unknown | ||
13228 | + fi | ||
13229 | + fi | ||
13230 | fi | ||
13231 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13232 | +else | ||
13233 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13234 | +/* end confdefs.h. */ | ||
13235 | +$ac_includes_default | ||
13236 | +int | ||
13237 | +main () | ||
13238 | +{ | ||
13239 | |||
13240 | -rm -f conftest.err conftest.$ac_ext | ||
13241 | -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
13242 | -$as_echo "$ac_header_preproc" >&6; } | ||
13243 | + /* Are we little or big endian? From Harbison&Steele. */ | ||
13244 | + union | ||
13245 | + { | ||
13246 | + long int l; | ||
13247 | + char c[sizeof (long int)]; | ||
13248 | + } u; | ||
13249 | + u.l = 1; | ||
13250 | + return u.c[sizeof (long int) - 1] == 1; | ||
13251 | |||
13252 | -# So? What about this header? | ||
13253 | -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
13254 | - yes:no: ) | ||
13255 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
13256 | -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
13257 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
13258 | -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
13259 | - ac_header_preproc=yes | ||
13260 | - ;; | ||
13261 | - no:yes:* ) | ||
13262 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
13263 | -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
13264 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
13265 | -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
13266 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
13267 | -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
13268 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
13269 | -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
13270 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
13271 | -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
13272 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
13273 | -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
13274 | - ( cat <<\_ASBOX | ||
13275 | -## ---------------------------- ## | ||
13276 | -## Report this to fftw@fftw.org ## | ||
13277 | -## ---------------------------- ## | ||
13278 | -_ASBOX | ||
13279 | - ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
13280 | - ;; | ||
13281 | -esac | ||
13282 | -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
13283 | -$as_echo_n "checking for $ac_header... " >&6; } | ||
13284 | -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
13285 | - $as_echo_n "(cached) " >&6 | ||
13286 | + ; | ||
13287 | + return 0; | ||
13288 | +} | ||
13289 | +_ACEOF | ||
13290 | +if ac_fn_c_try_run "$LINENO"; then : | ||
13291 | + ac_cv_c_bigendian=no | ||
13292 | else | ||
13293 | - eval "$as_ac_Header=\$ac_header_preproc" | ||
13294 | + ac_cv_c_bigendian=yes | ||
13295 | fi | ||
13296 | -ac_res=`eval 'as_val=${'$as_ac_Header'} | ||
13297 | - $as_echo "$as_val"'` | ||
13298 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
13299 | -$as_echo "$ac_res" >&6; } | ||
13300 | - | ||
13301 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
13302 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
13303 | fi | ||
13304 | -as_val=`eval 'as_val=${'$as_ac_Header'} | ||
13305 | - $as_echo "$as_val"'` | ||
13306 | - if test "x$as_val" = x""yes; then | ||
13307 | - cat >>confdefs.h <<_ACEOF | ||
13308 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
13309 | -_ACEOF | ||
13310 | |||
13311 | + fi | ||
13312 | fi | ||
13313 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 | ||
13314 | +$as_echo "$ac_cv_c_bigendian" >&6; } | ||
13315 | + case $ac_cv_c_bigendian in #( | ||
13316 | + yes) | ||
13317 | + as_fn_error $? "this NEON implementation does not support big-endian (ARMEB/ARMv7b) systems." "$LINENO" 5 ;; #( | ||
13318 | + no) | ||
13319 | + ;; #( | ||
13320 | + universal) | ||
13321 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: detected universal endianness -- NEON support requires little-endian." >&5 | ||
13322 | +$as_echo "$as_me: WARNING: detected universal endianness -- NEON support requires little-endian." >&2;} | ||
13323 | + ;; #( | ||
13324 | + *) | ||
13325 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine endianness -- NEON support requires little-endian." >&5 | ||
13326 | +$as_echo "$as_me: WARNING: cannot determine endianness -- NEON support requires little-endian." >&2;} ;; | ||
13327 | + esac | ||
13328 | |||
13329 | -done | ||
13330 | - | ||
13331 | -CFLAGS="$save_CFLAGS" | ||
13332 | -CPPFLAGS="$save_CPPFLAGS" | ||
13333 | - | ||
13334 | - | ||
13335 | +fi | ||
13336 | |||
13337 | -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 | ||
13338 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 | ||
13339 | $as_echo_n "checking for an ANSI C-conforming const... " >&6; } | ||
13340 | -if test "${ac_cv_c_const+set}" = set; then | ||
13341 | +if test "${ac_cv_c_const+set}" = set; then : | ||
13342 | $as_echo_n "(cached) " >&6 | ||
13343 | else | ||
13344 | - cat >conftest.$ac_ext <<_ACEOF | ||
13345 | -/* confdefs.h. */ | ||
13346 | -_ACEOF | ||
13347 | -cat confdefs.h >>conftest.$ac_ext | ||
13348 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13349 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13350 | /* end confdefs.h. */ | ||
13351 | |||
13352 | int | ||
13353 | @@ -15855,56 +14470,29 @@ | ||
13354 | return 0; | ||
13355 | } | ||
13356 | _ACEOF | ||
13357 | -rm -f conftest.$ac_objext | ||
13358 | -if { (ac_try="$ac_compile" | ||
13359 | -case "(($ac_try" in | ||
13360 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13361 | - *) ac_try_echo=$ac_try;; | ||
13362 | -esac | ||
13363 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13364 | -$as_echo "$ac_try_echo") >&5 | ||
13365 | - (eval "$ac_compile") 2>conftest.er1 | ||
13366 | - ac_status=$? | ||
13367 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13368 | - rm -f conftest.er1 | ||
13369 | - cat conftest.err >&5 | ||
13370 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13371 | - (exit $ac_status); } && { | ||
13372 | - test -z "$ac_c_werror_flag" || | ||
13373 | - test ! -s conftest.err | ||
13374 | - } && test -s conftest.$ac_objext; then | ||
13375 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
13376 | ac_cv_c_const=yes | ||
13377 | else | ||
13378 | - $as_echo "$as_me: failed program was:" >&5 | ||
13379 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13380 | - | ||
13381 | - ac_cv_c_const=no | ||
13382 | + ac_cv_c_const=no | ||
13383 | fi | ||
13384 | - | ||
13385 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13386 | fi | ||
13387 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 | ||
13388 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 | ||
13389 | $as_echo "$ac_cv_c_const" >&6; } | ||
13390 | if test $ac_cv_c_const = no; then | ||
13391 | |||
13392 | -cat >>confdefs.h <<\_ACEOF | ||
13393 | -#define const /**/ | ||
13394 | -_ACEOF | ||
13395 | +$as_echo "#define const /**/" >>confdefs.h | ||
13396 | |||
13397 | fi | ||
13398 | |||
13399 | -{ $as_echo "$as_me:$LINENO: checking for inline" >&5 | ||
13400 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 | ||
13401 | $as_echo_n "checking for inline... " >&6; } | ||
13402 | -if test "${ac_cv_c_inline+set}" = set; then | ||
13403 | +if test "${ac_cv_c_inline+set}" = set; then : | ||
13404 | $as_echo_n "(cached) " >&6 | ||
13405 | else | ||
13406 | ac_cv_c_inline=no | ||
13407 | for ac_kw in inline __inline__ __inline; do | ||
13408 | - cat >conftest.$ac_ext <<_ACEOF | ||
13409 | -/* confdefs.h. */ | ||
13410 | -_ACEOF | ||
13411 | -cat confdefs.h >>conftest.$ac_ext | ||
13412 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13413 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13414 | /* end confdefs.h. */ | ||
13415 | #ifndef __cplusplus | ||
13416 | typedef int foo_t; | ||
13417 | @@ -15913,41 +14501,17 @@ | ||
13418 | #endif | ||
13419 | |||
13420 | _ACEOF | ||
13421 | -rm -f conftest.$ac_objext | ||
13422 | -if { (ac_try="$ac_compile" | ||
13423 | -case "(($ac_try" in | ||
13424 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13425 | - *) ac_try_echo=$ac_try;; | ||
13426 | -esac | ||
13427 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13428 | -$as_echo "$ac_try_echo") >&5 | ||
13429 | - (eval "$ac_compile") 2>conftest.er1 | ||
13430 | - ac_status=$? | ||
13431 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13432 | - rm -f conftest.er1 | ||
13433 | - cat conftest.err >&5 | ||
13434 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13435 | - (exit $ac_status); } && { | ||
13436 | - test -z "$ac_c_werror_flag" || | ||
13437 | - test ! -s conftest.err | ||
13438 | - } && test -s conftest.$ac_objext; then | ||
13439 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
13440 | ac_cv_c_inline=$ac_kw | ||
13441 | -else | ||
13442 | - $as_echo "$as_me: failed program was:" >&5 | ||
13443 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13444 | - | ||
13445 | - | ||
13446 | fi | ||
13447 | - | ||
13448 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13449 | test "$ac_cv_c_inline" != no && break | ||
13450 | done | ||
13451 | |||
13452 | fi | ||
13453 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 | ||
13454 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 | ||
13455 | $as_echo "$ac_cv_c_inline" >&6; } | ||
13456 | |||
13457 | - | ||
13458 | case $ac_cv_c_inline in | ||
13459 | inline | yes) ;; | ||
13460 | *) | ||
13461 | @@ -15963,102 +14527,9 @@ | ||
13462 | ;; | ||
13463 | esac | ||
13464 | |||
13465 | -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 | ||
13466 | -$as_echo_n "checking for size_t... " >&6; } | ||
13467 | -if test "${ac_cv_type_size_t+set}" = set; then | ||
13468 | - $as_echo_n "(cached) " >&6 | ||
13469 | -else | ||
13470 | - ac_cv_type_size_t=no | ||
13471 | -cat >conftest.$ac_ext <<_ACEOF | ||
13472 | -/* confdefs.h. */ | ||
13473 | -_ACEOF | ||
13474 | -cat confdefs.h >>conftest.$ac_ext | ||
13475 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13476 | -/* end confdefs.h. */ | ||
13477 | -$ac_includes_default | ||
13478 | -int | ||
13479 | -main () | ||
13480 | -{ | ||
13481 | -if (sizeof (size_t)) | ||
13482 | - return 0; | ||
13483 | - ; | ||
13484 | - return 0; | ||
13485 | -} | ||
13486 | -_ACEOF | ||
13487 | -rm -f conftest.$ac_objext | ||
13488 | -if { (ac_try="$ac_compile" | ||
13489 | -case "(($ac_try" in | ||
13490 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13491 | - *) ac_try_echo=$ac_try;; | ||
13492 | -esac | ||
13493 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13494 | -$as_echo "$ac_try_echo") >&5 | ||
13495 | - (eval "$ac_compile") 2>conftest.er1 | ||
13496 | - ac_status=$? | ||
13497 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13498 | - rm -f conftest.er1 | ||
13499 | - cat conftest.err >&5 | ||
13500 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13501 | - (exit $ac_status); } && { | ||
13502 | - test -z "$ac_c_werror_flag" || | ||
13503 | - test ! -s conftest.err | ||
13504 | - } && test -s conftest.$ac_objext; then | ||
13505 | - cat >conftest.$ac_ext <<_ACEOF | ||
13506 | -/* confdefs.h. */ | ||
13507 | -_ACEOF | ||
13508 | -cat confdefs.h >>conftest.$ac_ext | ||
13509 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13510 | -/* end confdefs.h. */ | ||
13511 | -$ac_includes_default | ||
13512 | -int | ||
13513 | -main () | ||
13514 | -{ | ||
13515 | -if (sizeof ((size_t))) | ||
13516 | - return 0; | ||
13517 | - ; | ||
13518 | - return 0; | ||
13519 | -} | ||
13520 | -_ACEOF | ||
13521 | -rm -f conftest.$ac_objext | ||
13522 | -if { (ac_try="$ac_compile" | ||
13523 | -case "(($ac_try" in | ||
13524 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13525 | - *) ac_try_echo=$ac_try;; | ||
13526 | -esac | ||
13527 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13528 | -$as_echo "$ac_try_echo") >&5 | ||
13529 | - (eval "$ac_compile") 2>conftest.er1 | ||
13530 | - ac_status=$? | ||
13531 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13532 | - rm -f conftest.er1 | ||
13533 | - cat conftest.err >&5 | ||
13534 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13535 | - (exit $ac_status); } && { | ||
13536 | - test -z "$ac_c_werror_flag" || | ||
13537 | - test ! -s conftest.err | ||
13538 | - } && test -s conftest.$ac_objext; then | ||
13539 | - : | ||
13540 | -else | ||
13541 | - $as_echo "$as_me: failed program was:" >&5 | ||
13542 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13543 | - | ||
13544 | - ac_cv_type_size_t=yes | ||
13545 | -fi | ||
13546 | - | ||
13547 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13548 | -else | ||
13549 | - $as_echo "$as_me: failed program was:" >&5 | ||
13550 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13551 | - | ||
13552 | - | ||
13553 | -fi | ||
13554 | +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" | ||
13555 | +if test "x$ac_cv_type_size_t" = x""yes; then : | ||
13556 | |||
13557 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13558 | -fi | ||
13559 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 | ||
13560 | -$as_echo "$ac_cv_type_size_t" >&6; } | ||
13561 | -if test "x$ac_cv_type_size_t" = x""yes; then | ||
13562 | - : | ||
13563 | else | ||
13564 | |||
13565 | cat >>confdefs.h <<_ACEOF | ||
13566 | @@ -16067,16 +14538,12 @@ | ||
13567 | |||
13568 | fi | ||
13569 | |||
13570 | -{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 | ||
13571 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 | ||
13572 | $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } | ||
13573 | -if test "${ac_cv_header_time+set}" = set; then | ||
13574 | +if test "${ac_cv_header_time+set}" = set; then : | ||
13575 | $as_echo_n "(cached) " >&6 | ||
13576 | else | ||
13577 | - cat >conftest.$ac_ext <<_ACEOF | ||
13578 | -/* confdefs.h. */ | ||
13579 | -_ACEOF | ||
13580 | -cat confdefs.h >>conftest.$ac_ext | ||
13581 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13582 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13583 | /* end confdefs.h. */ | ||
13584 | #include <sys/types.h> | ||
13585 | #include <sys/time.h> | ||
13586 | @@ -16091,263 +14558,43 @@ | ||
13587 | return 0; | ||
13588 | } | ||
13589 | _ACEOF | ||
13590 | -rm -f conftest.$ac_objext | ||
13591 | -if { (ac_try="$ac_compile" | ||
13592 | -case "(($ac_try" in | ||
13593 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13594 | - *) ac_try_echo=$ac_try;; | ||
13595 | -esac | ||
13596 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13597 | -$as_echo "$ac_try_echo") >&5 | ||
13598 | - (eval "$ac_compile") 2>conftest.er1 | ||
13599 | - ac_status=$? | ||
13600 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13601 | - rm -f conftest.er1 | ||
13602 | - cat conftest.err >&5 | ||
13603 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13604 | - (exit $ac_status); } && { | ||
13605 | - test -z "$ac_c_werror_flag" || | ||
13606 | - test ! -s conftest.err | ||
13607 | - } && test -s conftest.$ac_objext; then | ||
13608 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
13609 | ac_cv_header_time=yes | ||
13610 | else | ||
13611 | - $as_echo "$as_me: failed program was:" >&5 | ||
13612 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13613 | - | ||
13614 | - ac_cv_header_time=no | ||
13615 | + ac_cv_header_time=no | ||
13616 | fi | ||
13617 | - | ||
13618 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13619 | fi | ||
13620 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 | ||
13621 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 | ||
13622 | $as_echo "$ac_cv_header_time" >&6; } | ||
13623 | if test $ac_cv_header_time = yes; then | ||
13624 | |||
13625 | -cat >>confdefs.h <<\_ACEOF | ||
13626 | -#define TIME_WITH_SYS_TIME 1 | ||
13627 | -_ACEOF | ||
13628 | - | ||
13629 | -fi | ||
13630 | - | ||
13631 | -{ $as_echo "$as_me:$LINENO: checking for long double" >&5 | ||
13632 | -$as_echo_n "checking for long double... " >&6; } | ||
13633 | -if test "${ac_cv_type_long_double+set}" = set; then | ||
13634 | - $as_echo_n "(cached) " >&6 | ||
13635 | -else | ||
13636 | - ac_cv_type_long_double=no | ||
13637 | -cat >conftest.$ac_ext <<_ACEOF | ||
13638 | -/* confdefs.h. */ | ||
13639 | -_ACEOF | ||
13640 | -cat confdefs.h >>conftest.$ac_ext | ||
13641 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13642 | -/* end confdefs.h. */ | ||
13643 | -$ac_includes_default | ||
13644 | -int | ||
13645 | -main () | ||
13646 | -{ | ||
13647 | -if (sizeof (long double)) | ||
13648 | - return 0; | ||
13649 | - ; | ||
13650 | - return 0; | ||
13651 | -} | ||
13652 | -_ACEOF | ||
13653 | -rm -f conftest.$ac_objext | ||
13654 | -if { (ac_try="$ac_compile" | ||
13655 | -case "(($ac_try" in | ||
13656 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13657 | - *) ac_try_echo=$ac_try;; | ||
13658 | -esac | ||
13659 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13660 | -$as_echo "$ac_try_echo") >&5 | ||
13661 | - (eval "$ac_compile") 2>conftest.er1 | ||
13662 | - ac_status=$? | ||
13663 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13664 | - rm -f conftest.er1 | ||
13665 | - cat conftest.err >&5 | ||
13666 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13667 | - (exit $ac_status); } && { | ||
13668 | - test -z "$ac_c_werror_flag" || | ||
13669 | - test ! -s conftest.err | ||
13670 | - } && test -s conftest.$ac_objext; then | ||
13671 | - cat >conftest.$ac_ext <<_ACEOF | ||
13672 | -/* confdefs.h. */ | ||
13673 | -_ACEOF | ||
13674 | -cat confdefs.h >>conftest.$ac_ext | ||
13675 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13676 | -/* end confdefs.h. */ | ||
13677 | -$ac_includes_default | ||
13678 | -int | ||
13679 | -main () | ||
13680 | -{ | ||
13681 | -if (sizeof ((long double))) | ||
13682 | - return 0; | ||
13683 | - ; | ||
13684 | - return 0; | ||
13685 | -} | ||
13686 | -_ACEOF | ||
13687 | -rm -f conftest.$ac_objext | ||
13688 | -if { (ac_try="$ac_compile" | ||
13689 | -case "(($ac_try" in | ||
13690 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13691 | - *) ac_try_echo=$ac_try;; | ||
13692 | -esac | ||
13693 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13694 | -$as_echo "$ac_try_echo") >&5 | ||
13695 | - (eval "$ac_compile") 2>conftest.er1 | ||
13696 | - ac_status=$? | ||
13697 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13698 | - rm -f conftest.er1 | ||
13699 | - cat conftest.err >&5 | ||
13700 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13701 | - (exit $ac_status); } && { | ||
13702 | - test -z "$ac_c_werror_flag" || | ||
13703 | - test ! -s conftest.err | ||
13704 | - } && test -s conftest.$ac_objext; then | ||
13705 | - : | ||
13706 | -else | ||
13707 | - $as_echo "$as_me: failed program was:" >&5 | ||
13708 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13709 | - | ||
13710 | - ac_cv_type_long_double=yes | ||
13711 | -fi | ||
13712 | - | ||
13713 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13714 | -else | ||
13715 | - $as_echo "$as_me: failed program was:" >&5 | ||
13716 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13717 | - | ||
13718 | +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h | ||
13719 | |||
13720 | fi | ||
13721 | |||
13722 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13723 | -fi | ||
13724 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5 | ||
13725 | -$as_echo "$ac_cv_type_long_double" >&6; } | ||
13726 | -if test "x$ac_cv_type_long_double" = x""yes; then | ||
13727 | +ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default" | ||
13728 | +if test "x$ac_cv_type_long_double" = x""yes; then : | ||
13729 | |||
13730 | -cat >>confdefs.h <<\_ACEOF | ||
13731 | -#define HAVE_LONG_DOUBLE 1 | ||
13732 | -_ACEOF | ||
13733 | +$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h | ||
13734 | |||
13735 | else | ||
13736 | |||
13737 | if test $PRECISION = l; then | ||
13738 | - { { $as_echo "$as_me:$LINENO: error: long double is not a supported type with your compiler." >&5 | ||
13739 | -$as_echo "$as_me: error: long double is not a supported type with your compiler." >&2;} | ||
13740 | - { (exit 1); exit 1; }; } | ||
13741 | + as_fn_error $? "long double is not a supported type with your compiler." "$LINENO" 5 | ||
13742 | fi | ||
13743 | |||
13744 | fi | ||
13745 | |||
13746 | -{ $as_echo "$as_me:$LINENO: checking for hrtime_t" >&5 | ||
13747 | -$as_echo_n "checking for hrtime_t... " >&6; } | ||
13748 | -if test "${ac_cv_type_hrtime_t+set}" = set; then | ||
13749 | - $as_echo_n "(cached) " >&6 | ||
13750 | -else | ||
13751 | - ac_cv_type_hrtime_t=no | ||
13752 | -cat >conftest.$ac_ext <<_ACEOF | ||
13753 | -/* confdefs.h. */ | ||
13754 | -_ACEOF | ||
13755 | -cat confdefs.h >>conftest.$ac_ext | ||
13756 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13757 | -/* end confdefs.h. */ | ||
13758 | - | ||
13759 | -#if HAVE_SYS_TIME_H | ||
13760 | -#include <sys/time.h> | ||
13761 | -#endif | ||
13762 | - | ||
13763 | - | ||
13764 | -int | ||
13765 | -main () | ||
13766 | -{ | ||
13767 | -if (sizeof (hrtime_t)) | ||
13768 | - return 0; | ||
13769 | - ; | ||
13770 | - return 0; | ||
13771 | -} | ||
13772 | -_ACEOF | ||
13773 | -rm -f conftest.$ac_objext | ||
13774 | -if { (ac_try="$ac_compile" | ||
13775 | -case "(($ac_try" in | ||
13776 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13777 | - *) ac_try_echo=$ac_try;; | ||
13778 | -esac | ||
13779 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13780 | -$as_echo "$ac_try_echo") >&5 | ||
13781 | - (eval "$ac_compile") 2>conftest.er1 | ||
13782 | - ac_status=$? | ||
13783 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13784 | - rm -f conftest.er1 | ||
13785 | - cat conftest.err >&5 | ||
13786 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13787 | - (exit $ac_status); } && { | ||
13788 | - test -z "$ac_c_werror_flag" || | ||
13789 | - test ! -s conftest.err | ||
13790 | - } && test -s conftest.$ac_objext; then | ||
13791 | - cat >conftest.$ac_ext <<_ACEOF | ||
13792 | -/* confdefs.h. */ | ||
13793 | -_ACEOF | ||
13794 | -cat confdefs.h >>conftest.$ac_ext | ||
13795 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13796 | -/* end confdefs.h. */ | ||
13797 | - | ||
13798 | +ac_fn_c_check_type "$LINENO" "hrtime_t" "ac_cv_type_hrtime_t" " | ||
13799 | #if HAVE_SYS_TIME_H | ||
13800 | #include <sys/time.h> | ||
13801 | #endif | ||
13802 | |||
13803 | +" | ||
13804 | +if test "x$ac_cv_type_hrtime_t" = x""yes; then : | ||
13805 | |||
13806 | -int | ||
13807 | -main () | ||
13808 | -{ | ||
13809 | -if (sizeof ((hrtime_t))) | ||
13810 | - return 0; | ||
13811 | - ; | ||
13812 | - return 0; | ||
13813 | -} | ||
13814 | -_ACEOF | ||
13815 | -rm -f conftest.$ac_objext | ||
13816 | -if { (ac_try="$ac_compile" | ||
13817 | -case "(($ac_try" in | ||
13818 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13819 | - *) ac_try_echo=$ac_try;; | ||
13820 | -esac | ||
13821 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13822 | -$as_echo "$ac_try_echo") >&5 | ||
13823 | - (eval "$ac_compile") 2>conftest.er1 | ||
13824 | - ac_status=$? | ||
13825 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13826 | - rm -f conftest.er1 | ||
13827 | - cat conftest.err >&5 | ||
13828 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13829 | - (exit $ac_status); } && { | ||
13830 | - test -z "$ac_c_werror_flag" || | ||
13831 | - test ! -s conftest.err | ||
13832 | - } && test -s conftest.$ac_objext; then | ||
13833 | - : | ||
13834 | -else | ||
13835 | - $as_echo "$as_me: failed program was:" >&5 | ||
13836 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13837 | - | ||
13838 | - ac_cv_type_hrtime_t=yes | ||
13839 | -fi | ||
13840 | - | ||
13841 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13842 | -else | ||
13843 | - $as_echo "$as_me: failed program was:" >&5 | ||
13844 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13845 | - | ||
13846 | - | ||
13847 | -fi | ||
13848 | - | ||
13849 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13850 | -fi | ||
13851 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_hrtime_t" >&5 | ||
13852 | -$as_echo "$ac_cv_type_hrtime_t" >&6; } | ||
13853 | -if test "x$ac_cv_type_hrtime_t" = x""yes; then | ||
13854 | - | ||
13855 | -cat >>confdefs.h <<\_ACEOF | ||
13856 | -#define HAVE_HRTIME_T 1 | ||
13857 | -_ACEOF | ||
13858 | +$as_echo "#define HAVE_HRTIME_T 1" >>confdefs.h | ||
13859 | |||
13860 | fi | ||
13861 | |||
13862 | @@ -16356,352 +14603,26 @@ | ||
13863 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
13864 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
13865 | # This bug is HP SR number 8606223364. | ||
13866 | -{ $as_echo "$as_me:$LINENO: checking size of int" >&5 | ||
13867 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 | ||
13868 | $as_echo_n "checking size of int... " >&6; } | ||
13869 | -if test "${ac_cv_sizeof_int+set}" = set; then | ||
13870 | +if test "${ac_cv_sizeof_int+set}" = set; then : | ||
13871 | $as_echo_n "(cached) " >&6 | ||
13872 | else | ||
13873 | - if test "$cross_compiling" = yes; then | ||
13874 | - # Depending upon the size, compute the lo and hi bounds. | ||
13875 | -cat >conftest.$ac_ext <<_ACEOF | ||
13876 | -/* confdefs.h. */ | ||
13877 | -_ACEOF | ||
13878 | -cat confdefs.h >>conftest.$ac_ext | ||
13879 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13880 | -/* end confdefs.h. */ | ||
13881 | -$ac_includes_default | ||
13882 | -int | ||
13883 | -main () | ||
13884 | -{ | ||
13885 | -static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)]; | ||
13886 | -test_array [0] = 0 | ||
13887 | - | ||
13888 | - ; | ||
13889 | - return 0; | ||
13890 | -} | ||
13891 | -_ACEOF | ||
13892 | -rm -f conftest.$ac_objext | ||
13893 | -if { (ac_try="$ac_compile" | ||
13894 | -case "(($ac_try" in | ||
13895 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13896 | - *) ac_try_echo=$ac_try;; | ||
13897 | -esac | ||
13898 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13899 | -$as_echo "$ac_try_echo") >&5 | ||
13900 | - (eval "$ac_compile") 2>conftest.er1 | ||
13901 | - ac_status=$? | ||
13902 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13903 | - rm -f conftest.er1 | ||
13904 | - cat conftest.err >&5 | ||
13905 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13906 | - (exit $ac_status); } && { | ||
13907 | - test -z "$ac_c_werror_flag" || | ||
13908 | - test ! -s conftest.err | ||
13909 | - } && test -s conftest.$ac_objext; then | ||
13910 | - ac_lo=0 ac_mid=0 | ||
13911 | - while :; do | ||
13912 | - cat >conftest.$ac_ext <<_ACEOF | ||
13913 | -/* confdefs.h. */ | ||
13914 | -_ACEOF | ||
13915 | -cat confdefs.h >>conftest.$ac_ext | ||
13916 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13917 | -/* end confdefs.h. */ | ||
13918 | -$ac_includes_default | ||
13919 | -int | ||
13920 | -main () | ||
13921 | -{ | ||
13922 | -static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; | ||
13923 | -test_array [0] = 0 | ||
13924 | - | ||
13925 | - ; | ||
13926 | - return 0; | ||
13927 | -} | ||
13928 | -_ACEOF | ||
13929 | -rm -f conftest.$ac_objext | ||
13930 | -if { (ac_try="$ac_compile" | ||
13931 | -case "(($ac_try" in | ||
13932 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13933 | - *) ac_try_echo=$ac_try;; | ||
13934 | -esac | ||
13935 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13936 | -$as_echo "$ac_try_echo") >&5 | ||
13937 | - (eval "$ac_compile") 2>conftest.er1 | ||
13938 | - ac_status=$? | ||
13939 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13940 | - rm -f conftest.er1 | ||
13941 | - cat conftest.err >&5 | ||
13942 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13943 | - (exit $ac_status); } && { | ||
13944 | - test -z "$ac_c_werror_flag" || | ||
13945 | - test ! -s conftest.err | ||
13946 | - } && test -s conftest.$ac_objext; then | ||
13947 | - ac_hi=$ac_mid; break | ||
13948 | -else | ||
13949 | - $as_echo "$as_me: failed program was:" >&5 | ||
13950 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13951 | - | ||
13952 | - ac_lo=`expr $ac_mid + 1` | ||
13953 | - if test $ac_lo -le $ac_mid; then | ||
13954 | - ac_lo= ac_hi= | ||
13955 | - break | ||
13956 | - fi | ||
13957 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
13958 | -fi | ||
13959 | - | ||
13960 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13961 | - done | ||
13962 | -else | ||
13963 | - $as_echo "$as_me: failed program was:" >&5 | ||
13964 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
13965 | - | ||
13966 | - cat >conftest.$ac_ext <<_ACEOF | ||
13967 | -/* confdefs.h. */ | ||
13968 | -_ACEOF | ||
13969 | -cat confdefs.h >>conftest.$ac_ext | ||
13970 | -cat >>conftest.$ac_ext <<_ACEOF | ||
13971 | -/* end confdefs.h. */ | ||
13972 | -$ac_includes_default | ||
13973 | -int | ||
13974 | -main () | ||
13975 | -{ | ||
13976 | -static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)]; | ||
13977 | -test_array [0] = 0 | ||
13978 | - | ||
13979 | - ; | ||
13980 | - return 0; | ||
13981 | -} | ||
13982 | -_ACEOF | ||
13983 | -rm -f conftest.$ac_objext | ||
13984 | -if { (ac_try="$ac_compile" | ||
13985 | -case "(($ac_try" in | ||
13986 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13987 | - *) ac_try_echo=$ac_try;; | ||
13988 | -esac | ||
13989 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
13990 | -$as_echo "$ac_try_echo") >&5 | ||
13991 | - (eval "$ac_compile") 2>conftest.er1 | ||
13992 | - ac_status=$? | ||
13993 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
13994 | - rm -f conftest.er1 | ||
13995 | - cat conftest.err >&5 | ||
13996 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13997 | - (exit $ac_status); } && { | ||
13998 | - test -z "$ac_c_werror_flag" || | ||
13999 | - test ! -s conftest.err | ||
14000 | - } && test -s conftest.$ac_objext; then | ||
14001 | - ac_hi=-1 ac_mid=-1 | ||
14002 | - while :; do | ||
14003 | - cat >conftest.$ac_ext <<_ACEOF | ||
14004 | -/* confdefs.h. */ | ||
14005 | -_ACEOF | ||
14006 | -cat confdefs.h >>conftest.$ac_ext | ||
14007 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14008 | -/* end confdefs.h. */ | ||
14009 | -$ac_includes_default | ||
14010 | -int | ||
14011 | -main () | ||
14012 | -{ | ||
14013 | -static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)]; | ||
14014 | -test_array [0] = 0 | ||
14015 | - | ||
14016 | - ; | ||
14017 | - return 0; | ||
14018 | -} | ||
14019 | -_ACEOF | ||
14020 | -rm -f conftest.$ac_objext | ||
14021 | -if { (ac_try="$ac_compile" | ||
14022 | -case "(($ac_try" in | ||
14023 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14024 | - *) ac_try_echo=$ac_try;; | ||
14025 | -esac | ||
14026 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14027 | -$as_echo "$ac_try_echo") >&5 | ||
14028 | - (eval "$ac_compile") 2>conftest.er1 | ||
14029 | - ac_status=$? | ||
14030 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14031 | - rm -f conftest.er1 | ||
14032 | - cat conftest.err >&5 | ||
14033 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14034 | - (exit $ac_status); } && { | ||
14035 | - test -z "$ac_c_werror_flag" || | ||
14036 | - test ! -s conftest.err | ||
14037 | - } && test -s conftest.$ac_objext; then | ||
14038 | - ac_lo=$ac_mid; break | ||
14039 | -else | ||
14040 | - $as_echo "$as_me: failed program was:" >&5 | ||
14041 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14042 | - | ||
14043 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
14044 | - if test $ac_mid -le $ac_hi; then | ||
14045 | - ac_lo= ac_hi= | ||
14046 | - break | ||
14047 | - fi | ||
14048 | - ac_mid=`expr 2 '*' $ac_mid` | ||
14049 | -fi | ||
14050 | - | ||
14051 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14052 | - done | ||
14053 | -else | ||
14054 | - $as_echo "$as_me: failed program was:" >&5 | ||
14055 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14056 | - | ||
14057 | - ac_lo= ac_hi= | ||
14058 | -fi | ||
14059 | - | ||
14060 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14061 | -fi | ||
14062 | - | ||
14063 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14064 | -# Binary search between lo and hi bounds. | ||
14065 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
14066 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
14067 | - cat >conftest.$ac_ext <<_ACEOF | ||
14068 | -/* confdefs.h. */ | ||
14069 | -_ACEOF | ||
14070 | -cat confdefs.h >>conftest.$ac_ext | ||
14071 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14072 | -/* end confdefs.h. */ | ||
14073 | -$ac_includes_default | ||
14074 | -int | ||
14075 | -main () | ||
14076 | -{ | ||
14077 | -static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; | ||
14078 | -test_array [0] = 0 | ||
14079 | - | ||
14080 | - ; | ||
14081 | - return 0; | ||
14082 | -} | ||
14083 | -_ACEOF | ||
14084 | -rm -f conftest.$ac_objext | ||
14085 | -if { (ac_try="$ac_compile" | ||
14086 | -case "(($ac_try" in | ||
14087 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14088 | - *) ac_try_echo=$ac_try;; | ||
14089 | -esac | ||
14090 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14091 | -$as_echo "$ac_try_echo") >&5 | ||
14092 | - (eval "$ac_compile") 2>conftest.er1 | ||
14093 | - ac_status=$? | ||
14094 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14095 | - rm -f conftest.er1 | ||
14096 | - cat conftest.err >&5 | ||
14097 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14098 | - (exit $ac_status); } && { | ||
14099 | - test -z "$ac_c_werror_flag" || | ||
14100 | - test ! -s conftest.err | ||
14101 | - } && test -s conftest.$ac_objext; then | ||
14102 | - ac_hi=$ac_mid | ||
14103 | -else | ||
14104 | - $as_echo "$as_me: failed program was:" >&5 | ||
14105 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14106 | - | ||
14107 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
14108 | -fi | ||
14109 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : | ||
14110 | |||
14111 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14112 | -done | ||
14113 | -case $ac_lo in | ||
14114 | -?*) ac_cv_sizeof_int=$ac_lo;; | ||
14115 | -'') if test "$ac_cv_type_int" = yes; then | ||
14116 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
14117 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
14118 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) | ||
14119 | -See \`config.log' for more details." >&5 | ||
14120 | -$as_echo "$as_me: error: cannot compute sizeof (int) | ||
14121 | -See \`config.log' for more details." >&2;} | ||
14122 | - { (exit 77); exit 77; }; }; } | ||
14123 | - else | ||
14124 | - ac_cv_sizeof_int=0 | ||
14125 | - fi ;; | ||
14126 | -esac | ||
14127 | else | ||
14128 | - cat >conftest.$ac_ext <<_ACEOF | ||
14129 | -/* confdefs.h. */ | ||
14130 | -_ACEOF | ||
14131 | -cat confdefs.h >>conftest.$ac_ext | ||
14132 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14133 | -/* end confdefs.h. */ | ||
14134 | -$ac_includes_default | ||
14135 | -static long int longval () { return (long int) (sizeof (int)); } | ||
14136 | -static unsigned long int ulongval () { return (long int) (sizeof (int)); } | ||
14137 | -#include <stdio.h> | ||
14138 | -#include <stdlib.h> | ||
14139 | -int | ||
14140 | -main () | ||
14141 | -{ | ||
14142 | - | ||
14143 | - FILE *f = fopen ("conftest.val", "w"); | ||
14144 | - if (! f) | ||
14145 | - return 1; | ||
14146 | - if (((long int) (sizeof (int))) < 0) | ||
14147 | - { | ||
14148 | - long int i = longval (); | ||
14149 | - if (i != ((long int) (sizeof (int)))) | ||
14150 | - return 1; | ||
14151 | - fprintf (f, "%ld", i); | ||
14152 | - } | ||
14153 | - else | ||
14154 | - { | ||
14155 | - unsigned long int i = ulongval (); | ||
14156 | - if (i != ((long int) (sizeof (int)))) | ||
14157 | - return 1; | ||
14158 | - fprintf (f, "%lu", i); | ||
14159 | - } | ||
14160 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
14161 | - on some platforms. */ | ||
14162 | - return ferror (f) || fclose (f) != 0; | ||
14163 | - | ||
14164 | - ; | ||
14165 | - return 0; | ||
14166 | -} | ||
14167 | -_ACEOF | ||
14168 | -rm -f conftest$ac_exeext | ||
14169 | -if { (ac_try="$ac_link" | ||
14170 | -case "(($ac_try" in | ||
14171 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14172 | - *) ac_try_echo=$ac_try;; | ||
14173 | -esac | ||
14174 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14175 | -$as_echo "$ac_try_echo") >&5 | ||
14176 | - (eval "$ac_link") 2>&5 | ||
14177 | - ac_status=$? | ||
14178 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14179 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
14180 | - { (case "(($ac_try" in | ||
14181 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14182 | - *) ac_try_echo=$ac_try;; | ||
14183 | -esac | ||
14184 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14185 | -$as_echo "$ac_try_echo") >&5 | ||
14186 | - (eval "$ac_try") 2>&5 | ||
14187 | - ac_status=$? | ||
14188 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14189 | - (exit $ac_status); }; }; then | ||
14190 | - ac_cv_sizeof_int=`cat conftest.val` | ||
14191 | -else | ||
14192 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
14193 | -$as_echo "$as_me: failed program was:" >&5 | ||
14194 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14195 | - | ||
14196 | -( exit $ac_status ) | ||
14197 | -if test "$ac_cv_type_int" = yes; then | ||
14198 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
14199 | + if test "$ac_cv_type_int" = yes; then | ||
14200 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
14201 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
14202 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) | ||
14203 | -See \`config.log' for more details." >&5 | ||
14204 | -$as_echo "$as_me: error: cannot compute sizeof (int) | ||
14205 | -See \`config.log' for more details." >&2;} | ||
14206 | - { (exit 77); exit 77; }; }; } | ||
14207 | +as_fn_error 77 "cannot compute sizeof (int) | ||
14208 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
14209 | else | ||
14210 | ac_cv_sizeof_int=0 | ||
14211 | fi | ||
14212 | fi | ||
14213 | -rm -rf conftest.dSYM | ||
14214 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
14215 | -fi | ||
14216 | -rm -f conftest.val | ||
14217 | + | ||
14218 | fi | ||
14219 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 | ||
14220 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 | ||
14221 | $as_echo "$ac_cv_sizeof_int" >&6; } | ||
14222 | |||
14223 | |||
14224 | @@ -16715,352 +14636,26 @@ | ||
14225 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
14226 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
14227 | # This bug is HP SR number 8606223364. | ||
14228 | -{ $as_echo "$as_me:$LINENO: checking size of unsigned int" >&5 | ||
14229 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5 | ||
14230 | $as_echo_n "checking size of unsigned int... " >&6; } | ||
14231 | -if test "${ac_cv_sizeof_unsigned_int+set}" = set; then | ||
14232 | +if test "${ac_cv_sizeof_unsigned_int+set}" = set; then : | ||
14233 | $as_echo_n "(cached) " >&6 | ||
14234 | else | ||
14235 | - if test "$cross_compiling" = yes; then | ||
14236 | - # Depending upon the size, compute the lo and hi bounds. | ||
14237 | -cat >conftest.$ac_ext <<_ACEOF | ||
14238 | -/* confdefs.h. */ | ||
14239 | -_ACEOF | ||
14240 | -cat confdefs.h >>conftest.$ac_ext | ||
14241 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14242 | -/* end confdefs.h. */ | ||
14243 | -$ac_includes_default | ||
14244 | -int | ||
14245 | -main () | ||
14246 | -{ | ||
14247 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= 0)]; | ||
14248 | -test_array [0] = 0 | ||
14249 | - | ||
14250 | - ; | ||
14251 | - return 0; | ||
14252 | -} | ||
14253 | -_ACEOF | ||
14254 | -rm -f conftest.$ac_objext | ||
14255 | -if { (ac_try="$ac_compile" | ||
14256 | -case "(($ac_try" in | ||
14257 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14258 | - *) ac_try_echo=$ac_try;; | ||
14259 | -esac | ||
14260 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14261 | -$as_echo "$ac_try_echo") >&5 | ||
14262 | - (eval "$ac_compile") 2>conftest.er1 | ||
14263 | - ac_status=$? | ||
14264 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14265 | - rm -f conftest.er1 | ||
14266 | - cat conftest.err >&5 | ||
14267 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14268 | - (exit $ac_status); } && { | ||
14269 | - test -z "$ac_c_werror_flag" || | ||
14270 | - test ! -s conftest.err | ||
14271 | - } && test -s conftest.$ac_objext; then | ||
14272 | - ac_lo=0 ac_mid=0 | ||
14273 | - while :; do | ||
14274 | - cat >conftest.$ac_ext <<_ACEOF | ||
14275 | -/* confdefs.h. */ | ||
14276 | -_ACEOF | ||
14277 | -cat confdefs.h >>conftest.$ac_ext | ||
14278 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14279 | -/* end confdefs.h. */ | ||
14280 | -$ac_includes_default | ||
14281 | -int | ||
14282 | -main () | ||
14283 | -{ | ||
14284 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)]; | ||
14285 | -test_array [0] = 0 | ||
14286 | - | ||
14287 | - ; | ||
14288 | - return 0; | ||
14289 | -} | ||
14290 | -_ACEOF | ||
14291 | -rm -f conftest.$ac_objext | ||
14292 | -if { (ac_try="$ac_compile" | ||
14293 | -case "(($ac_try" in | ||
14294 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14295 | - *) ac_try_echo=$ac_try;; | ||
14296 | -esac | ||
14297 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14298 | -$as_echo "$ac_try_echo") >&5 | ||
14299 | - (eval "$ac_compile") 2>conftest.er1 | ||
14300 | - ac_status=$? | ||
14301 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14302 | - rm -f conftest.er1 | ||
14303 | - cat conftest.err >&5 | ||
14304 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14305 | - (exit $ac_status); } && { | ||
14306 | - test -z "$ac_c_werror_flag" || | ||
14307 | - test ! -s conftest.err | ||
14308 | - } && test -s conftest.$ac_objext; then | ||
14309 | - ac_hi=$ac_mid; break | ||
14310 | -else | ||
14311 | - $as_echo "$as_me: failed program was:" >&5 | ||
14312 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14313 | - | ||
14314 | - ac_lo=`expr $ac_mid + 1` | ||
14315 | - if test $ac_lo -le $ac_mid; then | ||
14316 | - ac_lo= ac_hi= | ||
14317 | - break | ||
14318 | - fi | ||
14319 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
14320 | -fi | ||
14321 | - | ||
14322 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14323 | - done | ||
14324 | -else | ||
14325 | - $as_echo "$as_me: failed program was:" >&5 | ||
14326 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14327 | - | ||
14328 | - cat >conftest.$ac_ext <<_ACEOF | ||
14329 | -/* confdefs.h. */ | ||
14330 | -_ACEOF | ||
14331 | -cat confdefs.h >>conftest.$ac_ext | ||
14332 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14333 | -/* end confdefs.h. */ | ||
14334 | -$ac_includes_default | ||
14335 | -int | ||
14336 | -main () | ||
14337 | -{ | ||
14338 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) < 0)]; | ||
14339 | -test_array [0] = 0 | ||
14340 | - | ||
14341 | - ; | ||
14342 | - return 0; | ||
14343 | -} | ||
14344 | -_ACEOF | ||
14345 | -rm -f conftest.$ac_objext | ||
14346 | -if { (ac_try="$ac_compile" | ||
14347 | -case "(($ac_try" in | ||
14348 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14349 | - *) ac_try_echo=$ac_try;; | ||
14350 | -esac | ||
14351 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14352 | -$as_echo "$ac_try_echo") >&5 | ||
14353 | - (eval "$ac_compile") 2>conftest.er1 | ||
14354 | - ac_status=$? | ||
14355 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14356 | - rm -f conftest.er1 | ||
14357 | - cat conftest.err >&5 | ||
14358 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14359 | - (exit $ac_status); } && { | ||
14360 | - test -z "$ac_c_werror_flag" || | ||
14361 | - test ! -s conftest.err | ||
14362 | - } && test -s conftest.$ac_objext; then | ||
14363 | - ac_hi=-1 ac_mid=-1 | ||
14364 | - while :; do | ||
14365 | - cat >conftest.$ac_ext <<_ACEOF | ||
14366 | -/* confdefs.h. */ | ||
14367 | -_ACEOF | ||
14368 | -cat confdefs.h >>conftest.$ac_ext | ||
14369 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14370 | -/* end confdefs.h. */ | ||
14371 | -$ac_includes_default | ||
14372 | -int | ||
14373 | -main () | ||
14374 | -{ | ||
14375 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= $ac_mid)]; | ||
14376 | -test_array [0] = 0 | ||
14377 | - | ||
14378 | - ; | ||
14379 | - return 0; | ||
14380 | -} | ||
14381 | -_ACEOF | ||
14382 | -rm -f conftest.$ac_objext | ||
14383 | -if { (ac_try="$ac_compile" | ||
14384 | -case "(($ac_try" in | ||
14385 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14386 | - *) ac_try_echo=$ac_try;; | ||
14387 | -esac | ||
14388 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14389 | -$as_echo "$ac_try_echo") >&5 | ||
14390 | - (eval "$ac_compile") 2>conftest.er1 | ||
14391 | - ac_status=$? | ||
14392 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14393 | - rm -f conftest.er1 | ||
14394 | - cat conftest.err >&5 | ||
14395 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14396 | - (exit $ac_status); } && { | ||
14397 | - test -z "$ac_c_werror_flag" || | ||
14398 | - test ! -s conftest.err | ||
14399 | - } && test -s conftest.$ac_objext; then | ||
14400 | - ac_lo=$ac_mid; break | ||
14401 | -else | ||
14402 | - $as_echo "$as_me: failed program was:" >&5 | ||
14403 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14404 | - | ||
14405 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
14406 | - if test $ac_mid -le $ac_hi; then | ||
14407 | - ac_lo= ac_hi= | ||
14408 | - break | ||
14409 | - fi | ||
14410 | - ac_mid=`expr 2 '*' $ac_mid` | ||
14411 | -fi | ||
14412 | - | ||
14413 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14414 | - done | ||
14415 | -else | ||
14416 | - $as_echo "$as_me: failed program was:" >&5 | ||
14417 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14418 | - | ||
14419 | - ac_lo= ac_hi= | ||
14420 | -fi | ||
14421 | - | ||
14422 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14423 | -fi | ||
14424 | - | ||
14425 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14426 | -# Binary search between lo and hi bounds. | ||
14427 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
14428 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
14429 | - cat >conftest.$ac_ext <<_ACEOF | ||
14430 | -/* confdefs.h. */ | ||
14431 | -_ACEOF | ||
14432 | -cat confdefs.h >>conftest.$ac_ext | ||
14433 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14434 | -/* end confdefs.h. */ | ||
14435 | -$ac_includes_default | ||
14436 | -int | ||
14437 | -main () | ||
14438 | -{ | ||
14439 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)]; | ||
14440 | -test_array [0] = 0 | ||
14441 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then : | ||
14442 | |||
14443 | - ; | ||
14444 | - return 0; | ||
14445 | -} | ||
14446 | -_ACEOF | ||
14447 | -rm -f conftest.$ac_objext | ||
14448 | -if { (ac_try="$ac_compile" | ||
14449 | -case "(($ac_try" in | ||
14450 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14451 | - *) ac_try_echo=$ac_try;; | ||
14452 | -esac | ||
14453 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14454 | -$as_echo "$ac_try_echo") >&5 | ||
14455 | - (eval "$ac_compile") 2>conftest.er1 | ||
14456 | - ac_status=$? | ||
14457 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14458 | - rm -f conftest.er1 | ||
14459 | - cat conftest.err >&5 | ||
14460 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14461 | - (exit $ac_status); } && { | ||
14462 | - test -z "$ac_c_werror_flag" || | ||
14463 | - test ! -s conftest.err | ||
14464 | - } && test -s conftest.$ac_objext; then | ||
14465 | - ac_hi=$ac_mid | ||
14466 | else | ||
14467 | - $as_echo "$as_me: failed program was:" >&5 | ||
14468 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14469 | - | ||
14470 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
14471 | -fi | ||
14472 | - | ||
14473 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14474 | -done | ||
14475 | -case $ac_lo in | ||
14476 | -?*) ac_cv_sizeof_unsigned_int=$ac_lo;; | ||
14477 | -'') if test "$ac_cv_type_unsigned_int" = yes; then | ||
14478 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
14479 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
14480 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) | ||
14481 | -See \`config.log' for more details." >&5 | ||
14482 | -$as_echo "$as_me: error: cannot compute sizeof (unsigned int) | ||
14483 | -See \`config.log' for more details." >&2;} | ||
14484 | - { (exit 77); exit 77; }; }; } | ||
14485 | - else | ||
14486 | - ac_cv_sizeof_unsigned_int=0 | ||
14487 | - fi ;; | ||
14488 | -esac | ||
14489 | -else | ||
14490 | - cat >conftest.$ac_ext <<_ACEOF | ||
14491 | -/* confdefs.h. */ | ||
14492 | -_ACEOF | ||
14493 | -cat confdefs.h >>conftest.$ac_ext | ||
14494 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14495 | -/* end confdefs.h. */ | ||
14496 | -$ac_includes_default | ||
14497 | -static long int longval () { return (long int) (sizeof (unsigned int)); } | ||
14498 | -static unsigned long int ulongval () { return (long int) (sizeof (unsigned int)); } | ||
14499 | -#include <stdio.h> | ||
14500 | -#include <stdlib.h> | ||
14501 | -int | ||
14502 | -main () | ||
14503 | -{ | ||
14504 | - | ||
14505 | - FILE *f = fopen ("conftest.val", "w"); | ||
14506 | - if (! f) | ||
14507 | - return 1; | ||
14508 | - if (((long int) (sizeof (unsigned int))) < 0) | ||
14509 | - { | ||
14510 | - long int i = longval (); | ||
14511 | - if (i != ((long int) (sizeof (unsigned int)))) | ||
14512 | - return 1; | ||
14513 | - fprintf (f, "%ld", i); | ||
14514 | - } | ||
14515 | - else | ||
14516 | - { | ||
14517 | - unsigned long int i = ulongval (); | ||
14518 | - if (i != ((long int) (sizeof (unsigned int)))) | ||
14519 | - return 1; | ||
14520 | - fprintf (f, "%lu", i); | ||
14521 | - } | ||
14522 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
14523 | - on some platforms. */ | ||
14524 | - return ferror (f) || fclose (f) != 0; | ||
14525 | - | ||
14526 | - ; | ||
14527 | - return 0; | ||
14528 | -} | ||
14529 | -_ACEOF | ||
14530 | -rm -f conftest$ac_exeext | ||
14531 | -if { (ac_try="$ac_link" | ||
14532 | -case "(($ac_try" in | ||
14533 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14534 | - *) ac_try_echo=$ac_try;; | ||
14535 | -esac | ||
14536 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14537 | -$as_echo "$ac_try_echo") >&5 | ||
14538 | - (eval "$ac_link") 2>&5 | ||
14539 | - ac_status=$? | ||
14540 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14541 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
14542 | - { (case "(($ac_try" in | ||
14543 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14544 | - *) ac_try_echo=$ac_try;; | ||
14545 | -esac | ||
14546 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14547 | -$as_echo "$ac_try_echo") >&5 | ||
14548 | - (eval "$ac_try") 2>&5 | ||
14549 | - ac_status=$? | ||
14550 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14551 | - (exit $ac_status); }; }; then | ||
14552 | - ac_cv_sizeof_unsigned_int=`cat conftest.val` | ||
14553 | -else | ||
14554 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
14555 | -$as_echo "$as_me: failed program was:" >&5 | ||
14556 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14557 | - | ||
14558 | -( exit $ac_status ) | ||
14559 | -if test "$ac_cv_type_unsigned_int" = yes; then | ||
14560 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
14561 | + if test "$ac_cv_type_unsigned_int" = yes; then | ||
14562 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
14563 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
14564 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) | ||
14565 | -See \`config.log' for more details." >&5 | ||
14566 | -$as_echo "$as_me: error: cannot compute sizeof (unsigned int) | ||
14567 | -See \`config.log' for more details." >&2;} | ||
14568 | - { (exit 77); exit 77; }; }; } | ||
14569 | +as_fn_error 77 "cannot compute sizeof (unsigned int) | ||
14570 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
14571 | else | ||
14572 | ac_cv_sizeof_unsigned_int=0 | ||
14573 | fi | ||
14574 | fi | ||
14575 | -rm -rf conftest.dSYM | ||
14576 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
14577 | -fi | ||
14578 | -rm -f conftest.val | ||
14579 | + | ||
14580 | fi | ||
14581 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5 | ||
14582 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5 | ||
14583 | $as_echo "$ac_cv_sizeof_unsigned_int" >&6; } | ||
14584 | |||
14585 | |||
14586 | @@ -17074,352 +14669,26 @@ | ||
14587 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
14588 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
14589 | # This bug is HP SR number 8606223364. | ||
14590 | -{ $as_echo "$as_me:$LINENO: checking size of long" >&5 | ||
14591 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 | ||
14592 | $as_echo_n "checking size of long... " >&6; } | ||
14593 | -if test "${ac_cv_sizeof_long+set}" = set; then | ||
14594 | +if test "${ac_cv_sizeof_long+set}" = set; then : | ||
14595 | $as_echo_n "(cached) " >&6 | ||
14596 | else | ||
14597 | - if test "$cross_compiling" = yes; then | ||
14598 | - # Depending upon the size, compute the lo and hi bounds. | ||
14599 | -cat >conftest.$ac_ext <<_ACEOF | ||
14600 | -/* confdefs.h. */ | ||
14601 | -_ACEOF | ||
14602 | -cat confdefs.h >>conftest.$ac_ext | ||
14603 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14604 | -/* end confdefs.h. */ | ||
14605 | -$ac_includes_default | ||
14606 | -int | ||
14607 | -main () | ||
14608 | -{ | ||
14609 | -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; | ||
14610 | -test_array [0] = 0 | ||
14611 | - | ||
14612 | - ; | ||
14613 | - return 0; | ||
14614 | -} | ||
14615 | -_ACEOF | ||
14616 | -rm -f conftest.$ac_objext | ||
14617 | -if { (ac_try="$ac_compile" | ||
14618 | -case "(($ac_try" in | ||
14619 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14620 | - *) ac_try_echo=$ac_try;; | ||
14621 | -esac | ||
14622 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14623 | -$as_echo "$ac_try_echo") >&5 | ||
14624 | - (eval "$ac_compile") 2>conftest.er1 | ||
14625 | - ac_status=$? | ||
14626 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14627 | - rm -f conftest.er1 | ||
14628 | - cat conftest.err >&5 | ||
14629 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14630 | - (exit $ac_status); } && { | ||
14631 | - test -z "$ac_c_werror_flag" || | ||
14632 | - test ! -s conftest.err | ||
14633 | - } && test -s conftest.$ac_objext; then | ||
14634 | - ac_lo=0 ac_mid=0 | ||
14635 | - while :; do | ||
14636 | - cat >conftest.$ac_ext <<_ACEOF | ||
14637 | -/* confdefs.h. */ | ||
14638 | -_ACEOF | ||
14639 | -cat confdefs.h >>conftest.$ac_ext | ||
14640 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14641 | -/* end confdefs.h. */ | ||
14642 | -$ac_includes_default | ||
14643 | -int | ||
14644 | -main () | ||
14645 | -{ | ||
14646 | -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; | ||
14647 | -test_array [0] = 0 | ||
14648 | - | ||
14649 | - ; | ||
14650 | - return 0; | ||
14651 | -} | ||
14652 | -_ACEOF | ||
14653 | -rm -f conftest.$ac_objext | ||
14654 | -if { (ac_try="$ac_compile" | ||
14655 | -case "(($ac_try" in | ||
14656 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14657 | - *) ac_try_echo=$ac_try;; | ||
14658 | -esac | ||
14659 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14660 | -$as_echo "$ac_try_echo") >&5 | ||
14661 | - (eval "$ac_compile") 2>conftest.er1 | ||
14662 | - ac_status=$? | ||
14663 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14664 | - rm -f conftest.er1 | ||
14665 | - cat conftest.err >&5 | ||
14666 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14667 | - (exit $ac_status); } && { | ||
14668 | - test -z "$ac_c_werror_flag" || | ||
14669 | - test ! -s conftest.err | ||
14670 | - } && test -s conftest.$ac_objext; then | ||
14671 | - ac_hi=$ac_mid; break | ||
14672 | -else | ||
14673 | - $as_echo "$as_me: failed program was:" >&5 | ||
14674 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14675 | - | ||
14676 | - ac_lo=`expr $ac_mid + 1` | ||
14677 | - if test $ac_lo -le $ac_mid; then | ||
14678 | - ac_lo= ac_hi= | ||
14679 | - break | ||
14680 | - fi | ||
14681 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
14682 | -fi | ||
14683 | - | ||
14684 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14685 | - done | ||
14686 | -else | ||
14687 | - $as_echo "$as_me: failed program was:" >&5 | ||
14688 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14689 | - | ||
14690 | - cat >conftest.$ac_ext <<_ACEOF | ||
14691 | -/* confdefs.h. */ | ||
14692 | -_ACEOF | ||
14693 | -cat confdefs.h >>conftest.$ac_ext | ||
14694 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14695 | -/* end confdefs.h. */ | ||
14696 | -$ac_includes_default | ||
14697 | -int | ||
14698 | -main () | ||
14699 | -{ | ||
14700 | -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; | ||
14701 | -test_array [0] = 0 | ||
14702 | - | ||
14703 | - ; | ||
14704 | - return 0; | ||
14705 | -} | ||
14706 | -_ACEOF | ||
14707 | -rm -f conftest.$ac_objext | ||
14708 | -if { (ac_try="$ac_compile" | ||
14709 | -case "(($ac_try" in | ||
14710 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14711 | - *) ac_try_echo=$ac_try;; | ||
14712 | -esac | ||
14713 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14714 | -$as_echo "$ac_try_echo") >&5 | ||
14715 | - (eval "$ac_compile") 2>conftest.er1 | ||
14716 | - ac_status=$? | ||
14717 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14718 | - rm -f conftest.er1 | ||
14719 | - cat conftest.err >&5 | ||
14720 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14721 | - (exit $ac_status); } && { | ||
14722 | - test -z "$ac_c_werror_flag" || | ||
14723 | - test ! -s conftest.err | ||
14724 | - } && test -s conftest.$ac_objext; then | ||
14725 | - ac_hi=-1 ac_mid=-1 | ||
14726 | - while :; do | ||
14727 | - cat >conftest.$ac_ext <<_ACEOF | ||
14728 | -/* confdefs.h. */ | ||
14729 | -_ACEOF | ||
14730 | -cat confdefs.h >>conftest.$ac_ext | ||
14731 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14732 | -/* end confdefs.h. */ | ||
14733 | -$ac_includes_default | ||
14734 | -int | ||
14735 | -main () | ||
14736 | -{ | ||
14737 | -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; | ||
14738 | -test_array [0] = 0 | ||
14739 | - | ||
14740 | - ; | ||
14741 | - return 0; | ||
14742 | -} | ||
14743 | -_ACEOF | ||
14744 | -rm -f conftest.$ac_objext | ||
14745 | -if { (ac_try="$ac_compile" | ||
14746 | -case "(($ac_try" in | ||
14747 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14748 | - *) ac_try_echo=$ac_try;; | ||
14749 | -esac | ||
14750 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14751 | -$as_echo "$ac_try_echo") >&5 | ||
14752 | - (eval "$ac_compile") 2>conftest.er1 | ||
14753 | - ac_status=$? | ||
14754 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14755 | - rm -f conftest.er1 | ||
14756 | - cat conftest.err >&5 | ||
14757 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14758 | - (exit $ac_status); } && { | ||
14759 | - test -z "$ac_c_werror_flag" || | ||
14760 | - test ! -s conftest.err | ||
14761 | - } && test -s conftest.$ac_objext; then | ||
14762 | - ac_lo=$ac_mid; break | ||
14763 | -else | ||
14764 | - $as_echo "$as_me: failed program was:" >&5 | ||
14765 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14766 | - | ||
14767 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
14768 | - if test $ac_mid -le $ac_hi; then | ||
14769 | - ac_lo= ac_hi= | ||
14770 | - break | ||
14771 | - fi | ||
14772 | - ac_mid=`expr 2 '*' $ac_mid` | ||
14773 | -fi | ||
14774 | - | ||
14775 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14776 | - done | ||
14777 | -else | ||
14778 | - $as_echo "$as_me: failed program was:" >&5 | ||
14779 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14780 | - | ||
14781 | - ac_lo= ac_hi= | ||
14782 | -fi | ||
14783 | - | ||
14784 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14785 | -fi | ||
14786 | - | ||
14787 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14788 | -# Binary search between lo and hi bounds. | ||
14789 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
14790 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
14791 | - cat >conftest.$ac_ext <<_ACEOF | ||
14792 | -/* confdefs.h. */ | ||
14793 | -_ACEOF | ||
14794 | -cat confdefs.h >>conftest.$ac_ext | ||
14795 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14796 | -/* end confdefs.h. */ | ||
14797 | -$ac_includes_default | ||
14798 | -int | ||
14799 | -main () | ||
14800 | -{ | ||
14801 | -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; | ||
14802 | -test_array [0] = 0 | ||
14803 | - | ||
14804 | - ; | ||
14805 | - return 0; | ||
14806 | -} | ||
14807 | -_ACEOF | ||
14808 | -rm -f conftest.$ac_objext | ||
14809 | -if { (ac_try="$ac_compile" | ||
14810 | -case "(($ac_try" in | ||
14811 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14812 | - *) ac_try_echo=$ac_try;; | ||
14813 | -esac | ||
14814 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14815 | -$as_echo "$ac_try_echo") >&5 | ||
14816 | - (eval "$ac_compile") 2>conftest.er1 | ||
14817 | - ac_status=$? | ||
14818 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14819 | - rm -f conftest.er1 | ||
14820 | - cat conftest.err >&5 | ||
14821 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14822 | - (exit $ac_status); } && { | ||
14823 | - test -z "$ac_c_werror_flag" || | ||
14824 | - test ! -s conftest.err | ||
14825 | - } && test -s conftest.$ac_objext; then | ||
14826 | - ac_hi=$ac_mid | ||
14827 | -else | ||
14828 | - $as_echo "$as_me: failed program was:" >&5 | ||
14829 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14830 | - | ||
14831 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
14832 | -fi | ||
14833 | - | ||
14834 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14835 | -done | ||
14836 | -case $ac_lo in | ||
14837 | -?*) ac_cv_sizeof_long=$ac_lo;; | ||
14838 | -'') if test "$ac_cv_type_long" = yes; then | ||
14839 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
14840 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
14841 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) | ||
14842 | -See \`config.log' for more details." >&5 | ||
14843 | -$as_echo "$as_me: error: cannot compute sizeof (long) | ||
14844 | -See \`config.log' for more details." >&2;} | ||
14845 | - { (exit 77); exit 77; }; }; } | ||
14846 | - else | ||
14847 | - ac_cv_sizeof_long=0 | ||
14848 | - fi ;; | ||
14849 | -esac | ||
14850 | -else | ||
14851 | - cat >conftest.$ac_ext <<_ACEOF | ||
14852 | -/* confdefs.h. */ | ||
14853 | -_ACEOF | ||
14854 | -cat confdefs.h >>conftest.$ac_ext | ||
14855 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14856 | -/* end confdefs.h. */ | ||
14857 | -$ac_includes_default | ||
14858 | -static long int longval () { return (long int) (sizeof (long)); } | ||
14859 | -static unsigned long int ulongval () { return (long int) (sizeof (long)); } | ||
14860 | -#include <stdio.h> | ||
14861 | -#include <stdlib.h> | ||
14862 | -int | ||
14863 | -main () | ||
14864 | -{ | ||
14865 | - | ||
14866 | - FILE *f = fopen ("conftest.val", "w"); | ||
14867 | - if (! f) | ||
14868 | - return 1; | ||
14869 | - if (((long int) (sizeof (long))) < 0) | ||
14870 | - { | ||
14871 | - long int i = longval (); | ||
14872 | - if (i != ((long int) (sizeof (long)))) | ||
14873 | - return 1; | ||
14874 | - fprintf (f, "%ld", i); | ||
14875 | - } | ||
14876 | - else | ||
14877 | - { | ||
14878 | - unsigned long int i = ulongval (); | ||
14879 | - if (i != ((long int) (sizeof (long)))) | ||
14880 | - return 1; | ||
14881 | - fprintf (f, "%lu", i); | ||
14882 | - } | ||
14883 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
14884 | - on some platforms. */ | ||
14885 | - return ferror (f) || fclose (f) != 0; | ||
14886 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : | ||
14887 | |||
14888 | - ; | ||
14889 | - return 0; | ||
14890 | -} | ||
14891 | -_ACEOF | ||
14892 | -rm -f conftest$ac_exeext | ||
14893 | -if { (ac_try="$ac_link" | ||
14894 | -case "(($ac_try" in | ||
14895 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14896 | - *) ac_try_echo=$ac_try;; | ||
14897 | -esac | ||
14898 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14899 | -$as_echo "$ac_try_echo") >&5 | ||
14900 | - (eval "$ac_link") 2>&5 | ||
14901 | - ac_status=$? | ||
14902 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14903 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
14904 | - { (case "(($ac_try" in | ||
14905 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14906 | - *) ac_try_echo=$ac_try;; | ||
14907 | -esac | ||
14908 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14909 | -$as_echo "$ac_try_echo") >&5 | ||
14910 | - (eval "$ac_try") 2>&5 | ||
14911 | - ac_status=$? | ||
14912 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14913 | - (exit $ac_status); }; }; then | ||
14914 | - ac_cv_sizeof_long=`cat conftest.val` | ||
14915 | else | ||
14916 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
14917 | -$as_echo "$as_me: failed program was:" >&5 | ||
14918 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
14919 | - | ||
14920 | -( exit $ac_status ) | ||
14921 | -if test "$ac_cv_type_long" = yes; then | ||
14922 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
14923 | + if test "$ac_cv_type_long" = yes; then | ||
14924 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
14925 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
14926 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) | ||
14927 | -See \`config.log' for more details." >&5 | ||
14928 | -$as_echo "$as_me: error: cannot compute sizeof (long) | ||
14929 | -See \`config.log' for more details." >&2;} | ||
14930 | - { (exit 77); exit 77; }; }; } | ||
14931 | +as_fn_error 77 "cannot compute sizeof (long) | ||
14932 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
14933 | else | ||
14934 | ac_cv_sizeof_long=0 | ||
14935 | fi | ||
14936 | fi | ||
14937 | -rm -rf conftest.dSYM | ||
14938 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
14939 | -fi | ||
14940 | -rm -f conftest.val | ||
14941 | + | ||
14942 | fi | ||
14943 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 | ||
14944 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 | ||
14945 | $as_echo "$ac_cv_sizeof_long" >&6; } | ||
14946 | |||
14947 | |||
14948 | @@ -17433,352 +14702,26 @@ | ||
14949 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
14950 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
14951 | # This bug is HP SR number 8606223364. | ||
14952 | -{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5 | ||
14953 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 | ||
14954 | $as_echo_n "checking size of unsigned long... " >&6; } | ||
14955 | -if test "${ac_cv_sizeof_unsigned_long+set}" = set; then | ||
14956 | +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then : | ||
14957 | $as_echo_n "(cached) " >&6 | ||
14958 | else | ||
14959 | - if test "$cross_compiling" = yes; then | ||
14960 | - # Depending upon the size, compute the lo and hi bounds. | ||
14961 | -cat >conftest.$ac_ext <<_ACEOF | ||
14962 | -/* confdefs.h. */ | ||
14963 | -_ACEOF | ||
14964 | -cat confdefs.h >>conftest.$ac_ext | ||
14965 | -cat >>conftest.$ac_ext <<_ACEOF | ||
14966 | -/* end confdefs.h. */ | ||
14967 | -$ac_includes_default | ||
14968 | -int | ||
14969 | -main () | ||
14970 | -{ | ||
14971 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)]; | ||
14972 | -test_array [0] = 0 | ||
14973 | - | ||
14974 | - ; | ||
14975 | - return 0; | ||
14976 | -} | ||
14977 | -_ACEOF | ||
14978 | -rm -f conftest.$ac_objext | ||
14979 | -if { (ac_try="$ac_compile" | ||
14980 | -case "(($ac_try" in | ||
14981 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14982 | - *) ac_try_echo=$ac_try;; | ||
14983 | -esac | ||
14984 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
14985 | -$as_echo "$ac_try_echo") >&5 | ||
14986 | - (eval "$ac_compile") 2>conftest.er1 | ||
14987 | - ac_status=$? | ||
14988 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
14989 | - rm -f conftest.er1 | ||
14990 | - cat conftest.err >&5 | ||
14991 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14992 | - (exit $ac_status); } && { | ||
14993 | - test -z "$ac_c_werror_flag" || | ||
14994 | - test ! -s conftest.err | ||
14995 | - } && test -s conftest.$ac_objext; then | ||
14996 | - ac_lo=0 ac_mid=0 | ||
14997 | - while :; do | ||
14998 | - cat >conftest.$ac_ext <<_ACEOF | ||
14999 | -/* confdefs.h. */ | ||
15000 | -_ACEOF | ||
15001 | -cat confdefs.h >>conftest.$ac_ext | ||
15002 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15003 | -/* end confdefs.h. */ | ||
15004 | -$ac_includes_default | ||
15005 | -int | ||
15006 | -main () | ||
15007 | -{ | ||
15008 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; | ||
15009 | -test_array [0] = 0 | ||
15010 | - | ||
15011 | - ; | ||
15012 | - return 0; | ||
15013 | -} | ||
15014 | -_ACEOF | ||
15015 | -rm -f conftest.$ac_objext | ||
15016 | -if { (ac_try="$ac_compile" | ||
15017 | -case "(($ac_try" in | ||
15018 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15019 | - *) ac_try_echo=$ac_try;; | ||
15020 | -esac | ||
15021 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15022 | -$as_echo "$ac_try_echo") >&5 | ||
15023 | - (eval "$ac_compile") 2>conftest.er1 | ||
15024 | - ac_status=$? | ||
15025 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15026 | - rm -f conftest.er1 | ||
15027 | - cat conftest.err >&5 | ||
15028 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15029 | - (exit $ac_status); } && { | ||
15030 | - test -z "$ac_c_werror_flag" || | ||
15031 | - test ! -s conftest.err | ||
15032 | - } && test -s conftest.$ac_objext; then | ||
15033 | - ac_hi=$ac_mid; break | ||
15034 | -else | ||
15035 | - $as_echo "$as_me: failed program was:" >&5 | ||
15036 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15037 | - | ||
15038 | - ac_lo=`expr $ac_mid + 1` | ||
15039 | - if test $ac_lo -le $ac_mid; then | ||
15040 | - ac_lo= ac_hi= | ||
15041 | - break | ||
15042 | - fi | ||
15043 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
15044 | -fi | ||
15045 | - | ||
15046 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15047 | - done | ||
15048 | -else | ||
15049 | - $as_echo "$as_me: failed program was:" >&5 | ||
15050 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15051 | - | ||
15052 | - cat >conftest.$ac_ext <<_ACEOF | ||
15053 | -/* confdefs.h. */ | ||
15054 | -_ACEOF | ||
15055 | -cat confdefs.h >>conftest.$ac_ext | ||
15056 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15057 | -/* end confdefs.h. */ | ||
15058 | -$ac_includes_default | ||
15059 | -int | ||
15060 | -main () | ||
15061 | -{ | ||
15062 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)]; | ||
15063 | -test_array [0] = 0 | ||
15064 | - | ||
15065 | - ; | ||
15066 | - return 0; | ||
15067 | -} | ||
15068 | -_ACEOF | ||
15069 | -rm -f conftest.$ac_objext | ||
15070 | -if { (ac_try="$ac_compile" | ||
15071 | -case "(($ac_try" in | ||
15072 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15073 | - *) ac_try_echo=$ac_try;; | ||
15074 | -esac | ||
15075 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15076 | -$as_echo "$ac_try_echo") >&5 | ||
15077 | - (eval "$ac_compile") 2>conftest.er1 | ||
15078 | - ac_status=$? | ||
15079 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15080 | - rm -f conftest.er1 | ||
15081 | - cat conftest.err >&5 | ||
15082 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15083 | - (exit $ac_status); } && { | ||
15084 | - test -z "$ac_c_werror_flag" || | ||
15085 | - test ! -s conftest.err | ||
15086 | - } && test -s conftest.$ac_objext; then | ||
15087 | - ac_hi=-1 ac_mid=-1 | ||
15088 | - while :; do | ||
15089 | - cat >conftest.$ac_ext <<_ACEOF | ||
15090 | -/* confdefs.h. */ | ||
15091 | -_ACEOF | ||
15092 | -cat confdefs.h >>conftest.$ac_ext | ||
15093 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15094 | -/* end confdefs.h. */ | ||
15095 | -$ac_includes_default | ||
15096 | -int | ||
15097 | -main () | ||
15098 | -{ | ||
15099 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)]; | ||
15100 | -test_array [0] = 0 | ||
15101 | - | ||
15102 | - ; | ||
15103 | - return 0; | ||
15104 | -} | ||
15105 | -_ACEOF | ||
15106 | -rm -f conftest.$ac_objext | ||
15107 | -if { (ac_try="$ac_compile" | ||
15108 | -case "(($ac_try" in | ||
15109 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15110 | - *) ac_try_echo=$ac_try;; | ||
15111 | -esac | ||
15112 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15113 | -$as_echo "$ac_try_echo") >&5 | ||
15114 | - (eval "$ac_compile") 2>conftest.er1 | ||
15115 | - ac_status=$? | ||
15116 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15117 | - rm -f conftest.er1 | ||
15118 | - cat conftest.err >&5 | ||
15119 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15120 | - (exit $ac_status); } && { | ||
15121 | - test -z "$ac_c_werror_flag" || | ||
15122 | - test ! -s conftest.err | ||
15123 | - } && test -s conftest.$ac_objext; then | ||
15124 | - ac_lo=$ac_mid; break | ||
15125 | -else | ||
15126 | - $as_echo "$as_me: failed program was:" >&5 | ||
15127 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15128 | - | ||
15129 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15130 | - if test $ac_mid -le $ac_hi; then | ||
15131 | - ac_lo= ac_hi= | ||
15132 | - break | ||
15133 | - fi | ||
15134 | - ac_mid=`expr 2 '*' $ac_mid` | ||
15135 | -fi | ||
15136 | - | ||
15137 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15138 | - done | ||
15139 | -else | ||
15140 | - $as_echo "$as_me: failed program was:" >&5 | ||
15141 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15142 | - | ||
15143 | - ac_lo= ac_hi= | ||
15144 | -fi | ||
15145 | - | ||
15146 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15147 | -fi | ||
15148 | - | ||
15149 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15150 | -# Binary search between lo and hi bounds. | ||
15151 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
15152 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
15153 | - cat >conftest.$ac_ext <<_ACEOF | ||
15154 | -/* confdefs.h. */ | ||
15155 | -_ACEOF | ||
15156 | -cat confdefs.h >>conftest.$ac_ext | ||
15157 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15158 | -/* end confdefs.h. */ | ||
15159 | -$ac_includes_default | ||
15160 | -int | ||
15161 | -main () | ||
15162 | -{ | ||
15163 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; | ||
15164 | -test_array [0] = 0 | ||
15165 | - | ||
15166 | - ; | ||
15167 | - return 0; | ||
15168 | -} | ||
15169 | -_ACEOF | ||
15170 | -rm -f conftest.$ac_objext | ||
15171 | -if { (ac_try="$ac_compile" | ||
15172 | -case "(($ac_try" in | ||
15173 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15174 | - *) ac_try_echo=$ac_try;; | ||
15175 | -esac | ||
15176 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15177 | -$as_echo "$ac_try_echo") >&5 | ||
15178 | - (eval "$ac_compile") 2>conftest.er1 | ||
15179 | - ac_status=$? | ||
15180 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15181 | - rm -f conftest.er1 | ||
15182 | - cat conftest.err >&5 | ||
15183 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15184 | - (exit $ac_status); } && { | ||
15185 | - test -z "$ac_c_werror_flag" || | ||
15186 | - test ! -s conftest.err | ||
15187 | - } && test -s conftest.$ac_objext; then | ||
15188 | - ac_hi=$ac_mid | ||
15189 | -else | ||
15190 | - $as_echo "$as_me: failed program was:" >&5 | ||
15191 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15192 | - | ||
15193 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
15194 | -fi | ||
15195 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : | ||
15196 | |||
15197 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15198 | -done | ||
15199 | -case $ac_lo in | ||
15200 | -?*) ac_cv_sizeof_unsigned_long=$ac_lo;; | ||
15201 | -'') if test "$ac_cv_type_unsigned_long" = yes; then | ||
15202 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
15203 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
15204 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) | ||
15205 | -See \`config.log' for more details." >&5 | ||
15206 | -$as_echo "$as_me: error: cannot compute sizeof (unsigned long) | ||
15207 | -See \`config.log' for more details." >&2;} | ||
15208 | - { (exit 77); exit 77; }; }; } | ||
15209 | - else | ||
15210 | - ac_cv_sizeof_unsigned_long=0 | ||
15211 | - fi ;; | ||
15212 | -esac | ||
15213 | else | ||
15214 | - cat >conftest.$ac_ext <<_ACEOF | ||
15215 | -/* confdefs.h. */ | ||
15216 | -_ACEOF | ||
15217 | -cat confdefs.h >>conftest.$ac_ext | ||
15218 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15219 | -/* end confdefs.h. */ | ||
15220 | -$ac_includes_default | ||
15221 | -static long int longval () { return (long int) (sizeof (unsigned long)); } | ||
15222 | -static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); } | ||
15223 | -#include <stdio.h> | ||
15224 | -#include <stdlib.h> | ||
15225 | -int | ||
15226 | -main () | ||
15227 | -{ | ||
15228 | - | ||
15229 | - FILE *f = fopen ("conftest.val", "w"); | ||
15230 | - if (! f) | ||
15231 | - return 1; | ||
15232 | - if (((long int) (sizeof (unsigned long))) < 0) | ||
15233 | - { | ||
15234 | - long int i = longval (); | ||
15235 | - if (i != ((long int) (sizeof (unsigned long)))) | ||
15236 | - return 1; | ||
15237 | - fprintf (f, "%ld", i); | ||
15238 | - } | ||
15239 | - else | ||
15240 | - { | ||
15241 | - unsigned long int i = ulongval (); | ||
15242 | - if (i != ((long int) (sizeof (unsigned long)))) | ||
15243 | - return 1; | ||
15244 | - fprintf (f, "%lu", i); | ||
15245 | - } | ||
15246 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
15247 | - on some platforms. */ | ||
15248 | - return ferror (f) || fclose (f) != 0; | ||
15249 | - | ||
15250 | - ; | ||
15251 | - return 0; | ||
15252 | -} | ||
15253 | -_ACEOF | ||
15254 | -rm -f conftest$ac_exeext | ||
15255 | -if { (ac_try="$ac_link" | ||
15256 | -case "(($ac_try" in | ||
15257 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15258 | - *) ac_try_echo=$ac_try;; | ||
15259 | -esac | ||
15260 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15261 | -$as_echo "$ac_try_echo") >&5 | ||
15262 | - (eval "$ac_link") 2>&5 | ||
15263 | - ac_status=$? | ||
15264 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15265 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
15266 | - { (case "(($ac_try" in | ||
15267 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15268 | - *) ac_try_echo=$ac_try;; | ||
15269 | -esac | ||
15270 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15271 | -$as_echo "$ac_try_echo") >&5 | ||
15272 | - (eval "$ac_try") 2>&5 | ||
15273 | - ac_status=$? | ||
15274 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15275 | - (exit $ac_status); }; }; then | ||
15276 | - ac_cv_sizeof_unsigned_long=`cat conftest.val` | ||
15277 | -else | ||
15278 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
15279 | -$as_echo "$as_me: failed program was:" >&5 | ||
15280 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15281 | - | ||
15282 | -( exit $ac_status ) | ||
15283 | -if test "$ac_cv_type_unsigned_long" = yes; then | ||
15284 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
15285 | + if test "$ac_cv_type_unsigned_long" = yes; then | ||
15286 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
15287 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
15288 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) | ||
15289 | -See \`config.log' for more details." >&5 | ||
15290 | -$as_echo "$as_me: error: cannot compute sizeof (unsigned long) | ||
15291 | -See \`config.log' for more details." >&2;} | ||
15292 | - { (exit 77); exit 77; }; }; } | ||
15293 | +as_fn_error 77 "cannot compute sizeof (unsigned long) | ||
15294 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
15295 | else | ||
15296 | ac_cv_sizeof_unsigned_long=0 | ||
15297 | fi | ||
15298 | fi | ||
15299 | -rm -rf conftest.dSYM | ||
15300 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
15301 | -fi | ||
15302 | -rm -f conftest.val | ||
15303 | + | ||
15304 | fi | ||
15305 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 | ||
15306 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 | ||
15307 | $as_echo "$ac_cv_sizeof_unsigned_long" >&6; } | ||
15308 | |||
15309 | |||
15310 | @@ -17792,352 +14735,26 @@ | ||
15311 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
15312 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
15313 | # This bug is HP SR number 8606223364. | ||
15314 | -{ $as_echo "$as_me:$LINENO: checking size of long long" >&5 | ||
15315 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 | ||
15316 | $as_echo_n "checking size of long long... " >&6; } | ||
15317 | -if test "${ac_cv_sizeof_long_long+set}" = set; then | ||
15318 | +if test "${ac_cv_sizeof_long_long+set}" = set; then : | ||
15319 | $as_echo_n "(cached) " >&6 | ||
15320 | else | ||
15321 | - if test "$cross_compiling" = yes; then | ||
15322 | - # Depending upon the size, compute the lo and hi bounds. | ||
15323 | -cat >conftest.$ac_ext <<_ACEOF | ||
15324 | -/* confdefs.h. */ | ||
15325 | -_ACEOF | ||
15326 | -cat confdefs.h >>conftest.$ac_ext | ||
15327 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15328 | -/* end confdefs.h. */ | ||
15329 | -$ac_includes_default | ||
15330 | -int | ||
15331 | -main () | ||
15332 | -{ | ||
15333 | -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)]; | ||
15334 | -test_array [0] = 0 | ||
15335 | - | ||
15336 | - ; | ||
15337 | - return 0; | ||
15338 | -} | ||
15339 | -_ACEOF | ||
15340 | -rm -f conftest.$ac_objext | ||
15341 | -if { (ac_try="$ac_compile" | ||
15342 | -case "(($ac_try" in | ||
15343 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15344 | - *) ac_try_echo=$ac_try;; | ||
15345 | -esac | ||
15346 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15347 | -$as_echo "$ac_try_echo") >&5 | ||
15348 | - (eval "$ac_compile") 2>conftest.er1 | ||
15349 | - ac_status=$? | ||
15350 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15351 | - rm -f conftest.er1 | ||
15352 | - cat conftest.err >&5 | ||
15353 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15354 | - (exit $ac_status); } && { | ||
15355 | - test -z "$ac_c_werror_flag" || | ||
15356 | - test ! -s conftest.err | ||
15357 | - } && test -s conftest.$ac_objext; then | ||
15358 | - ac_lo=0 ac_mid=0 | ||
15359 | - while :; do | ||
15360 | - cat >conftest.$ac_ext <<_ACEOF | ||
15361 | -/* confdefs.h. */ | ||
15362 | -_ACEOF | ||
15363 | -cat confdefs.h >>conftest.$ac_ext | ||
15364 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15365 | -/* end confdefs.h. */ | ||
15366 | -$ac_includes_default | ||
15367 | -int | ||
15368 | -main () | ||
15369 | -{ | ||
15370 | -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)]; | ||
15371 | -test_array [0] = 0 | ||
15372 | - | ||
15373 | - ; | ||
15374 | - return 0; | ||
15375 | -} | ||
15376 | -_ACEOF | ||
15377 | -rm -f conftest.$ac_objext | ||
15378 | -if { (ac_try="$ac_compile" | ||
15379 | -case "(($ac_try" in | ||
15380 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15381 | - *) ac_try_echo=$ac_try;; | ||
15382 | -esac | ||
15383 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15384 | -$as_echo "$ac_try_echo") >&5 | ||
15385 | - (eval "$ac_compile") 2>conftest.er1 | ||
15386 | - ac_status=$? | ||
15387 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15388 | - rm -f conftest.er1 | ||
15389 | - cat conftest.err >&5 | ||
15390 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15391 | - (exit $ac_status); } && { | ||
15392 | - test -z "$ac_c_werror_flag" || | ||
15393 | - test ! -s conftest.err | ||
15394 | - } && test -s conftest.$ac_objext; then | ||
15395 | - ac_hi=$ac_mid; break | ||
15396 | -else | ||
15397 | - $as_echo "$as_me: failed program was:" >&5 | ||
15398 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15399 | - | ||
15400 | - ac_lo=`expr $ac_mid + 1` | ||
15401 | - if test $ac_lo -le $ac_mid; then | ||
15402 | - ac_lo= ac_hi= | ||
15403 | - break | ||
15404 | - fi | ||
15405 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
15406 | -fi | ||
15407 | - | ||
15408 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15409 | - done | ||
15410 | -else | ||
15411 | - $as_echo "$as_me: failed program was:" >&5 | ||
15412 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15413 | - | ||
15414 | - cat >conftest.$ac_ext <<_ACEOF | ||
15415 | -/* confdefs.h. */ | ||
15416 | -_ACEOF | ||
15417 | -cat confdefs.h >>conftest.$ac_ext | ||
15418 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15419 | -/* end confdefs.h. */ | ||
15420 | -$ac_includes_default | ||
15421 | -int | ||
15422 | -main () | ||
15423 | -{ | ||
15424 | -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)]; | ||
15425 | -test_array [0] = 0 | ||
15426 | - | ||
15427 | - ; | ||
15428 | - return 0; | ||
15429 | -} | ||
15430 | -_ACEOF | ||
15431 | -rm -f conftest.$ac_objext | ||
15432 | -if { (ac_try="$ac_compile" | ||
15433 | -case "(($ac_try" in | ||
15434 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15435 | - *) ac_try_echo=$ac_try;; | ||
15436 | -esac | ||
15437 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15438 | -$as_echo "$ac_try_echo") >&5 | ||
15439 | - (eval "$ac_compile") 2>conftest.er1 | ||
15440 | - ac_status=$? | ||
15441 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15442 | - rm -f conftest.er1 | ||
15443 | - cat conftest.err >&5 | ||
15444 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15445 | - (exit $ac_status); } && { | ||
15446 | - test -z "$ac_c_werror_flag" || | ||
15447 | - test ! -s conftest.err | ||
15448 | - } && test -s conftest.$ac_objext; then | ||
15449 | - ac_hi=-1 ac_mid=-1 | ||
15450 | - while :; do | ||
15451 | - cat >conftest.$ac_ext <<_ACEOF | ||
15452 | -/* confdefs.h. */ | ||
15453 | -_ACEOF | ||
15454 | -cat confdefs.h >>conftest.$ac_ext | ||
15455 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15456 | -/* end confdefs.h. */ | ||
15457 | -$ac_includes_default | ||
15458 | -int | ||
15459 | -main () | ||
15460 | -{ | ||
15461 | -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)]; | ||
15462 | -test_array [0] = 0 | ||
15463 | - | ||
15464 | - ; | ||
15465 | - return 0; | ||
15466 | -} | ||
15467 | -_ACEOF | ||
15468 | -rm -f conftest.$ac_objext | ||
15469 | -if { (ac_try="$ac_compile" | ||
15470 | -case "(($ac_try" in | ||
15471 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15472 | - *) ac_try_echo=$ac_try;; | ||
15473 | -esac | ||
15474 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15475 | -$as_echo "$ac_try_echo") >&5 | ||
15476 | - (eval "$ac_compile") 2>conftest.er1 | ||
15477 | - ac_status=$? | ||
15478 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15479 | - rm -f conftest.er1 | ||
15480 | - cat conftest.err >&5 | ||
15481 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15482 | - (exit $ac_status); } && { | ||
15483 | - test -z "$ac_c_werror_flag" || | ||
15484 | - test ! -s conftest.err | ||
15485 | - } && test -s conftest.$ac_objext; then | ||
15486 | - ac_lo=$ac_mid; break | ||
15487 | -else | ||
15488 | - $as_echo "$as_me: failed program was:" >&5 | ||
15489 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15490 | - | ||
15491 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15492 | - if test $ac_mid -le $ac_hi; then | ||
15493 | - ac_lo= ac_hi= | ||
15494 | - break | ||
15495 | - fi | ||
15496 | - ac_mid=`expr 2 '*' $ac_mid` | ||
15497 | -fi | ||
15498 | - | ||
15499 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15500 | - done | ||
15501 | -else | ||
15502 | - $as_echo "$as_me: failed program was:" >&5 | ||
15503 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15504 | - | ||
15505 | - ac_lo= ac_hi= | ||
15506 | -fi | ||
15507 | - | ||
15508 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15509 | -fi | ||
15510 | - | ||
15511 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15512 | -# Binary search between lo and hi bounds. | ||
15513 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
15514 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
15515 | - cat >conftest.$ac_ext <<_ACEOF | ||
15516 | -/* confdefs.h. */ | ||
15517 | -_ACEOF | ||
15518 | -cat confdefs.h >>conftest.$ac_ext | ||
15519 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15520 | -/* end confdefs.h. */ | ||
15521 | -$ac_includes_default | ||
15522 | -int | ||
15523 | -main () | ||
15524 | -{ | ||
15525 | -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)]; | ||
15526 | -test_array [0] = 0 | ||
15527 | - | ||
15528 | - ; | ||
15529 | - return 0; | ||
15530 | -} | ||
15531 | -_ACEOF | ||
15532 | -rm -f conftest.$ac_objext | ||
15533 | -if { (ac_try="$ac_compile" | ||
15534 | -case "(($ac_try" in | ||
15535 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15536 | - *) ac_try_echo=$ac_try;; | ||
15537 | -esac | ||
15538 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15539 | -$as_echo "$ac_try_echo") >&5 | ||
15540 | - (eval "$ac_compile") 2>conftest.er1 | ||
15541 | - ac_status=$? | ||
15542 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15543 | - rm -f conftest.er1 | ||
15544 | - cat conftest.err >&5 | ||
15545 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15546 | - (exit $ac_status); } && { | ||
15547 | - test -z "$ac_c_werror_flag" || | ||
15548 | - test ! -s conftest.err | ||
15549 | - } && test -s conftest.$ac_objext; then | ||
15550 | - ac_hi=$ac_mid | ||
15551 | -else | ||
15552 | - $as_echo "$as_me: failed program was:" >&5 | ||
15553 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15554 | - | ||
15555 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
15556 | -fi | ||
15557 | - | ||
15558 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15559 | -done | ||
15560 | -case $ac_lo in | ||
15561 | -?*) ac_cv_sizeof_long_long=$ac_lo;; | ||
15562 | -'') if test "$ac_cv_type_long_long" = yes; then | ||
15563 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
15564 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
15565 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long) | ||
15566 | -See \`config.log' for more details." >&5 | ||
15567 | -$as_echo "$as_me: error: cannot compute sizeof (long long) | ||
15568 | -See \`config.log' for more details." >&2;} | ||
15569 | - { (exit 77); exit 77; }; }; } | ||
15570 | - else | ||
15571 | - ac_cv_sizeof_long_long=0 | ||
15572 | - fi ;; | ||
15573 | -esac | ||
15574 | -else | ||
15575 | - cat >conftest.$ac_ext <<_ACEOF | ||
15576 | -/* confdefs.h. */ | ||
15577 | -_ACEOF | ||
15578 | -cat confdefs.h >>conftest.$ac_ext | ||
15579 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15580 | -/* end confdefs.h. */ | ||
15581 | -$ac_includes_default | ||
15582 | -static long int longval () { return (long int) (sizeof (long long)); } | ||
15583 | -static unsigned long int ulongval () { return (long int) (sizeof (long long)); } | ||
15584 | -#include <stdio.h> | ||
15585 | -#include <stdlib.h> | ||
15586 | -int | ||
15587 | -main () | ||
15588 | -{ | ||
15589 | - | ||
15590 | - FILE *f = fopen ("conftest.val", "w"); | ||
15591 | - if (! f) | ||
15592 | - return 1; | ||
15593 | - if (((long int) (sizeof (long long))) < 0) | ||
15594 | - { | ||
15595 | - long int i = longval (); | ||
15596 | - if (i != ((long int) (sizeof (long long)))) | ||
15597 | - return 1; | ||
15598 | - fprintf (f, "%ld", i); | ||
15599 | - } | ||
15600 | - else | ||
15601 | - { | ||
15602 | - unsigned long int i = ulongval (); | ||
15603 | - if (i != ((long int) (sizeof (long long)))) | ||
15604 | - return 1; | ||
15605 | - fprintf (f, "%lu", i); | ||
15606 | - } | ||
15607 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
15608 | - on some platforms. */ | ||
15609 | - return ferror (f) || fclose (f) != 0; | ||
15610 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : | ||
15611 | |||
15612 | - ; | ||
15613 | - return 0; | ||
15614 | -} | ||
15615 | -_ACEOF | ||
15616 | -rm -f conftest$ac_exeext | ||
15617 | -if { (ac_try="$ac_link" | ||
15618 | -case "(($ac_try" in | ||
15619 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15620 | - *) ac_try_echo=$ac_try;; | ||
15621 | -esac | ||
15622 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15623 | -$as_echo "$ac_try_echo") >&5 | ||
15624 | - (eval "$ac_link") 2>&5 | ||
15625 | - ac_status=$? | ||
15626 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15627 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
15628 | - { (case "(($ac_try" in | ||
15629 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15630 | - *) ac_try_echo=$ac_try;; | ||
15631 | -esac | ||
15632 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15633 | -$as_echo "$ac_try_echo") >&5 | ||
15634 | - (eval "$ac_try") 2>&5 | ||
15635 | - ac_status=$? | ||
15636 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15637 | - (exit $ac_status); }; }; then | ||
15638 | - ac_cv_sizeof_long_long=`cat conftest.val` | ||
15639 | else | ||
15640 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
15641 | -$as_echo "$as_me: failed program was:" >&5 | ||
15642 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15643 | - | ||
15644 | -( exit $ac_status ) | ||
15645 | -if test "$ac_cv_type_long_long" = yes; then | ||
15646 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
15647 | + if test "$ac_cv_type_long_long" = yes; then | ||
15648 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
15649 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
15650 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long) | ||
15651 | -See \`config.log' for more details." >&5 | ||
15652 | -$as_echo "$as_me: error: cannot compute sizeof (long long) | ||
15653 | -See \`config.log' for more details." >&2;} | ||
15654 | - { (exit 77); exit 77; }; }; } | ||
15655 | +as_fn_error 77 "cannot compute sizeof (long long) | ||
15656 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
15657 | else | ||
15658 | ac_cv_sizeof_long_long=0 | ||
15659 | fi | ||
15660 | fi | ||
15661 | -rm -rf conftest.dSYM | ||
15662 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
15663 | -fi | ||
15664 | -rm -f conftest.val | ||
15665 | + | ||
15666 | fi | ||
15667 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 | ||
15668 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 | ||
15669 | $as_echo "$ac_cv_sizeof_long_long" >&6; } | ||
15670 | |||
15671 | |||
15672 | @@ -18151,352 +14768,26 @@ | ||
15673 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
15674 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
15675 | # This bug is HP SR number 8606223364. | ||
15676 | -{ $as_echo "$as_me:$LINENO: checking size of unsigned long long" >&5 | ||
15677 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long" >&5 | ||
15678 | $as_echo_n "checking size of unsigned long long... " >&6; } | ||
15679 | -if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then | ||
15680 | +if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then : | ||
15681 | $as_echo_n "(cached) " >&6 | ||
15682 | else | ||
15683 | - if test "$cross_compiling" = yes; then | ||
15684 | - # Depending upon the size, compute the lo and hi bounds. | ||
15685 | -cat >conftest.$ac_ext <<_ACEOF | ||
15686 | -/* confdefs.h. */ | ||
15687 | -_ACEOF | ||
15688 | -cat confdefs.h >>conftest.$ac_ext | ||
15689 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15690 | -/* end confdefs.h. */ | ||
15691 | -$ac_includes_default | ||
15692 | -int | ||
15693 | -main () | ||
15694 | -{ | ||
15695 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long long))) >= 0)]; | ||
15696 | -test_array [0] = 0 | ||
15697 | - | ||
15698 | - ; | ||
15699 | - return 0; | ||
15700 | -} | ||
15701 | -_ACEOF | ||
15702 | -rm -f conftest.$ac_objext | ||
15703 | -if { (ac_try="$ac_compile" | ||
15704 | -case "(($ac_try" in | ||
15705 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15706 | - *) ac_try_echo=$ac_try;; | ||
15707 | -esac | ||
15708 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15709 | -$as_echo "$ac_try_echo") >&5 | ||
15710 | - (eval "$ac_compile") 2>conftest.er1 | ||
15711 | - ac_status=$? | ||
15712 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15713 | - rm -f conftest.er1 | ||
15714 | - cat conftest.err >&5 | ||
15715 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15716 | - (exit $ac_status); } && { | ||
15717 | - test -z "$ac_c_werror_flag" || | ||
15718 | - test ! -s conftest.err | ||
15719 | - } && test -s conftest.$ac_objext; then | ||
15720 | - ac_lo=0 ac_mid=0 | ||
15721 | - while :; do | ||
15722 | - cat >conftest.$ac_ext <<_ACEOF | ||
15723 | -/* confdefs.h. */ | ||
15724 | -_ACEOF | ||
15725 | -cat confdefs.h >>conftest.$ac_ext | ||
15726 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15727 | -/* end confdefs.h. */ | ||
15728 | -$ac_includes_default | ||
15729 | -int | ||
15730 | -main () | ||
15731 | -{ | ||
15732 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long long))) <= $ac_mid)]; | ||
15733 | -test_array [0] = 0 | ||
15734 | - | ||
15735 | - ; | ||
15736 | - return 0; | ||
15737 | -} | ||
15738 | -_ACEOF | ||
15739 | -rm -f conftest.$ac_objext | ||
15740 | -if { (ac_try="$ac_compile" | ||
15741 | -case "(($ac_try" in | ||
15742 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15743 | - *) ac_try_echo=$ac_try;; | ||
15744 | -esac | ||
15745 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15746 | -$as_echo "$ac_try_echo") >&5 | ||
15747 | - (eval "$ac_compile") 2>conftest.er1 | ||
15748 | - ac_status=$? | ||
15749 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15750 | - rm -f conftest.er1 | ||
15751 | - cat conftest.err >&5 | ||
15752 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15753 | - (exit $ac_status); } && { | ||
15754 | - test -z "$ac_c_werror_flag" || | ||
15755 | - test ! -s conftest.err | ||
15756 | - } && test -s conftest.$ac_objext; then | ||
15757 | - ac_hi=$ac_mid; break | ||
15758 | -else | ||
15759 | - $as_echo "$as_me: failed program was:" >&5 | ||
15760 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15761 | - | ||
15762 | - ac_lo=`expr $ac_mid + 1` | ||
15763 | - if test $ac_lo -le $ac_mid; then | ||
15764 | - ac_lo= ac_hi= | ||
15765 | - break | ||
15766 | - fi | ||
15767 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
15768 | -fi | ||
15769 | - | ||
15770 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15771 | - done | ||
15772 | -else | ||
15773 | - $as_echo "$as_me: failed program was:" >&5 | ||
15774 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15775 | - | ||
15776 | - cat >conftest.$ac_ext <<_ACEOF | ||
15777 | -/* confdefs.h. */ | ||
15778 | -_ACEOF | ||
15779 | -cat confdefs.h >>conftest.$ac_ext | ||
15780 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15781 | -/* end confdefs.h. */ | ||
15782 | -$ac_includes_default | ||
15783 | -int | ||
15784 | -main () | ||
15785 | -{ | ||
15786 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long long))) < 0)]; | ||
15787 | -test_array [0] = 0 | ||
15788 | - | ||
15789 | - ; | ||
15790 | - return 0; | ||
15791 | -} | ||
15792 | -_ACEOF | ||
15793 | -rm -f conftest.$ac_objext | ||
15794 | -if { (ac_try="$ac_compile" | ||
15795 | -case "(($ac_try" in | ||
15796 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15797 | - *) ac_try_echo=$ac_try;; | ||
15798 | -esac | ||
15799 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15800 | -$as_echo "$ac_try_echo") >&5 | ||
15801 | - (eval "$ac_compile") 2>conftest.er1 | ||
15802 | - ac_status=$? | ||
15803 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15804 | - rm -f conftest.er1 | ||
15805 | - cat conftest.err >&5 | ||
15806 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15807 | - (exit $ac_status); } && { | ||
15808 | - test -z "$ac_c_werror_flag" || | ||
15809 | - test ! -s conftest.err | ||
15810 | - } && test -s conftest.$ac_objext; then | ||
15811 | - ac_hi=-1 ac_mid=-1 | ||
15812 | - while :; do | ||
15813 | - cat >conftest.$ac_ext <<_ACEOF | ||
15814 | -/* confdefs.h. */ | ||
15815 | -_ACEOF | ||
15816 | -cat confdefs.h >>conftest.$ac_ext | ||
15817 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15818 | -/* end confdefs.h. */ | ||
15819 | -$ac_includes_default | ||
15820 | -int | ||
15821 | -main () | ||
15822 | -{ | ||
15823 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long long))) >= $ac_mid)]; | ||
15824 | -test_array [0] = 0 | ||
15825 | - | ||
15826 | - ; | ||
15827 | - return 0; | ||
15828 | -} | ||
15829 | -_ACEOF | ||
15830 | -rm -f conftest.$ac_objext | ||
15831 | -if { (ac_try="$ac_compile" | ||
15832 | -case "(($ac_try" in | ||
15833 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15834 | - *) ac_try_echo=$ac_try;; | ||
15835 | -esac | ||
15836 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15837 | -$as_echo "$ac_try_echo") >&5 | ||
15838 | - (eval "$ac_compile") 2>conftest.er1 | ||
15839 | - ac_status=$? | ||
15840 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15841 | - rm -f conftest.er1 | ||
15842 | - cat conftest.err >&5 | ||
15843 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15844 | - (exit $ac_status); } && { | ||
15845 | - test -z "$ac_c_werror_flag" || | ||
15846 | - test ! -s conftest.err | ||
15847 | - } && test -s conftest.$ac_objext; then | ||
15848 | - ac_lo=$ac_mid; break | ||
15849 | -else | ||
15850 | - $as_echo "$as_me: failed program was:" >&5 | ||
15851 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15852 | - | ||
15853 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15854 | - if test $ac_mid -le $ac_hi; then | ||
15855 | - ac_lo= ac_hi= | ||
15856 | - break | ||
15857 | - fi | ||
15858 | - ac_mid=`expr 2 '*' $ac_mid` | ||
15859 | -fi | ||
15860 | - | ||
15861 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15862 | - done | ||
15863 | -else | ||
15864 | - $as_echo "$as_me: failed program was:" >&5 | ||
15865 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15866 | - | ||
15867 | - ac_lo= ac_hi= | ||
15868 | -fi | ||
15869 | - | ||
15870 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15871 | -fi | ||
15872 | - | ||
15873 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15874 | -# Binary search between lo and hi bounds. | ||
15875 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
15876 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
15877 | - cat >conftest.$ac_ext <<_ACEOF | ||
15878 | -/* confdefs.h. */ | ||
15879 | -_ACEOF | ||
15880 | -cat confdefs.h >>conftest.$ac_ext | ||
15881 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15882 | -/* end confdefs.h. */ | ||
15883 | -$ac_includes_default | ||
15884 | -int | ||
15885 | -main () | ||
15886 | -{ | ||
15887 | -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long long))) <= $ac_mid)]; | ||
15888 | -test_array [0] = 0 | ||
15889 | - | ||
15890 | - ; | ||
15891 | - return 0; | ||
15892 | -} | ||
15893 | -_ACEOF | ||
15894 | -rm -f conftest.$ac_objext | ||
15895 | -if { (ac_try="$ac_compile" | ||
15896 | -case "(($ac_try" in | ||
15897 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15898 | - *) ac_try_echo=$ac_try;; | ||
15899 | -esac | ||
15900 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15901 | -$as_echo "$ac_try_echo") >&5 | ||
15902 | - (eval "$ac_compile") 2>conftest.er1 | ||
15903 | - ac_status=$? | ||
15904 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
15905 | - rm -f conftest.er1 | ||
15906 | - cat conftest.err >&5 | ||
15907 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15908 | - (exit $ac_status); } && { | ||
15909 | - test -z "$ac_c_werror_flag" || | ||
15910 | - test ! -s conftest.err | ||
15911 | - } && test -s conftest.$ac_objext; then | ||
15912 | - ac_hi=$ac_mid | ||
15913 | -else | ||
15914 | - $as_echo "$as_me: failed program was:" >&5 | ||
15915 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
15916 | - | ||
15917 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
15918 | -fi | ||
15919 | - | ||
15920 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15921 | -done | ||
15922 | -case $ac_lo in | ||
15923 | -?*) ac_cv_sizeof_unsigned_long_long=$ac_lo;; | ||
15924 | -'') if test "$ac_cv_type_unsigned_long_long" = yes; then | ||
15925 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
15926 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
15927 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long) | ||
15928 | -See \`config.log' for more details." >&5 | ||
15929 | -$as_echo "$as_me: error: cannot compute sizeof (unsigned long long) | ||
15930 | -See \`config.log' for more details." >&2;} | ||
15931 | - { (exit 77); exit 77; }; }; } | ||
15932 | - else | ||
15933 | - ac_cv_sizeof_unsigned_long_long=0 | ||
15934 | - fi ;; | ||
15935 | -esac | ||
15936 | -else | ||
15937 | - cat >conftest.$ac_ext <<_ACEOF | ||
15938 | -/* confdefs.h. */ | ||
15939 | -_ACEOF | ||
15940 | -cat confdefs.h >>conftest.$ac_ext | ||
15941 | -cat >>conftest.$ac_ext <<_ACEOF | ||
15942 | -/* end confdefs.h. */ | ||
15943 | -$ac_includes_default | ||
15944 | -static long int longval () { return (long int) (sizeof (unsigned long long)); } | ||
15945 | -static unsigned long int ulongval () { return (long int) (sizeof (unsigned long long)); } | ||
15946 | -#include <stdio.h> | ||
15947 | -#include <stdlib.h> | ||
15948 | -int | ||
15949 | -main () | ||
15950 | -{ | ||
15951 | - | ||
15952 | - FILE *f = fopen ("conftest.val", "w"); | ||
15953 | - if (! f) | ||
15954 | - return 1; | ||
15955 | - if (((long int) (sizeof (unsigned long long))) < 0) | ||
15956 | - { | ||
15957 | - long int i = longval (); | ||
15958 | - if (i != ((long int) (sizeof (unsigned long long)))) | ||
15959 | - return 1; | ||
15960 | - fprintf (f, "%ld", i); | ||
15961 | - } | ||
15962 | - else | ||
15963 | - { | ||
15964 | - unsigned long int i = ulongval (); | ||
15965 | - if (i != ((long int) (sizeof (unsigned long long)))) | ||
15966 | - return 1; | ||
15967 | - fprintf (f, "%lu", i); | ||
15968 | - } | ||
15969 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
15970 | - on some platforms. */ | ||
15971 | - return ferror (f) || fclose (f) != 0; | ||
15972 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long))" "ac_cv_sizeof_unsigned_long_long" "$ac_includes_default"; then : | ||
15973 | |||
15974 | - ; | ||
15975 | - return 0; | ||
15976 | -} | ||
15977 | -_ACEOF | ||
15978 | -rm -f conftest$ac_exeext | ||
15979 | -if { (ac_try="$ac_link" | ||
15980 | -case "(($ac_try" in | ||
15981 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15982 | - *) ac_try_echo=$ac_try;; | ||
15983 | -esac | ||
15984 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15985 | -$as_echo "$ac_try_echo") >&5 | ||
15986 | - (eval "$ac_link") 2>&5 | ||
15987 | - ac_status=$? | ||
15988 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15989 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
15990 | - { (case "(($ac_try" in | ||
15991 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15992 | - *) ac_try_echo=$ac_try;; | ||
15993 | -esac | ||
15994 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
15995 | -$as_echo "$ac_try_echo") >&5 | ||
15996 | - (eval "$ac_try") 2>&5 | ||
15997 | - ac_status=$? | ||
15998 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15999 | - (exit $ac_status); }; }; then | ||
16000 | - ac_cv_sizeof_unsigned_long_long=`cat conftest.val` | ||
16001 | else | ||
16002 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
16003 | -$as_echo "$as_me: failed program was:" >&5 | ||
16004 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16005 | - | ||
16006 | -( exit $ac_status ) | ||
16007 | -if test "$ac_cv_type_unsigned_long_long" = yes; then | ||
16008 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
16009 | + if test "$ac_cv_type_unsigned_long_long" = yes; then | ||
16010 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
16011 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
16012 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long) | ||
16013 | -See \`config.log' for more details." >&5 | ||
16014 | -$as_echo "$as_me: error: cannot compute sizeof (unsigned long long) | ||
16015 | -See \`config.log' for more details." >&2;} | ||
16016 | - { (exit 77); exit 77; }; }; } | ||
16017 | +as_fn_error 77 "cannot compute sizeof (unsigned long long) | ||
16018 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
16019 | else | ||
16020 | ac_cv_sizeof_unsigned_long_long=0 | ||
16021 | fi | ||
16022 | fi | ||
16023 | -rm -rf conftest.dSYM | ||
16024 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
16025 | -fi | ||
16026 | -rm -f conftest.val | ||
16027 | + | ||
16028 | fi | ||
16029 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long" >&5 | ||
16030 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long" >&5 | ||
16031 | $as_echo "$ac_cv_sizeof_unsigned_long_long" >&6; } | ||
16032 | |||
16033 | |||
16034 | @@ -18510,352 +14801,26 @@ | ||
16035 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
16036 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
16037 | # This bug is HP SR number 8606223364. | ||
16038 | -{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5 | ||
16039 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 | ||
16040 | $as_echo_n "checking size of size_t... " >&6; } | ||
16041 | -if test "${ac_cv_sizeof_size_t+set}" = set; then | ||
16042 | +if test "${ac_cv_sizeof_size_t+set}" = set; then : | ||
16043 | $as_echo_n "(cached) " >&6 | ||
16044 | else | ||
16045 | - if test "$cross_compiling" = yes; then | ||
16046 | - # Depending upon the size, compute the lo and hi bounds. | ||
16047 | -cat >conftest.$ac_ext <<_ACEOF | ||
16048 | -/* confdefs.h. */ | ||
16049 | -_ACEOF | ||
16050 | -cat confdefs.h >>conftest.$ac_ext | ||
16051 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16052 | -/* end confdefs.h. */ | ||
16053 | -$ac_includes_default | ||
16054 | -int | ||
16055 | -main () | ||
16056 | -{ | ||
16057 | -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)]; | ||
16058 | -test_array [0] = 0 | ||
16059 | - | ||
16060 | - ; | ||
16061 | - return 0; | ||
16062 | -} | ||
16063 | -_ACEOF | ||
16064 | -rm -f conftest.$ac_objext | ||
16065 | -if { (ac_try="$ac_compile" | ||
16066 | -case "(($ac_try" in | ||
16067 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16068 | - *) ac_try_echo=$ac_try;; | ||
16069 | -esac | ||
16070 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16071 | -$as_echo "$ac_try_echo") >&5 | ||
16072 | - (eval "$ac_compile") 2>conftest.er1 | ||
16073 | - ac_status=$? | ||
16074 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16075 | - rm -f conftest.er1 | ||
16076 | - cat conftest.err >&5 | ||
16077 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16078 | - (exit $ac_status); } && { | ||
16079 | - test -z "$ac_c_werror_flag" || | ||
16080 | - test ! -s conftest.err | ||
16081 | - } && test -s conftest.$ac_objext; then | ||
16082 | - ac_lo=0 ac_mid=0 | ||
16083 | - while :; do | ||
16084 | - cat >conftest.$ac_ext <<_ACEOF | ||
16085 | -/* confdefs.h. */ | ||
16086 | -_ACEOF | ||
16087 | -cat confdefs.h >>conftest.$ac_ext | ||
16088 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16089 | -/* end confdefs.h. */ | ||
16090 | -$ac_includes_default | ||
16091 | -int | ||
16092 | -main () | ||
16093 | -{ | ||
16094 | -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)]; | ||
16095 | -test_array [0] = 0 | ||
16096 | - | ||
16097 | - ; | ||
16098 | - return 0; | ||
16099 | -} | ||
16100 | -_ACEOF | ||
16101 | -rm -f conftest.$ac_objext | ||
16102 | -if { (ac_try="$ac_compile" | ||
16103 | -case "(($ac_try" in | ||
16104 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16105 | - *) ac_try_echo=$ac_try;; | ||
16106 | -esac | ||
16107 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16108 | -$as_echo "$ac_try_echo") >&5 | ||
16109 | - (eval "$ac_compile") 2>conftest.er1 | ||
16110 | - ac_status=$? | ||
16111 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16112 | - rm -f conftest.er1 | ||
16113 | - cat conftest.err >&5 | ||
16114 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16115 | - (exit $ac_status); } && { | ||
16116 | - test -z "$ac_c_werror_flag" || | ||
16117 | - test ! -s conftest.err | ||
16118 | - } && test -s conftest.$ac_objext; then | ||
16119 | - ac_hi=$ac_mid; break | ||
16120 | -else | ||
16121 | - $as_echo "$as_me: failed program was:" >&5 | ||
16122 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16123 | - | ||
16124 | - ac_lo=`expr $ac_mid + 1` | ||
16125 | - if test $ac_lo -le $ac_mid; then | ||
16126 | - ac_lo= ac_hi= | ||
16127 | - break | ||
16128 | - fi | ||
16129 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
16130 | -fi | ||
16131 | - | ||
16132 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16133 | - done | ||
16134 | -else | ||
16135 | - $as_echo "$as_me: failed program was:" >&5 | ||
16136 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16137 | - | ||
16138 | - cat >conftest.$ac_ext <<_ACEOF | ||
16139 | -/* confdefs.h. */ | ||
16140 | -_ACEOF | ||
16141 | -cat confdefs.h >>conftest.$ac_ext | ||
16142 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16143 | -/* end confdefs.h. */ | ||
16144 | -$ac_includes_default | ||
16145 | -int | ||
16146 | -main () | ||
16147 | -{ | ||
16148 | -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)]; | ||
16149 | -test_array [0] = 0 | ||
16150 | - | ||
16151 | - ; | ||
16152 | - return 0; | ||
16153 | -} | ||
16154 | -_ACEOF | ||
16155 | -rm -f conftest.$ac_objext | ||
16156 | -if { (ac_try="$ac_compile" | ||
16157 | -case "(($ac_try" in | ||
16158 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16159 | - *) ac_try_echo=$ac_try;; | ||
16160 | -esac | ||
16161 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16162 | -$as_echo "$ac_try_echo") >&5 | ||
16163 | - (eval "$ac_compile") 2>conftest.er1 | ||
16164 | - ac_status=$? | ||
16165 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16166 | - rm -f conftest.er1 | ||
16167 | - cat conftest.err >&5 | ||
16168 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16169 | - (exit $ac_status); } && { | ||
16170 | - test -z "$ac_c_werror_flag" || | ||
16171 | - test ! -s conftest.err | ||
16172 | - } && test -s conftest.$ac_objext; then | ||
16173 | - ac_hi=-1 ac_mid=-1 | ||
16174 | - while :; do | ||
16175 | - cat >conftest.$ac_ext <<_ACEOF | ||
16176 | -/* confdefs.h. */ | ||
16177 | -_ACEOF | ||
16178 | -cat confdefs.h >>conftest.$ac_ext | ||
16179 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16180 | -/* end confdefs.h. */ | ||
16181 | -$ac_includes_default | ||
16182 | -int | ||
16183 | -main () | ||
16184 | -{ | ||
16185 | -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)]; | ||
16186 | -test_array [0] = 0 | ||
16187 | - | ||
16188 | - ; | ||
16189 | - return 0; | ||
16190 | -} | ||
16191 | -_ACEOF | ||
16192 | -rm -f conftest.$ac_objext | ||
16193 | -if { (ac_try="$ac_compile" | ||
16194 | -case "(($ac_try" in | ||
16195 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16196 | - *) ac_try_echo=$ac_try;; | ||
16197 | -esac | ||
16198 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16199 | -$as_echo "$ac_try_echo") >&5 | ||
16200 | - (eval "$ac_compile") 2>conftest.er1 | ||
16201 | - ac_status=$? | ||
16202 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16203 | - rm -f conftest.er1 | ||
16204 | - cat conftest.err >&5 | ||
16205 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16206 | - (exit $ac_status); } && { | ||
16207 | - test -z "$ac_c_werror_flag" || | ||
16208 | - test ! -s conftest.err | ||
16209 | - } && test -s conftest.$ac_objext; then | ||
16210 | - ac_lo=$ac_mid; break | ||
16211 | -else | ||
16212 | - $as_echo "$as_me: failed program was:" >&5 | ||
16213 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16214 | - | ||
16215 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
16216 | - if test $ac_mid -le $ac_hi; then | ||
16217 | - ac_lo= ac_hi= | ||
16218 | - break | ||
16219 | - fi | ||
16220 | - ac_mid=`expr 2 '*' $ac_mid` | ||
16221 | -fi | ||
16222 | - | ||
16223 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16224 | - done | ||
16225 | -else | ||
16226 | - $as_echo "$as_me: failed program was:" >&5 | ||
16227 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16228 | - | ||
16229 | - ac_lo= ac_hi= | ||
16230 | -fi | ||
16231 | - | ||
16232 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16233 | -fi | ||
16234 | - | ||
16235 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16236 | -# Binary search between lo and hi bounds. | ||
16237 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
16238 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
16239 | - cat >conftest.$ac_ext <<_ACEOF | ||
16240 | -/* confdefs.h. */ | ||
16241 | -_ACEOF | ||
16242 | -cat confdefs.h >>conftest.$ac_ext | ||
16243 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16244 | -/* end confdefs.h. */ | ||
16245 | -$ac_includes_default | ||
16246 | -int | ||
16247 | -main () | ||
16248 | -{ | ||
16249 | -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)]; | ||
16250 | -test_array [0] = 0 | ||
16251 | - | ||
16252 | - ; | ||
16253 | - return 0; | ||
16254 | -} | ||
16255 | -_ACEOF | ||
16256 | -rm -f conftest.$ac_objext | ||
16257 | -if { (ac_try="$ac_compile" | ||
16258 | -case "(($ac_try" in | ||
16259 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16260 | - *) ac_try_echo=$ac_try;; | ||
16261 | -esac | ||
16262 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16263 | -$as_echo "$ac_try_echo") >&5 | ||
16264 | - (eval "$ac_compile") 2>conftest.er1 | ||
16265 | - ac_status=$? | ||
16266 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16267 | - rm -f conftest.er1 | ||
16268 | - cat conftest.err >&5 | ||
16269 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16270 | - (exit $ac_status); } && { | ||
16271 | - test -z "$ac_c_werror_flag" || | ||
16272 | - test ! -s conftest.err | ||
16273 | - } && test -s conftest.$ac_objext; then | ||
16274 | - ac_hi=$ac_mid | ||
16275 | -else | ||
16276 | - $as_echo "$as_me: failed program was:" >&5 | ||
16277 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16278 | - | ||
16279 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
16280 | -fi | ||
16281 | - | ||
16282 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16283 | -done | ||
16284 | -case $ac_lo in | ||
16285 | -?*) ac_cv_sizeof_size_t=$ac_lo;; | ||
16286 | -'') if test "$ac_cv_type_size_t" = yes; then | ||
16287 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
16288 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
16289 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) | ||
16290 | -See \`config.log' for more details." >&5 | ||
16291 | -$as_echo "$as_me: error: cannot compute sizeof (size_t) | ||
16292 | -See \`config.log' for more details." >&2;} | ||
16293 | - { (exit 77); exit 77; }; }; } | ||
16294 | - else | ||
16295 | - ac_cv_sizeof_size_t=0 | ||
16296 | - fi ;; | ||
16297 | -esac | ||
16298 | -else | ||
16299 | - cat >conftest.$ac_ext <<_ACEOF | ||
16300 | -/* confdefs.h. */ | ||
16301 | -_ACEOF | ||
16302 | -cat confdefs.h >>conftest.$ac_ext | ||
16303 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16304 | -/* end confdefs.h. */ | ||
16305 | -$ac_includes_default | ||
16306 | -static long int longval () { return (long int) (sizeof (size_t)); } | ||
16307 | -static unsigned long int ulongval () { return (long int) (sizeof (size_t)); } | ||
16308 | -#include <stdio.h> | ||
16309 | -#include <stdlib.h> | ||
16310 | -int | ||
16311 | -main () | ||
16312 | -{ | ||
16313 | - | ||
16314 | - FILE *f = fopen ("conftest.val", "w"); | ||
16315 | - if (! f) | ||
16316 | - return 1; | ||
16317 | - if (((long int) (sizeof (size_t))) < 0) | ||
16318 | - { | ||
16319 | - long int i = longval (); | ||
16320 | - if (i != ((long int) (sizeof (size_t)))) | ||
16321 | - return 1; | ||
16322 | - fprintf (f, "%ld", i); | ||
16323 | - } | ||
16324 | - else | ||
16325 | - { | ||
16326 | - unsigned long int i = ulongval (); | ||
16327 | - if (i != ((long int) (sizeof (size_t)))) | ||
16328 | - return 1; | ||
16329 | - fprintf (f, "%lu", i); | ||
16330 | - } | ||
16331 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
16332 | - on some platforms. */ | ||
16333 | - return ferror (f) || fclose (f) != 0; | ||
16334 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : | ||
16335 | |||
16336 | - ; | ||
16337 | - return 0; | ||
16338 | -} | ||
16339 | -_ACEOF | ||
16340 | -rm -f conftest$ac_exeext | ||
16341 | -if { (ac_try="$ac_link" | ||
16342 | -case "(($ac_try" in | ||
16343 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16344 | - *) ac_try_echo=$ac_try;; | ||
16345 | -esac | ||
16346 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16347 | -$as_echo "$ac_try_echo") >&5 | ||
16348 | - (eval "$ac_link") 2>&5 | ||
16349 | - ac_status=$? | ||
16350 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16351 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
16352 | - { (case "(($ac_try" in | ||
16353 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16354 | - *) ac_try_echo=$ac_try;; | ||
16355 | -esac | ||
16356 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16357 | -$as_echo "$ac_try_echo") >&5 | ||
16358 | - (eval "$ac_try") 2>&5 | ||
16359 | - ac_status=$? | ||
16360 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16361 | - (exit $ac_status); }; }; then | ||
16362 | - ac_cv_sizeof_size_t=`cat conftest.val` | ||
16363 | else | ||
16364 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
16365 | -$as_echo "$as_me: failed program was:" >&5 | ||
16366 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16367 | - | ||
16368 | -( exit $ac_status ) | ||
16369 | -if test "$ac_cv_type_size_t" = yes; then | ||
16370 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
16371 | + if test "$ac_cv_type_size_t" = yes; then | ||
16372 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
16373 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
16374 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) | ||
16375 | -See \`config.log' for more details." >&5 | ||
16376 | -$as_echo "$as_me: error: cannot compute sizeof (size_t) | ||
16377 | -See \`config.log' for more details." >&2;} | ||
16378 | - { (exit 77); exit 77; }; }; } | ||
16379 | +as_fn_error 77 "cannot compute sizeof (size_t) | ||
16380 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
16381 | else | ||
16382 | ac_cv_sizeof_size_t=0 | ||
16383 | fi | ||
16384 | fi | ||
16385 | -rm -rf conftest.dSYM | ||
16386 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
16387 | -fi | ||
16388 | -rm -f conftest.val | ||
16389 | + | ||
16390 | fi | ||
16391 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 | ||
16392 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 | ||
16393 | $as_echo "$ac_cv_sizeof_size_t" >&6; } | ||
16394 | |||
16395 | |||
16396 | @@ -18869,352 +14834,26 @@ | ||
16397 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
16398 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
16399 | # This bug is HP SR number 8606223364. | ||
16400 | -{ $as_echo "$as_me:$LINENO: checking size of ptrdiff_t" >&5 | ||
16401 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5 | ||
16402 | $as_echo_n "checking size of ptrdiff_t... " >&6; } | ||
16403 | -if test "${ac_cv_sizeof_ptrdiff_t+set}" = set; then | ||
16404 | +if test "${ac_cv_sizeof_ptrdiff_t+set}" = set; then : | ||
16405 | $as_echo_n "(cached) " >&6 | ||
16406 | else | ||
16407 | - if test "$cross_compiling" = yes; then | ||
16408 | - # Depending upon the size, compute the lo and hi bounds. | ||
16409 | -cat >conftest.$ac_ext <<_ACEOF | ||
16410 | -/* confdefs.h. */ | ||
16411 | -_ACEOF | ||
16412 | -cat confdefs.h >>conftest.$ac_ext | ||
16413 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16414 | -/* end confdefs.h. */ | ||
16415 | -$ac_includes_default | ||
16416 | -int | ||
16417 | -main () | ||
16418 | -{ | ||
16419 | -static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) >= 0)]; | ||
16420 | -test_array [0] = 0 | ||
16421 | - | ||
16422 | - ; | ||
16423 | - return 0; | ||
16424 | -} | ||
16425 | -_ACEOF | ||
16426 | -rm -f conftest.$ac_objext | ||
16427 | -if { (ac_try="$ac_compile" | ||
16428 | -case "(($ac_try" in | ||
16429 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16430 | - *) ac_try_echo=$ac_try;; | ||
16431 | -esac | ||
16432 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16433 | -$as_echo "$ac_try_echo") >&5 | ||
16434 | - (eval "$ac_compile") 2>conftest.er1 | ||
16435 | - ac_status=$? | ||
16436 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16437 | - rm -f conftest.er1 | ||
16438 | - cat conftest.err >&5 | ||
16439 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16440 | - (exit $ac_status); } && { | ||
16441 | - test -z "$ac_c_werror_flag" || | ||
16442 | - test ! -s conftest.err | ||
16443 | - } && test -s conftest.$ac_objext; then | ||
16444 | - ac_lo=0 ac_mid=0 | ||
16445 | - while :; do | ||
16446 | - cat >conftest.$ac_ext <<_ACEOF | ||
16447 | -/* confdefs.h. */ | ||
16448 | -_ACEOF | ||
16449 | -cat confdefs.h >>conftest.$ac_ext | ||
16450 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16451 | -/* end confdefs.h. */ | ||
16452 | -$ac_includes_default | ||
16453 | -int | ||
16454 | -main () | ||
16455 | -{ | ||
16456 | -static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) <= $ac_mid)]; | ||
16457 | -test_array [0] = 0 | ||
16458 | - | ||
16459 | - ; | ||
16460 | - return 0; | ||
16461 | -} | ||
16462 | -_ACEOF | ||
16463 | -rm -f conftest.$ac_objext | ||
16464 | -if { (ac_try="$ac_compile" | ||
16465 | -case "(($ac_try" in | ||
16466 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16467 | - *) ac_try_echo=$ac_try;; | ||
16468 | -esac | ||
16469 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16470 | -$as_echo "$ac_try_echo") >&5 | ||
16471 | - (eval "$ac_compile") 2>conftest.er1 | ||
16472 | - ac_status=$? | ||
16473 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16474 | - rm -f conftest.er1 | ||
16475 | - cat conftest.err >&5 | ||
16476 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16477 | - (exit $ac_status); } && { | ||
16478 | - test -z "$ac_c_werror_flag" || | ||
16479 | - test ! -s conftest.err | ||
16480 | - } && test -s conftest.$ac_objext; then | ||
16481 | - ac_hi=$ac_mid; break | ||
16482 | -else | ||
16483 | - $as_echo "$as_me: failed program was:" >&5 | ||
16484 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16485 | - | ||
16486 | - ac_lo=`expr $ac_mid + 1` | ||
16487 | - if test $ac_lo -le $ac_mid; then | ||
16488 | - ac_lo= ac_hi= | ||
16489 | - break | ||
16490 | - fi | ||
16491 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
16492 | -fi | ||
16493 | - | ||
16494 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16495 | - done | ||
16496 | -else | ||
16497 | - $as_echo "$as_me: failed program was:" >&5 | ||
16498 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16499 | - | ||
16500 | - cat >conftest.$ac_ext <<_ACEOF | ||
16501 | -/* confdefs.h. */ | ||
16502 | -_ACEOF | ||
16503 | -cat confdefs.h >>conftest.$ac_ext | ||
16504 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16505 | -/* end confdefs.h. */ | ||
16506 | -$ac_includes_default | ||
16507 | -int | ||
16508 | -main () | ||
16509 | -{ | ||
16510 | -static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) < 0)]; | ||
16511 | -test_array [0] = 0 | ||
16512 | - | ||
16513 | - ; | ||
16514 | - return 0; | ||
16515 | -} | ||
16516 | -_ACEOF | ||
16517 | -rm -f conftest.$ac_objext | ||
16518 | -if { (ac_try="$ac_compile" | ||
16519 | -case "(($ac_try" in | ||
16520 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16521 | - *) ac_try_echo=$ac_try;; | ||
16522 | -esac | ||
16523 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16524 | -$as_echo "$ac_try_echo") >&5 | ||
16525 | - (eval "$ac_compile") 2>conftest.er1 | ||
16526 | - ac_status=$? | ||
16527 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16528 | - rm -f conftest.er1 | ||
16529 | - cat conftest.err >&5 | ||
16530 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16531 | - (exit $ac_status); } && { | ||
16532 | - test -z "$ac_c_werror_flag" || | ||
16533 | - test ! -s conftest.err | ||
16534 | - } && test -s conftest.$ac_objext; then | ||
16535 | - ac_hi=-1 ac_mid=-1 | ||
16536 | - while :; do | ||
16537 | - cat >conftest.$ac_ext <<_ACEOF | ||
16538 | -/* confdefs.h. */ | ||
16539 | -_ACEOF | ||
16540 | -cat confdefs.h >>conftest.$ac_ext | ||
16541 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16542 | -/* end confdefs.h. */ | ||
16543 | -$ac_includes_default | ||
16544 | -int | ||
16545 | -main () | ||
16546 | -{ | ||
16547 | -static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) >= $ac_mid)]; | ||
16548 | -test_array [0] = 0 | ||
16549 | - | ||
16550 | - ; | ||
16551 | - return 0; | ||
16552 | -} | ||
16553 | -_ACEOF | ||
16554 | -rm -f conftest.$ac_objext | ||
16555 | -if { (ac_try="$ac_compile" | ||
16556 | -case "(($ac_try" in | ||
16557 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16558 | - *) ac_try_echo=$ac_try;; | ||
16559 | -esac | ||
16560 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16561 | -$as_echo "$ac_try_echo") >&5 | ||
16562 | - (eval "$ac_compile") 2>conftest.er1 | ||
16563 | - ac_status=$? | ||
16564 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16565 | - rm -f conftest.er1 | ||
16566 | - cat conftest.err >&5 | ||
16567 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16568 | - (exit $ac_status); } && { | ||
16569 | - test -z "$ac_c_werror_flag" || | ||
16570 | - test ! -s conftest.err | ||
16571 | - } && test -s conftest.$ac_objext; then | ||
16572 | - ac_lo=$ac_mid; break | ||
16573 | -else | ||
16574 | - $as_echo "$as_me: failed program was:" >&5 | ||
16575 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16576 | - | ||
16577 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
16578 | - if test $ac_mid -le $ac_hi; then | ||
16579 | - ac_lo= ac_hi= | ||
16580 | - break | ||
16581 | - fi | ||
16582 | - ac_mid=`expr 2 '*' $ac_mid` | ||
16583 | -fi | ||
16584 | - | ||
16585 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16586 | - done | ||
16587 | -else | ||
16588 | - $as_echo "$as_me: failed program was:" >&5 | ||
16589 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16590 | - | ||
16591 | - ac_lo= ac_hi= | ||
16592 | -fi | ||
16593 | - | ||
16594 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16595 | -fi | ||
16596 | - | ||
16597 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16598 | -# Binary search between lo and hi bounds. | ||
16599 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
16600 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
16601 | - cat >conftest.$ac_ext <<_ACEOF | ||
16602 | -/* confdefs.h. */ | ||
16603 | -_ACEOF | ||
16604 | -cat confdefs.h >>conftest.$ac_ext | ||
16605 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16606 | -/* end confdefs.h. */ | ||
16607 | -$ac_includes_default | ||
16608 | -int | ||
16609 | -main () | ||
16610 | -{ | ||
16611 | -static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) <= $ac_mid)]; | ||
16612 | -test_array [0] = 0 | ||
16613 | - | ||
16614 | - ; | ||
16615 | - return 0; | ||
16616 | -} | ||
16617 | -_ACEOF | ||
16618 | -rm -f conftest.$ac_objext | ||
16619 | -if { (ac_try="$ac_compile" | ||
16620 | -case "(($ac_try" in | ||
16621 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16622 | - *) ac_try_echo=$ac_try;; | ||
16623 | -esac | ||
16624 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16625 | -$as_echo "$ac_try_echo") >&5 | ||
16626 | - (eval "$ac_compile") 2>conftest.er1 | ||
16627 | - ac_status=$? | ||
16628 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16629 | - rm -f conftest.er1 | ||
16630 | - cat conftest.err >&5 | ||
16631 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16632 | - (exit $ac_status); } && { | ||
16633 | - test -z "$ac_c_werror_flag" || | ||
16634 | - test ! -s conftest.err | ||
16635 | - } && test -s conftest.$ac_objext; then | ||
16636 | - ac_hi=$ac_mid | ||
16637 | -else | ||
16638 | - $as_echo "$as_me: failed program was:" >&5 | ||
16639 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16640 | - | ||
16641 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
16642 | -fi | ||
16643 | - | ||
16644 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16645 | -done | ||
16646 | -case $ac_lo in | ||
16647 | -?*) ac_cv_sizeof_ptrdiff_t=$ac_lo;; | ||
16648 | -'') if test "$ac_cv_type_ptrdiff_t" = yes; then | ||
16649 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
16650 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
16651 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (ptrdiff_t) | ||
16652 | -See \`config.log' for more details." >&5 | ||
16653 | -$as_echo "$as_me: error: cannot compute sizeof (ptrdiff_t) | ||
16654 | -See \`config.log' for more details." >&2;} | ||
16655 | - { (exit 77); exit 77; }; }; } | ||
16656 | - else | ||
16657 | - ac_cv_sizeof_ptrdiff_t=0 | ||
16658 | - fi ;; | ||
16659 | -esac | ||
16660 | -else | ||
16661 | - cat >conftest.$ac_ext <<_ACEOF | ||
16662 | -/* confdefs.h. */ | ||
16663 | -_ACEOF | ||
16664 | -cat confdefs.h >>conftest.$ac_ext | ||
16665 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16666 | -/* end confdefs.h. */ | ||
16667 | -$ac_includes_default | ||
16668 | -static long int longval () { return (long int) (sizeof (ptrdiff_t)); } | ||
16669 | -static unsigned long int ulongval () { return (long int) (sizeof (ptrdiff_t)); } | ||
16670 | -#include <stdio.h> | ||
16671 | -#include <stdlib.h> | ||
16672 | -int | ||
16673 | -main () | ||
16674 | -{ | ||
16675 | - | ||
16676 | - FILE *f = fopen ("conftest.val", "w"); | ||
16677 | - if (! f) | ||
16678 | - return 1; | ||
16679 | - if (((long int) (sizeof (ptrdiff_t))) < 0) | ||
16680 | - { | ||
16681 | - long int i = longval (); | ||
16682 | - if (i != ((long int) (sizeof (ptrdiff_t)))) | ||
16683 | - return 1; | ||
16684 | - fprintf (f, "%ld", i); | ||
16685 | - } | ||
16686 | - else | ||
16687 | - { | ||
16688 | - unsigned long int i = ulongval (); | ||
16689 | - if (i != ((long int) (sizeof (ptrdiff_t)))) | ||
16690 | - return 1; | ||
16691 | - fprintf (f, "%lu", i); | ||
16692 | - } | ||
16693 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
16694 | - on some platforms. */ | ||
16695 | - return ferror (f) || fclose (f) != 0; | ||
16696 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ptrdiff_t))" "ac_cv_sizeof_ptrdiff_t" "$ac_includes_default"; then : | ||
16697 | |||
16698 | - ; | ||
16699 | - return 0; | ||
16700 | -} | ||
16701 | -_ACEOF | ||
16702 | -rm -f conftest$ac_exeext | ||
16703 | -if { (ac_try="$ac_link" | ||
16704 | -case "(($ac_try" in | ||
16705 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16706 | - *) ac_try_echo=$ac_try;; | ||
16707 | -esac | ||
16708 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16709 | -$as_echo "$ac_try_echo") >&5 | ||
16710 | - (eval "$ac_link") 2>&5 | ||
16711 | - ac_status=$? | ||
16712 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16713 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
16714 | - { (case "(($ac_try" in | ||
16715 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16716 | - *) ac_try_echo=$ac_try;; | ||
16717 | -esac | ||
16718 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16719 | -$as_echo "$ac_try_echo") >&5 | ||
16720 | - (eval "$ac_try") 2>&5 | ||
16721 | - ac_status=$? | ||
16722 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16723 | - (exit $ac_status); }; }; then | ||
16724 | - ac_cv_sizeof_ptrdiff_t=`cat conftest.val` | ||
16725 | else | ||
16726 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
16727 | -$as_echo "$as_me: failed program was:" >&5 | ||
16728 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16729 | - | ||
16730 | -( exit $ac_status ) | ||
16731 | -if test "$ac_cv_type_ptrdiff_t" = yes; then | ||
16732 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
16733 | + if test "$ac_cv_type_ptrdiff_t" = yes; then | ||
16734 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
16735 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
16736 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (ptrdiff_t) | ||
16737 | -See \`config.log' for more details." >&5 | ||
16738 | -$as_echo "$as_me: error: cannot compute sizeof (ptrdiff_t) | ||
16739 | -See \`config.log' for more details." >&2;} | ||
16740 | - { (exit 77); exit 77; }; }; } | ||
16741 | +as_fn_error 77 "cannot compute sizeof (ptrdiff_t) | ||
16742 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
16743 | else | ||
16744 | ac_cv_sizeof_ptrdiff_t=0 | ||
16745 | fi | ||
16746 | fi | ||
16747 | -rm -rf conftest.dSYM | ||
16748 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
16749 | -fi | ||
16750 | -rm -f conftest.val | ||
16751 | + | ||
16752 | fi | ||
16753 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_ptrdiff_t" >&5 | ||
16754 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ptrdiff_t" >&5 | ||
16755 | $as_echo "$ac_cv_sizeof_ptrdiff_t" >&6; } | ||
16756 | |||
16757 | |||
16758 | @@ -19225,109 +14864,12 @@ | ||
16759 | |||
16760 | |||
16761 | |||
16762 | -{ $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5 | ||
16763 | -$as_echo_n "checking for uintptr_t... " >&6; } | ||
16764 | -if test "${ac_cv_type_uintptr_t+set}" = set; then | ||
16765 | - $as_echo_n "(cached) " >&6 | ||
16766 | -else | ||
16767 | - ac_cv_type_uintptr_t=no | ||
16768 | -cat >conftest.$ac_ext <<_ACEOF | ||
16769 | -/* confdefs.h. */ | ||
16770 | -_ACEOF | ||
16771 | -cat confdefs.h >>conftest.$ac_ext | ||
16772 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16773 | -/* end confdefs.h. */ | ||
16774 | -$ac_includes_default | ||
16775 | -#ifdef HAVE_STDINT_H | ||
16776 | -# include <stdint.h> | ||
16777 | -#endif | ||
16778 | - | ||
16779 | -int | ||
16780 | -main () | ||
16781 | -{ | ||
16782 | -if (sizeof (uintptr_t)) | ||
16783 | - return 0; | ||
16784 | - ; | ||
16785 | - return 0; | ||
16786 | -} | ||
16787 | -_ACEOF | ||
16788 | -rm -f conftest.$ac_objext | ||
16789 | -if { (ac_try="$ac_compile" | ||
16790 | -case "(($ac_try" in | ||
16791 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16792 | - *) ac_try_echo=$ac_try;; | ||
16793 | -esac | ||
16794 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16795 | -$as_echo "$ac_try_echo") >&5 | ||
16796 | - (eval "$ac_compile") 2>conftest.er1 | ||
16797 | - ac_status=$? | ||
16798 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16799 | - rm -f conftest.er1 | ||
16800 | - cat conftest.err >&5 | ||
16801 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16802 | - (exit $ac_status); } && { | ||
16803 | - test -z "$ac_c_werror_flag" || | ||
16804 | - test ! -s conftest.err | ||
16805 | - } && test -s conftest.$ac_objext; then | ||
16806 | - cat >conftest.$ac_ext <<_ACEOF | ||
16807 | -/* confdefs.h. */ | ||
16808 | -_ACEOF | ||
16809 | -cat confdefs.h >>conftest.$ac_ext | ||
16810 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16811 | -/* end confdefs.h. */ | ||
16812 | -$ac_includes_default | ||
16813 | +ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default | ||
16814 | #ifdef HAVE_STDINT_H | ||
16815 | # include <stdint.h> | ||
16816 | #endif | ||
16817 | - | ||
16818 | -int | ||
16819 | -main () | ||
16820 | -{ | ||
16821 | -if (sizeof ((uintptr_t))) | ||
16822 | - return 0; | ||
16823 | - ; | ||
16824 | - return 0; | ||
16825 | -} | ||
16826 | -_ACEOF | ||
16827 | -rm -f conftest.$ac_objext | ||
16828 | -if { (ac_try="$ac_compile" | ||
16829 | -case "(($ac_try" in | ||
16830 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16831 | - *) ac_try_echo=$ac_try;; | ||
16832 | -esac | ||
16833 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16834 | -$as_echo "$ac_try_echo") >&5 | ||
16835 | - (eval "$ac_compile") 2>conftest.er1 | ||
16836 | - ac_status=$? | ||
16837 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16838 | - rm -f conftest.er1 | ||
16839 | - cat conftest.err >&5 | ||
16840 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16841 | - (exit $ac_status); } && { | ||
16842 | - test -z "$ac_c_werror_flag" || | ||
16843 | - test ! -s conftest.err | ||
16844 | - } && test -s conftest.$ac_objext; then | ||
16845 | - : | ||
16846 | -else | ||
16847 | - $as_echo "$as_me: failed program was:" >&5 | ||
16848 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16849 | - | ||
16850 | - ac_cv_type_uintptr_t=yes | ||
16851 | -fi | ||
16852 | - | ||
16853 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16854 | -else | ||
16855 | - $as_echo "$as_me: failed program was:" >&5 | ||
16856 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16857 | - | ||
16858 | - | ||
16859 | -fi | ||
16860 | - | ||
16861 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16862 | -fi | ||
16863 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 | ||
16864 | -$as_echo "$ac_cv_type_uintptr_t" >&6; } | ||
16865 | -if test "x$ac_cv_type_uintptr_t" = x""yes; then | ||
16866 | +" | ||
16867 | +if test "x$ac_cv_type_uintptr_t" = x""yes; then : | ||
16868 | |||
16869 | cat >>confdefs.h <<_ACEOF | ||
16870 | #define HAVE_UINTPTR_T 1 | ||
16871 | @@ -19339,352 +14881,26 @@ | ||
16872 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
16873 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
16874 | # This bug is HP SR number 8606223364. | ||
16875 | -{ $as_echo "$as_me:$LINENO: checking size of void *" >&5 | ||
16876 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 | ||
16877 | $as_echo_n "checking size of void *... " >&6; } | ||
16878 | -if test "${ac_cv_sizeof_void_p+set}" = set; then | ||
16879 | +if test "${ac_cv_sizeof_void_p+set}" = set; then : | ||
16880 | $as_echo_n "(cached) " >&6 | ||
16881 | else | ||
16882 | - if test "$cross_compiling" = yes; then | ||
16883 | - # Depending upon the size, compute the lo and hi bounds. | ||
16884 | -cat >conftest.$ac_ext <<_ACEOF | ||
16885 | -/* confdefs.h. */ | ||
16886 | -_ACEOF | ||
16887 | -cat confdefs.h >>conftest.$ac_ext | ||
16888 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16889 | -/* end confdefs.h. */ | ||
16890 | -$ac_includes_default | ||
16891 | -int | ||
16892 | -main () | ||
16893 | -{ | ||
16894 | -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)]; | ||
16895 | -test_array [0] = 0 | ||
16896 | - | ||
16897 | - ; | ||
16898 | - return 0; | ||
16899 | -} | ||
16900 | -_ACEOF | ||
16901 | -rm -f conftest.$ac_objext | ||
16902 | -if { (ac_try="$ac_compile" | ||
16903 | -case "(($ac_try" in | ||
16904 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16905 | - *) ac_try_echo=$ac_try;; | ||
16906 | -esac | ||
16907 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16908 | -$as_echo "$ac_try_echo") >&5 | ||
16909 | - (eval "$ac_compile") 2>conftest.er1 | ||
16910 | - ac_status=$? | ||
16911 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16912 | - rm -f conftest.er1 | ||
16913 | - cat conftest.err >&5 | ||
16914 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16915 | - (exit $ac_status); } && { | ||
16916 | - test -z "$ac_c_werror_flag" || | ||
16917 | - test ! -s conftest.err | ||
16918 | - } && test -s conftest.$ac_objext; then | ||
16919 | - ac_lo=0 ac_mid=0 | ||
16920 | - while :; do | ||
16921 | - cat >conftest.$ac_ext <<_ACEOF | ||
16922 | -/* confdefs.h. */ | ||
16923 | -_ACEOF | ||
16924 | -cat confdefs.h >>conftest.$ac_ext | ||
16925 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16926 | -/* end confdefs.h. */ | ||
16927 | -$ac_includes_default | ||
16928 | -int | ||
16929 | -main () | ||
16930 | -{ | ||
16931 | -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)]; | ||
16932 | -test_array [0] = 0 | ||
16933 | - | ||
16934 | - ; | ||
16935 | - return 0; | ||
16936 | -} | ||
16937 | -_ACEOF | ||
16938 | -rm -f conftest.$ac_objext | ||
16939 | -if { (ac_try="$ac_compile" | ||
16940 | -case "(($ac_try" in | ||
16941 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16942 | - *) ac_try_echo=$ac_try;; | ||
16943 | -esac | ||
16944 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16945 | -$as_echo "$ac_try_echo") >&5 | ||
16946 | - (eval "$ac_compile") 2>conftest.er1 | ||
16947 | - ac_status=$? | ||
16948 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
16949 | - rm -f conftest.er1 | ||
16950 | - cat conftest.err >&5 | ||
16951 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16952 | - (exit $ac_status); } && { | ||
16953 | - test -z "$ac_c_werror_flag" || | ||
16954 | - test ! -s conftest.err | ||
16955 | - } && test -s conftest.$ac_objext; then | ||
16956 | - ac_hi=$ac_mid; break | ||
16957 | -else | ||
16958 | - $as_echo "$as_me: failed program was:" >&5 | ||
16959 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16960 | - | ||
16961 | - ac_lo=`expr $ac_mid + 1` | ||
16962 | - if test $ac_lo -le $ac_mid; then | ||
16963 | - ac_lo= ac_hi= | ||
16964 | - break | ||
16965 | - fi | ||
16966 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
16967 | -fi | ||
16968 | - | ||
16969 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16970 | - done | ||
16971 | -else | ||
16972 | - $as_echo "$as_me: failed program was:" >&5 | ||
16973 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
16974 | - | ||
16975 | - cat >conftest.$ac_ext <<_ACEOF | ||
16976 | -/* confdefs.h. */ | ||
16977 | -_ACEOF | ||
16978 | -cat confdefs.h >>conftest.$ac_ext | ||
16979 | -cat >>conftest.$ac_ext <<_ACEOF | ||
16980 | -/* end confdefs.h. */ | ||
16981 | -$ac_includes_default | ||
16982 | -int | ||
16983 | -main () | ||
16984 | -{ | ||
16985 | -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)]; | ||
16986 | -test_array [0] = 0 | ||
16987 | - | ||
16988 | - ; | ||
16989 | - return 0; | ||
16990 | -} | ||
16991 | -_ACEOF | ||
16992 | -rm -f conftest.$ac_objext | ||
16993 | -if { (ac_try="$ac_compile" | ||
16994 | -case "(($ac_try" in | ||
16995 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16996 | - *) ac_try_echo=$ac_try;; | ||
16997 | -esac | ||
16998 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
16999 | -$as_echo "$ac_try_echo") >&5 | ||
17000 | - (eval "$ac_compile") 2>conftest.er1 | ||
17001 | - ac_status=$? | ||
17002 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17003 | - rm -f conftest.er1 | ||
17004 | - cat conftest.err >&5 | ||
17005 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17006 | - (exit $ac_status); } && { | ||
17007 | - test -z "$ac_c_werror_flag" || | ||
17008 | - test ! -s conftest.err | ||
17009 | - } && test -s conftest.$ac_objext; then | ||
17010 | - ac_hi=-1 ac_mid=-1 | ||
17011 | - while :; do | ||
17012 | - cat >conftest.$ac_ext <<_ACEOF | ||
17013 | -/* confdefs.h. */ | ||
17014 | -_ACEOF | ||
17015 | -cat confdefs.h >>conftest.$ac_ext | ||
17016 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17017 | -/* end confdefs.h. */ | ||
17018 | -$ac_includes_default | ||
17019 | -int | ||
17020 | -main () | ||
17021 | -{ | ||
17022 | -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)]; | ||
17023 | -test_array [0] = 0 | ||
17024 | - | ||
17025 | - ; | ||
17026 | - return 0; | ||
17027 | -} | ||
17028 | -_ACEOF | ||
17029 | -rm -f conftest.$ac_objext | ||
17030 | -if { (ac_try="$ac_compile" | ||
17031 | -case "(($ac_try" in | ||
17032 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17033 | - *) ac_try_echo=$ac_try;; | ||
17034 | -esac | ||
17035 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17036 | -$as_echo "$ac_try_echo") >&5 | ||
17037 | - (eval "$ac_compile") 2>conftest.er1 | ||
17038 | - ac_status=$? | ||
17039 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17040 | - rm -f conftest.er1 | ||
17041 | - cat conftest.err >&5 | ||
17042 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17043 | - (exit $ac_status); } && { | ||
17044 | - test -z "$ac_c_werror_flag" || | ||
17045 | - test ! -s conftest.err | ||
17046 | - } && test -s conftest.$ac_objext; then | ||
17047 | - ac_lo=$ac_mid; break | ||
17048 | -else | ||
17049 | - $as_echo "$as_me: failed program was:" >&5 | ||
17050 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17051 | - | ||
17052 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
17053 | - if test $ac_mid -le $ac_hi; then | ||
17054 | - ac_lo= ac_hi= | ||
17055 | - break | ||
17056 | - fi | ||
17057 | - ac_mid=`expr 2 '*' $ac_mid` | ||
17058 | -fi | ||
17059 | - | ||
17060 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17061 | - done | ||
17062 | -else | ||
17063 | - $as_echo "$as_me: failed program was:" >&5 | ||
17064 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17065 | - | ||
17066 | - ac_lo= ac_hi= | ||
17067 | -fi | ||
17068 | - | ||
17069 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17070 | -fi | ||
17071 | - | ||
17072 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17073 | -# Binary search between lo and hi bounds. | ||
17074 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
17075 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
17076 | - cat >conftest.$ac_ext <<_ACEOF | ||
17077 | -/* confdefs.h. */ | ||
17078 | -_ACEOF | ||
17079 | -cat confdefs.h >>conftest.$ac_ext | ||
17080 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17081 | -/* end confdefs.h. */ | ||
17082 | -$ac_includes_default | ||
17083 | -int | ||
17084 | -main () | ||
17085 | -{ | ||
17086 | -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)]; | ||
17087 | -test_array [0] = 0 | ||
17088 | - | ||
17089 | - ; | ||
17090 | - return 0; | ||
17091 | -} | ||
17092 | -_ACEOF | ||
17093 | -rm -f conftest.$ac_objext | ||
17094 | -if { (ac_try="$ac_compile" | ||
17095 | -case "(($ac_try" in | ||
17096 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17097 | - *) ac_try_echo=$ac_try;; | ||
17098 | -esac | ||
17099 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17100 | -$as_echo "$ac_try_echo") >&5 | ||
17101 | - (eval "$ac_compile") 2>conftest.er1 | ||
17102 | - ac_status=$? | ||
17103 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17104 | - rm -f conftest.er1 | ||
17105 | - cat conftest.err >&5 | ||
17106 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17107 | - (exit $ac_status); } && { | ||
17108 | - test -z "$ac_c_werror_flag" || | ||
17109 | - test ! -s conftest.err | ||
17110 | - } && test -s conftest.$ac_objext; then | ||
17111 | - ac_hi=$ac_mid | ||
17112 | -else | ||
17113 | - $as_echo "$as_me: failed program was:" >&5 | ||
17114 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17115 | - | ||
17116 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
17117 | -fi | ||
17118 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : | ||
17119 | |||
17120 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17121 | -done | ||
17122 | -case $ac_lo in | ||
17123 | -?*) ac_cv_sizeof_void_p=$ac_lo;; | ||
17124 | -'') if test "$ac_cv_type_void_p" = yes; then | ||
17125 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
17126 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
17127 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *) | ||
17128 | -See \`config.log' for more details." >&5 | ||
17129 | -$as_echo "$as_me: error: cannot compute sizeof (void *) | ||
17130 | -See \`config.log' for more details." >&2;} | ||
17131 | - { (exit 77); exit 77; }; }; } | ||
17132 | - else | ||
17133 | - ac_cv_sizeof_void_p=0 | ||
17134 | - fi ;; | ||
17135 | -esac | ||
17136 | else | ||
17137 | - cat >conftest.$ac_ext <<_ACEOF | ||
17138 | -/* confdefs.h. */ | ||
17139 | -_ACEOF | ||
17140 | -cat confdefs.h >>conftest.$ac_ext | ||
17141 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17142 | -/* end confdefs.h. */ | ||
17143 | -$ac_includes_default | ||
17144 | -static long int longval () { return (long int) (sizeof (void *)); } | ||
17145 | -static unsigned long int ulongval () { return (long int) (sizeof (void *)); } | ||
17146 | -#include <stdio.h> | ||
17147 | -#include <stdlib.h> | ||
17148 | -int | ||
17149 | -main () | ||
17150 | -{ | ||
17151 | - | ||
17152 | - FILE *f = fopen ("conftest.val", "w"); | ||
17153 | - if (! f) | ||
17154 | - return 1; | ||
17155 | - if (((long int) (sizeof (void *))) < 0) | ||
17156 | - { | ||
17157 | - long int i = longval (); | ||
17158 | - if (i != ((long int) (sizeof (void *)))) | ||
17159 | - return 1; | ||
17160 | - fprintf (f, "%ld", i); | ||
17161 | - } | ||
17162 | - else | ||
17163 | - { | ||
17164 | - unsigned long int i = ulongval (); | ||
17165 | - if (i != ((long int) (sizeof (void *)))) | ||
17166 | - return 1; | ||
17167 | - fprintf (f, "%lu", i); | ||
17168 | - } | ||
17169 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
17170 | - on some platforms. */ | ||
17171 | - return ferror (f) || fclose (f) != 0; | ||
17172 | - | ||
17173 | - ; | ||
17174 | - return 0; | ||
17175 | -} | ||
17176 | -_ACEOF | ||
17177 | -rm -f conftest$ac_exeext | ||
17178 | -if { (ac_try="$ac_link" | ||
17179 | -case "(($ac_try" in | ||
17180 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17181 | - *) ac_try_echo=$ac_try;; | ||
17182 | -esac | ||
17183 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17184 | -$as_echo "$ac_try_echo") >&5 | ||
17185 | - (eval "$ac_link") 2>&5 | ||
17186 | - ac_status=$? | ||
17187 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17188 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
17189 | - { (case "(($ac_try" in | ||
17190 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17191 | - *) ac_try_echo=$ac_try;; | ||
17192 | -esac | ||
17193 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17194 | -$as_echo "$ac_try_echo") >&5 | ||
17195 | - (eval "$ac_try") 2>&5 | ||
17196 | - ac_status=$? | ||
17197 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17198 | - (exit $ac_status); }; }; then | ||
17199 | - ac_cv_sizeof_void_p=`cat conftest.val` | ||
17200 | -else | ||
17201 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
17202 | -$as_echo "$as_me: failed program was:" >&5 | ||
17203 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17204 | - | ||
17205 | -( exit $ac_status ) | ||
17206 | -if test "$ac_cv_type_void_p" = yes; then | ||
17207 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
17208 | + if test "$ac_cv_type_void_p" = yes; then | ||
17209 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
17210 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
17211 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *) | ||
17212 | -See \`config.log' for more details." >&5 | ||
17213 | -$as_echo "$as_me: error: cannot compute sizeof (void *) | ||
17214 | -See \`config.log' for more details." >&2;} | ||
17215 | - { (exit 77); exit 77; }; }; } | ||
17216 | +as_fn_error 77 "cannot compute sizeof (void *) | ||
17217 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
17218 | else | ||
17219 | ac_cv_sizeof_void_p=0 | ||
17220 | fi | ||
17221 | fi | ||
17222 | -rm -rf conftest.dSYM | ||
17223 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
17224 | -fi | ||
17225 | -rm -f conftest.val | ||
17226 | + | ||
17227 | fi | ||
17228 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 | ||
17229 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 | ||
17230 | $as_echo "$ac_cv_sizeof_void_p" >&6; } | ||
17231 | |||
17232 | |||
17233 | @@ -19701,352 +14917,26 @@ | ||
17234 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
17235 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
17236 | # This bug is HP SR number 8606223364. | ||
17237 | -{ $as_echo "$as_me:$LINENO: checking size of float" >&5 | ||
17238 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 | ||
17239 | $as_echo_n "checking size of float... " >&6; } | ||
17240 | -if test "${ac_cv_sizeof_float+set}" = set; then | ||
17241 | +if test "${ac_cv_sizeof_float+set}" = set; then : | ||
17242 | $as_echo_n "(cached) " >&6 | ||
17243 | else | ||
17244 | - if test "$cross_compiling" = yes; then | ||
17245 | - # Depending upon the size, compute the lo and hi bounds. | ||
17246 | -cat >conftest.$ac_ext <<_ACEOF | ||
17247 | -/* confdefs.h. */ | ||
17248 | -_ACEOF | ||
17249 | -cat confdefs.h >>conftest.$ac_ext | ||
17250 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17251 | -/* end confdefs.h. */ | ||
17252 | -$ac_includes_default | ||
17253 | -int | ||
17254 | -main () | ||
17255 | -{ | ||
17256 | -static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= 0)]; | ||
17257 | -test_array [0] = 0 | ||
17258 | - | ||
17259 | - ; | ||
17260 | - return 0; | ||
17261 | -} | ||
17262 | -_ACEOF | ||
17263 | -rm -f conftest.$ac_objext | ||
17264 | -if { (ac_try="$ac_compile" | ||
17265 | -case "(($ac_try" in | ||
17266 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17267 | - *) ac_try_echo=$ac_try;; | ||
17268 | -esac | ||
17269 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17270 | -$as_echo "$ac_try_echo") >&5 | ||
17271 | - (eval "$ac_compile") 2>conftest.er1 | ||
17272 | - ac_status=$? | ||
17273 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17274 | - rm -f conftest.er1 | ||
17275 | - cat conftest.err >&5 | ||
17276 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17277 | - (exit $ac_status); } && { | ||
17278 | - test -z "$ac_c_werror_flag" || | ||
17279 | - test ! -s conftest.err | ||
17280 | - } && test -s conftest.$ac_objext; then | ||
17281 | - ac_lo=0 ac_mid=0 | ||
17282 | - while :; do | ||
17283 | - cat >conftest.$ac_ext <<_ACEOF | ||
17284 | -/* confdefs.h. */ | ||
17285 | -_ACEOF | ||
17286 | -cat confdefs.h >>conftest.$ac_ext | ||
17287 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17288 | -/* end confdefs.h. */ | ||
17289 | -$ac_includes_default | ||
17290 | -int | ||
17291 | -main () | ||
17292 | -{ | ||
17293 | -static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)]; | ||
17294 | -test_array [0] = 0 | ||
17295 | - | ||
17296 | - ; | ||
17297 | - return 0; | ||
17298 | -} | ||
17299 | -_ACEOF | ||
17300 | -rm -f conftest.$ac_objext | ||
17301 | -if { (ac_try="$ac_compile" | ||
17302 | -case "(($ac_try" in | ||
17303 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17304 | - *) ac_try_echo=$ac_try;; | ||
17305 | -esac | ||
17306 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17307 | -$as_echo "$ac_try_echo") >&5 | ||
17308 | - (eval "$ac_compile") 2>conftest.er1 | ||
17309 | - ac_status=$? | ||
17310 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17311 | - rm -f conftest.er1 | ||
17312 | - cat conftest.err >&5 | ||
17313 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17314 | - (exit $ac_status); } && { | ||
17315 | - test -z "$ac_c_werror_flag" || | ||
17316 | - test ! -s conftest.err | ||
17317 | - } && test -s conftest.$ac_objext; then | ||
17318 | - ac_hi=$ac_mid; break | ||
17319 | -else | ||
17320 | - $as_echo "$as_me: failed program was:" >&5 | ||
17321 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17322 | - | ||
17323 | - ac_lo=`expr $ac_mid + 1` | ||
17324 | - if test $ac_lo -le $ac_mid; then | ||
17325 | - ac_lo= ac_hi= | ||
17326 | - break | ||
17327 | - fi | ||
17328 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
17329 | -fi | ||
17330 | - | ||
17331 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17332 | - done | ||
17333 | -else | ||
17334 | - $as_echo "$as_me: failed program was:" >&5 | ||
17335 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17336 | - | ||
17337 | - cat >conftest.$ac_ext <<_ACEOF | ||
17338 | -/* confdefs.h. */ | ||
17339 | -_ACEOF | ||
17340 | -cat confdefs.h >>conftest.$ac_ext | ||
17341 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17342 | -/* end confdefs.h. */ | ||
17343 | -$ac_includes_default | ||
17344 | -int | ||
17345 | -main () | ||
17346 | -{ | ||
17347 | -static int test_array [1 - 2 * !(((long int) (sizeof (float))) < 0)]; | ||
17348 | -test_array [0] = 0 | ||
17349 | - | ||
17350 | - ; | ||
17351 | - return 0; | ||
17352 | -} | ||
17353 | -_ACEOF | ||
17354 | -rm -f conftest.$ac_objext | ||
17355 | -if { (ac_try="$ac_compile" | ||
17356 | -case "(($ac_try" in | ||
17357 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17358 | - *) ac_try_echo=$ac_try;; | ||
17359 | -esac | ||
17360 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17361 | -$as_echo "$ac_try_echo") >&5 | ||
17362 | - (eval "$ac_compile") 2>conftest.er1 | ||
17363 | - ac_status=$? | ||
17364 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17365 | - rm -f conftest.er1 | ||
17366 | - cat conftest.err >&5 | ||
17367 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17368 | - (exit $ac_status); } && { | ||
17369 | - test -z "$ac_c_werror_flag" || | ||
17370 | - test ! -s conftest.err | ||
17371 | - } && test -s conftest.$ac_objext; then | ||
17372 | - ac_hi=-1 ac_mid=-1 | ||
17373 | - while :; do | ||
17374 | - cat >conftest.$ac_ext <<_ACEOF | ||
17375 | -/* confdefs.h. */ | ||
17376 | -_ACEOF | ||
17377 | -cat confdefs.h >>conftest.$ac_ext | ||
17378 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17379 | -/* end confdefs.h. */ | ||
17380 | -$ac_includes_default | ||
17381 | -int | ||
17382 | -main () | ||
17383 | -{ | ||
17384 | -static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= $ac_mid)]; | ||
17385 | -test_array [0] = 0 | ||
17386 | - | ||
17387 | - ; | ||
17388 | - return 0; | ||
17389 | -} | ||
17390 | -_ACEOF | ||
17391 | -rm -f conftest.$ac_objext | ||
17392 | -if { (ac_try="$ac_compile" | ||
17393 | -case "(($ac_try" in | ||
17394 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17395 | - *) ac_try_echo=$ac_try;; | ||
17396 | -esac | ||
17397 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17398 | -$as_echo "$ac_try_echo") >&5 | ||
17399 | - (eval "$ac_compile") 2>conftest.er1 | ||
17400 | - ac_status=$? | ||
17401 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17402 | - rm -f conftest.er1 | ||
17403 | - cat conftest.err >&5 | ||
17404 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17405 | - (exit $ac_status); } && { | ||
17406 | - test -z "$ac_c_werror_flag" || | ||
17407 | - test ! -s conftest.err | ||
17408 | - } && test -s conftest.$ac_objext; then | ||
17409 | - ac_lo=$ac_mid; break | ||
17410 | -else | ||
17411 | - $as_echo "$as_me: failed program was:" >&5 | ||
17412 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17413 | - | ||
17414 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
17415 | - if test $ac_mid -le $ac_hi; then | ||
17416 | - ac_lo= ac_hi= | ||
17417 | - break | ||
17418 | - fi | ||
17419 | - ac_mid=`expr 2 '*' $ac_mid` | ||
17420 | -fi | ||
17421 | - | ||
17422 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17423 | - done | ||
17424 | -else | ||
17425 | - $as_echo "$as_me: failed program was:" >&5 | ||
17426 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17427 | - | ||
17428 | - ac_lo= ac_hi= | ||
17429 | -fi | ||
17430 | - | ||
17431 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17432 | -fi | ||
17433 | - | ||
17434 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17435 | -# Binary search between lo and hi bounds. | ||
17436 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
17437 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
17438 | - cat >conftest.$ac_ext <<_ACEOF | ||
17439 | -/* confdefs.h. */ | ||
17440 | -_ACEOF | ||
17441 | -cat confdefs.h >>conftest.$ac_ext | ||
17442 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17443 | -/* end confdefs.h. */ | ||
17444 | -$ac_includes_default | ||
17445 | -int | ||
17446 | -main () | ||
17447 | -{ | ||
17448 | -static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)]; | ||
17449 | -test_array [0] = 0 | ||
17450 | - | ||
17451 | - ; | ||
17452 | - return 0; | ||
17453 | -} | ||
17454 | -_ACEOF | ||
17455 | -rm -f conftest.$ac_objext | ||
17456 | -if { (ac_try="$ac_compile" | ||
17457 | -case "(($ac_try" in | ||
17458 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17459 | - *) ac_try_echo=$ac_try;; | ||
17460 | -esac | ||
17461 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17462 | -$as_echo "$ac_try_echo") >&5 | ||
17463 | - (eval "$ac_compile") 2>conftest.er1 | ||
17464 | - ac_status=$? | ||
17465 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17466 | - rm -f conftest.er1 | ||
17467 | - cat conftest.err >&5 | ||
17468 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17469 | - (exit $ac_status); } && { | ||
17470 | - test -z "$ac_c_werror_flag" || | ||
17471 | - test ! -s conftest.err | ||
17472 | - } && test -s conftest.$ac_objext; then | ||
17473 | - ac_hi=$ac_mid | ||
17474 | -else | ||
17475 | - $as_echo "$as_me: failed program was:" >&5 | ||
17476 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17477 | - | ||
17478 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
17479 | -fi | ||
17480 | - | ||
17481 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17482 | -done | ||
17483 | -case $ac_lo in | ||
17484 | -?*) ac_cv_sizeof_float=$ac_lo;; | ||
17485 | -'') if test "$ac_cv_type_float" = yes; then | ||
17486 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
17487 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
17488 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float) | ||
17489 | -See \`config.log' for more details." >&5 | ||
17490 | -$as_echo "$as_me: error: cannot compute sizeof (float) | ||
17491 | -See \`config.log' for more details." >&2;} | ||
17492 | - { (exit 77); exit 77; }; }; } | ||
17493 | - else | ||
17494 | - ac_cv_sizeof_float=0 | ||
17495 | - fi ;; | ||
17496 | -esac | ||
17497 | -else | ||
17498 | - cat >conftest.$ac_ext <<_ACEOF | ||
17499 | -/* confdefs.h. */ | ||
17500 | -_ACEOF | ||
17501 | -cat confdefs.h >>conftest.$ac_ext | ||
17502 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17503 | -/* end confdefs.h. */ | ||
17504 | -$ac_includes_default | ||
17505 | -static long int longval () { return (long int) (sizeof (float)); } | ||
17506 | -static unsigned long int ulongval () { return (long int) (sizeof (float)); } | ||
17507 | -#include <stdio.h> | ||
17508 | -#include <stdlib.h> | ||
17509 | -int | ||
17510 | -main () | ||
17511 | -{ | ||
17512 | - | ||
17513 | - FILE *f = fopen ("conftest.val", "w"); | ||
17514 | - if (! f) | ||
17515 | - return 1; | ||
17516 | - if (((long int) (sizeof (float))) < 0) | ||
17517 | - { | ||
17518 | - long int i = longval (); | ||
17519 | - if (i != ((long int) (sizeof (float)))) | ||
17520 | - return 1; | ||
17521 | - fprintf (f, "%ld", i); | ||
17522 | - } | ||
17523 | - else | ||
17524 | - { | ||
17525 | - unsigned long int i = ulongval (); | ||
17526 | - if (i != ((long int) (sizeof (float)))) | ||
17527 | - return 1; | ||
17528 | - fprintf (f, "%lu", i); | ||
17529 | - } | ||
17530 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
17531 | - on some platforms. */ | ||
17532 | - return ferror (f) || fclose (f) != 0; | ||
17533 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then : | ||
17534 | |||
17535 | - ; | ||
17536 | - return 0; | ||
17537 | -} | ||
17538 | -_ACEOF | ||
17539 | -rm -f conftest$ac_exeext | ||
17540 | -if { (ac_try="$ac_link" | ||
17541 | -case "(($ac_try" in | ||
17542 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17543 | - *) ac_try_echo=$ac_try;; | ||
17544 | -esac | ||
17545 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17546 | -$as_echo "$ac_try_echo") >&5 | ||
17547 | - (eval "$ac_link") 2>&5 | ||
17548 | - ac_status=$? | ||
17549 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17550 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
17551 | - { (case "(($ac_try" in | ||
17552 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17553 | - *) ac_try_echo=$ac_try;; | ||
17554 | -esac | ||
17555 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17556 | -$as_echo "$ac_try_echo") >&5 | ||
17557 | - (eval "$ac_try") 2>&5 | ||
17558 | - ac_status=$? | ||
17559 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17560 | - (exit $ac_status); }; }; then | ||
17561 | - ac_cv_sizeof_float=`cat conftest.val` | ||
17562 | else | ||
17563 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
17564 | -$as_echo "$as_me: failed program was:" >&5 | ||
17565 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17566 | - | ||
17567 | -( exit $ac_status ) | ||
17568 | -if test "$ac_cv_type_float" = yes; then | ||
17569 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
17570 | + if test "$ac_cv_type_float" = yes; then | ||
17571 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
17572 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
17573 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float) | ||
17574 | -See \`config.log' for more details." >&5 | ||
17575 | -$as_echo "$as_me: error: cannot compute sizeof (float) | ||
17576 | -See \`config.log' for more details." >&2;} | ||
17577 | - { (exit 77); exit 77; }; }; } | ||
17578 | +as_fn_error 77 "cannot compute sizeof (float) | ||
17579 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
17580 | else | ||
17581 | ac_cv_sizeof_float=0 | ||
17582 | fi | ||
17583 | fi | ||
17584 | -rm -rf conftest.dSYM | ||
17585 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
17586 | -fi | ||
17587 | -rm -f conftest.val | ||
17588 | + | ||
17589 | fi | ||
17590 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5 | ||
17591 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5 | ||
17592 | $as_echo "$ac_cv_sizeof_float" >&6; } | ||
17593 | |||
17594 | |||
17595 | @@ -20060,352 +14950,26 @@ | ||
17596 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
17597 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
17598 | # This bug is HP SR number 8606223364. | ||
17599 | -{ $as_echo "$as_me:$LINENO: checking size of double" >&5 | ||
17600 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 | ||
17601 | $as_echo_n "checking size of double... " >&6; } | ||
17602 | -if test "${ac_cv_sizeof_double+set}" = set; then | ||
17603 | +if test "${ac_cv_sizeof_double+set}" = set; then : | ||
17604 | $as_echo_n "(cached) " >&6 | ||
17605 | else | ||
17606 | - if test "$cross_compiling" = yes; then | ||
17607 | - # Depending upon the size, compute the lo and hi bounds. | ||
17608 | -cat >conftest.$ac_ext <<_ACEOF | ||
17609 | -/* confdefs.h. */ | ||
17610 | -_ACEOF | ||
17611 | -cat confdefs.h >>conftest.$ac_ext | ||
17612 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17613 | -/* end confdefs.h. */ | ||
17614 | -$ac_includes_default | ||
17615 | -int | ||
17616 | -main () | ||
17617 | -{ | ||
17618 | -static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)]; | ||
17619 | -test_array [0] = 0 | ||
17620 | - | ||
17621 | - ; | ||
17622 | - return 0; | ||
17623 | -} | ||
17624 | -_ACEOF | ||
17625 | -rm -f conftest.$ac_objext | ||
17626 | -if { (ac_try="$ac_compile" | ||
17627 | -case "(($ac_try" in | ||
17628 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17629 | - *) ac_try_echo=$ac_try;; | ||
17630 | -esac | ||
17631 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17632 | -$as_echo "$ac_try_echo") >&5 | ||
17633 | - (eval "$ac_compile") 2>conftest.er1 | ||
17634 | - ac_status=$? | ||
17635 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17636 | - rm -f conftest.er1 | ||
17637 | - cat conftest.err >&5 | ||
17638 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17639 | - (exit $ac_status); } && { | ||
17640 | - test -z "$ac_c_werror_flag" || | ||
17641 | - test ! -s conftest.err | ||
17642 | - } && test -s conftest.$ac_objext; then | ||
17643 | - ac_lo=0 ac_mid=0 | ||
17644 | - while :; do | ||
17645 | - cat >conftest.$ac_ext <<_ACEOF | ||
17646 | -/* confdefs.h. */ | ||
17647 | -_ACEOF | ||
17648 | -cat confdefs.h >>conftest.$ac_ext | ||
17649 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17650 | -/* end confdefs.h. */ | ||
17651 | -$ac_includes_default | ||
17652 | -int | ||
17653 | -main () | ||
17654 | -{ | ||
17655 | -static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)]; | ||
17656 | -test_array [0] = 0 | ||
17657 | - | ||
17658 | - ; | ||
17659 | - return 0; | ||
17660 | -} | ||
17661 | -_ACEOF | ||
17662 | -rm -f conftest.$ac_objext | ||
17663 | -if { (ac_try="$ac_compile" | ||
17664 | -case "(($ac_try" in | ||
17665 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17666 | - *) ac_try_echo=$ac_try;; | ||
17667 | -esac | ||
17668 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17669 | -$as_echo "$ac_try_echo") >&5 | ||
17670 | - (eval "$ac_compile") 2>conftest.er1 | ||
17671 | - ac_status=$? | ||
17672 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17673 | - rm -f conftest.er1 | ||
17674 | - cat conftest.err >&5 | ||
17675 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17676 | - (exit $ac_status); } && { | ||
17677 | - test -z "$ac_c_werror_flag" || | ||
17678 | - test ! -s conftest.err | ||
17679 | - } && test -s conftest.$ac_objext; then | ||
17680 | - ac_hi=$ac_mid; break | ||
17681 | -else | ||
17682 | - $as_echo "$as_me: failed program was:" >&5 | ||
17683 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17684 | - | ||
17685 | - ac_lo=`expr $ac_mid + 1` | ||
17686 | - if test $ac_lo -le $ac_mid; then | ||
17687 | - ac_lo= ac_hi= | ||
17688 | - break | ||
17689 | - fi | ||
17690 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
17691 | -fi | ||
17692 | - | ||
17693 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17694 | - done | ||
17695 | -else | ||
17696 | - $as_echo "$as_me: failed program was:" >&5 | ||
17697 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17698 | - | ||
17699 | - cat >conftest.$ac_ext <<_ACEOF | ||
17700 | -/* confdefs.h. */ | ||
17701 | -_ACEOF | ||
17702 | -cat confdefs.h >>conftest.$ac_ext | ||
17703 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17704 | -/* end confdefs.h. */ | ||
17705 | -$ac_includes_default | ||
17706 | -int | ||
17707 | -main () | ||
17708 | -{ | ||
17709 | -static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)]; | ||
17710 | -test_array [0] = 0 | ||
17711 | - | ||
17712 | - ; | ||
17713 | - return 0; | ||
17714 | -} | ||
17715 | -_ACEOF | ||
17716 | -rm -f conftest.$ac_objext | ||
17717 | -if { (ac_try="$ac_compile" | ||
17718 | -case "(($ac_try" in | ||
17719 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17720 | - *) ac_try_echo=$ac_try;; | ||
17721 | -esac | ||
17722 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17723 | -$as_echo "$ac_try_echo") >&5 | ||
17724 | - (eval "$ac_compile") 2>conftest.er1 | ||
17725 | - ac_status=$? | ||
17726 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17727 | - rm -f conftest.er1 | ||
17728 | - cat conftest.err >&5 | ||
17729 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17730 | - (exit $ac_status); } && { | ||
17731 | - test -z "$ac_c_werror_flag" || | ||
17732 | - test ! -s conftest.err | ||
17733 | - } && test -s conftest.$ac_objext; then | ||
17734 | - ac_hi=-1 ac_mid=-1 | ||
17735 | - while :; do | ||
17736 | - cat >conftest.$ac_ext <<_ACEOF | ||
17737 | -/* confdefs.h. */ | ||
17738 | -_ACEOF | ||
17739 | -cat confdefs.h >>conftest.$ac_ext | ||
17740 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17741 | -/* end confdefs.h. */ | ||
17742 | -$ac_includes_default | ||
17743 | -int | ||
17744 | -main () | ||
17745 | -{ | ||
17746 | -static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)]; | ||
17747 | -test_array [0] = 0 | ||
17748 | - | ||
17749 | - ; | ||
17750 | - return 0; | ||
17751 | -} | ||
17752 | -_ACEOF | ||
17753 | -rm -f conftest.$ac_objext | ||
17754 | -if { (ac_try="$ac_compile" | ||
17755 | -case "(($ac_try" in | ||
17756 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17757 | - *) ac_try_echo=$ac_try;; | ||
17758 | -esac | ||
17759 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17760 | -$as_echo "$ac_try_echo") >&5 | ||
17761 | - (eval "$ac_compile") 2>conftest.er1 | ||
17762 | - ac_status=$? | ||
17763 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17764 | - rm -f conftest.er1 | ||
17765 | - cat conftest.err >&5 | ||
17766 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17767 | - (exit $ac_status); } && { | ||
17768 | - test -z "$ac_c_werror_flag" || | ||
17769 | - test ! -s conftest.err | ||
17770 | - } && test -s conftest.$ac_objext; then | ||
17771 | - ac_lo=$ac_mid; break | ||
17772 | -else | ||
17773 | - $as_echo "$as_me: failed program was:" >&5 | ||
17774 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17775 | - | ||
17776 | - ac_hi=`expr '(' $ac_mid ')' - 1` | ||
17777 | - if test $ac_mid -le $ac_hi; then | ||
17778 | - ac_lo= ac_hi= | ||
17779 | - break | ||
17780 | - fi | ||
17781 | - ac_mid=`expr 2 '*' $ac_mid` | ||
17782 | -fi | ||
17783 | - | ||
17784 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17785 | - done | ||
17786 | -else | ||
17787 | - $as_echo "$as_me: failed program was:" >&5 | ||
17788 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17789 | - | ||
17790 | - ac_lo= ac_hi= | ||
17791 | -fi | ||
17792 | - | ||
17793 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17794 | -fi | ||
17795 | - | ||
17796 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17797 | -# Binary search between lo and hi bounds. | ||
17798 | -while test "x$ac_lo" != "x$ac_hi"; do | ||
17799 | - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
17800 | - cat >conftest.$ac_ext <<_ACEOF | ||
17801 | -/* confdefs.h. */ | ||
17802 | -_ACEOF | ||
17803 | -cat confdefs.h >>conftest.$ac_ext | ||
17804 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17805 | -/* end confdefs.h. */ | ||
17806 | -$ac_includes_default | ||
17807 | -int | ||
17808 | -main () | ||
17809 | -{ | ||
17810 | -static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)]; | ||
17811 | -test_array [0] = 0 | ||
17812 | - | ||
17813 | - ; | ||
17814 | - return 0; | ||
17815 | -} | ||
17816 | -_ACEOF | ||
17817 | -rm -f conftest.$ac_objext | ||
17818 | -if { (ac_try="$ac_compile" | ||
17819 | -case "(($ac_try" in | ||
17820 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17821 | - *) ac_try_echo=$ac_try;; | ||
17822 | -esac | ||
17823 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17824 | -$as_echo "$ac_try_echo") >&5 | ||
17825 | - (eval "$ac_compile") 2>conftest.er1 | ||
17826 | - ac_status=$? | ||
17827 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17828 | - rm -f conftest.er1 | ||
17829 | - cat conftest.err >&5 | ||
17830 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17831 | - (exit $ac_status); } && { | ||
17832 | - test -z "$ac_c_werror_flag" || | ||
17833 | - test ! -s conftest.err | ||
17834 | - } && test -s conftest.$ac_objext; then | ||
17835 | - ac_hi=$ac_mid | ||
17836 | -else | ||
17837 | - $as_echo "$as_me: failed program was:" >&5 | ||
17838 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17839 | - | ||
17840 | - ac_lo=`expr '(' $ac_mid ')' + 1` | ||
17841 | -fi | ||
17842 | - | ||
17843 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17844 | -done | ||
17845 | -case $ac_lo in | ||
17846 | -?*) ac_cv_sizeof_double=$ac_lo;; | ||
17847 | -'') if test "$ac_cv_type_double" = yes; then | ||
17848 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
17849 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
17850 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double) | ||
17851 | -See \`config.log' for more details." >&5 | ||
17852 | -$as_echo "$as_me: error: cannot compute sizeof (double) | ||
17853 | -See \`config.log' for more details." >&2;} | ||
17854 | - { (exit 77); exit 77; }; }; } | ||
17855 | - else | ||
17856 | - ac_cv_sizeof_double=0 | ||
17857 | - fi ;; | ||
17858 | -esac | ||
17859 | -else | ||
17860 | - cat >conftest.$ac_ext <<_ACEOF | ||
17861 | -/* confdefs.h. */ | ||
17862 | -_ACEOF | ||
17863 | -cat confdefs.h >>conftest.$ac_ext | ||
17864 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17865 | -/* end confdefs.h. */ | ||
17866 | -$ac_includes_default | ||
17867 | -static long int longval () { return (long int) (sizeof (double)); } | ||
17868 | -static unsigned long int ulongval () { return (long int) (sizeof (double)); } | ||
17869 | -#include <stdio.h> | ||
17870 | -#include <stdlib.h> | ||
17871 | -int | ||
17872 | -main () | ||
17873 | -{ | ||
17874 | - | ||
17875 | - FILE *f = fopen ("conftest.val", "w"); | ||
17876 | - if (! f) | ||
17877 | - return 1; | ||
17878 | - if (((long int) (sizeof (double))) < 0) | ||
17879 | - { | ||
17880 | - long int i = longval (); | ||
17881 | - if (i != ((long int) (sizeof (double)))) | ||
17882 | - return 1; | ||
17883 | - fprintf (f, "%ld", i); | ||
17884 | - } | ||
17885 | - else | ||
17886 | - { | ||
17887 | - unsigned long int i = ulongval (); | ||
17888 | - if (i != ((long int) (sizeof (double)))) | ||
17889 | - return 1; | ||
17890 | - fprintf (f, "%lu", i); | ||
17891 | - } | ||
17892 | - /* Do not output a trailing newline, as this causes \r\n confusion | ||
17893 | - on some platforms. */ | ||
17894 | - return ferror (f) || fclose (f) != 0; | ||
17895 | + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : | ||
17896 | |||
17897 | - ; | ||
17898 | - return 0; | ||
17899 | -} | ||
17900 | -_ACEOF | ||
17901 | -rm -f conftest$ac_exeext | ||
17902 | -if { (ac_try="$ac_link" | ||
17903 | -case "(($ac_try" in | ||
17904 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17905 | - *) ac_try_echo=$ac_try;; | ||
17906 | -esac | ||
17907 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17908 | -$as_echo "$ac_try_echo") >&5 | ||
17909 | - (eval "$ac_link") 2>&5 | ||
17910 | - ac_status=$? | ||
17911 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17912 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
17913 | - { (case "(($ac_try" in | ||
17914 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17915 | - *) ac_try_echo=$ac_try;; | ||
17916 | -esac | ||
17917 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17918 | -$as_echo "$ac_try_echo") >&5 | ||
17919 | - (eval "$ac_try") 2>&5 | ||
17920 | - ac_status=$? | ||
17921 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17922 | - (exit $ac_status); }; }; then | ||
17923 | - ac_cv_sizeof_double=`cat conftest.val` | ||
17924 | else | ||
17925 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
17926 | -$as_echo "$as_me: failed program was:" >&5 | ||
17927 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
17928 | - | ||
17929 | -( exit $ac_status ) | ||
17930 | -if test "$ac_cv_type_double" = yes; then | ||
17931 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
17932 | + if test "$ac_cv_type_double" = yes; then | ||
17933 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
17934 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
17935 | -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double) | ||
17936 | -See \`config.log' for more details." >&5 | ||
17937 | -$as_echo "$as_me: error: cannot compute sizeof (double) | ||
17938 | -See \`config.log' for more details." >&2;} | ||
17939 | - { (exit 77); exit 77; }; }; } | ||
17940 | +as_fn_error 77 "cannot compute sizeof (double) | ||
17941 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
17942 | else | ||
17943 | ac_cv_sizeof_double=0 | ||
17944 | fi | ||
17945 | fi | ||
17946 | -rm -rf conftest.dSYM | ||
17947 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
17948 | -fi | ||
17949 | -rm -f conftest.val | ||
17950 | + | ||
17951 | fi | ||
17952 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5 | ||
17953 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 | ||
17954 | $as_echo "$ac_cv_sizeof_double" >&6; } | ||
17955 | |||
17956 | |||
17957 | @@ -20418,16 +14982,12 @@ | ||
17958 | |||
17959 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | ||
17960 | # for constant arguments. Useless! | ||
17961 | -{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 | ||
17962 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 | ||
17963 | $as_echo_n "checking for working alloca.h... " >&6; } | ||
17964 | -if test "${ac_cv_working_alloca_h+set}" = set; then | ||
17965 | +if test "${ac_cv_working_alloca_h+set}" = set; then : | ||
17966 | $as_echo_n "(cached) " >&6 | ||
17967 | else | ||
17968 | - cat >conftest.$ac_ext <<_ACEOF | ||
17969 | -/* confdefs.h. */ | ||
17970 | -_ACEOF | ||
17971 | -cat confdefs.h >>conftest.$ac_ext | ||
17972 | -cat >>conftest.$ac_ext <<_ACEOF | ||
17973 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
17974 | /* end confdefs.h. */ | ||
17975 | #include <alloca.h> | ||
17976 | int | ||
17977 | @@ -20439,59 +14999,28 @@ | ||
17978 | return 0; | ||
17979 | } | ||
17980 | _ACEOF | ||
17981 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
17982 | -if { (ac_try="$ac_link" | ||
17983 | -case "(($ac_try" in | ||
17984 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17985 | - *) ac_try_echo=$ac_try;; | ||
17986 | -esac | ||
17987 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
17988 | -$as_echo "$ac_try_echo") >&5 | ||
17989 | - (eval "$ac_link") 2>conftest.er1 | ||
17990 | - ac_status=$? | ||
17991 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
17992 | - rm -f conftest.er1 | ||
17993 | - cat conftest.err >&5 | ||
17994 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17995 | - (exit $ac_status); } && { | ||
17996 | - test -z "$ac_c_werror_flag" || | ||
17997 | - test ! -s conftest.err | ||
17998 | - } && test -s conftest$ac_exeext && { | ||
17999 | - test "$cross_compiling" = yes || | ||
18000 | - $as_test_x conftest$ac_exeext | ||
18001 | - }; then | ||
18002 | +if ac_fn_c_try_link "$LINENO"; then : | ||
18003 | ac_cv_working_alloca_h=yes | ||
18004 | else | ||
18005 | - $as_echo "$as_me: failed program was:" >&5 | ||
18006 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18007 | - | ||
18008 | - ac_cv_working_alloca_h=no | ||
18009 | + ac_cv_working_alloca_h=no | ||
18010 | fi | ||
18011 | - | ||
18012 | -rm -rf conftest.dSYM | ||
18013 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18014 | - conftest$ac_exeext conftest.$ac_ext | ||
18015 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18016 | + conftest$ac_exeext conftest.$ac_ext | ||
18017 | fi | ||
18018 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 | ||
18019 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 | ||
18020 | $as_echo "$ac_cv_working_alloca_h" >&6; } | ||
18021 | if test $ac_cv_working_alloca_h = yes; then | ||
18022 | |||
18023 | -cat >>confdefs.h <<\_ACEOF | ||
18024 | -#define HAVE_ALLOCA_H 1 | ||
18025 | -_ACEOF | ||
18026 | +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h | ||
18027 | |||
18028 | fi | ||
18029 | |||
18030 | -{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 | ||
18031 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 | ||
18032 | $as_echo_n "checking for alloca... " >&6; } | ||
18033 | -if test "${ac_cv_func_alloca_works+set}" = set; then | ||
18034 | +if test "${ac_cv_func_alloca_works+set}" = set; then : | ||
18035 | $as_echo_n "(cached) " >&6 | ||
18036 | else | ||
18037 | - cat >conftest.$ac_ext <<_ACEOF | ||
18038 | -/* confdefs.h. */ | ||
18039 | -_ACEOF | ||
18040 | -cat confdefs.h >>conftest.$ac_ext | ||
18041 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18042 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18043 | /* end confdefs.h. */ | ||
18044 | #ifdef __GNUC__ | ||
18045 | # define alloca __builtin_alloca | ||
18046 | @@ -20523,47 +15052,20 @@ | ||
18047 | return 0; | ||
18048 | } | ||
18049 | _ACEOF | ||
18050 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18051 | -if { (ac_try="$ac_link" | ||
18052 | -case "(($ac_try" in | ||
18053 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18054 | - *) ac_try_echo=$ac_try;; | ||
18055 | -esac | ||
18056 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18057 | -$as_echo "$ac_try_echo") >&5 | ||
18058 | - (eval "$ac_link") 2>conftest.er1 | ||
18059 | - ac_status=$? | ||
18060 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18061 | - rm -f conftest.er1 | ||
18062 | - cat conftest.err >&5 | ||
18063 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18064 | - (exit $ac_status); } && { | ||
18065 | - test -z "$ac_c_werror_flag" || | ||
18066 | - test ! -s conftest.err | ||
18067 | - } && test -s conftest$ac_exeext && { | ||
18068 | - test "$cross_compiling" = yes || | ||
18069 | - $as_test_x conftest$ac_exeext | ||
18070 | - }; then | ||
18071 | +if ac_fn_c_try_link "$LINENO"; then : | ||
18072 | ac_cv_func_alloca_works=yes | ||
18073 | else | ||
18074 | - $as_echo "$as_me: failed program was:" >&5 | ||
18075 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18076 | - | ||
18077 | - ac_cv_func_alloca_works=no | ||
18078 | + ac_cv_func_alloca_works=no | ||
18079 | fi | ||
18080 | - | ||
18081 | -rm -rf conftest.dSYM | ||
18082 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18083 | - conftest$ac_exeext conftest.$ac_ext | ||
18084 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18085 | + conftest$ac_exeext conftest.$ac_ext | ||
18086 | fi | ||
18087 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 | ||
18088 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 | ||
18089 | $as_echo "$ac_cv_func_alloca_works" >&6; } | ||
18090 | |||
18091 | if test $ac_cv_func_alloca_works = yes; then | ||
18092 | |||
18093 | -cat >>confdefs.h <<\_ACEOF | ||
18094 | -#define HAVE_ALLOCA 1 | ||
18095 | -_ACEOF | ||
18096 | +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h | ||
18097 | |||
18098 | else | ||
18099 | # The SVR3 libPW and SVR4 libucb both contain incompatible functions | ||
18100 | @@ -20573,21 +15075,15 @@ | ||
18101 | |||
18102 | ALLOCA=\${LIBOBJDIR}alloca.$ac_objext | ||
18103 | |||
18104 | -cat >>confdefs.h <<\_ACEOF | ||
18105 | -#define C_ALLOCA 1 | ||
18106 | -_ACEOF | ||
18107 | +$as_echo "#define C_ALLOCA 1" >>confdefs.h | ||
18108 | |||
18109 | |||
18110 | -{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 | ||
18111 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 | ||
18112 | $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } | ||
18113 | -if test "${ac_cv_os_cray+set}" = set; then | ||
18114 | +if test "${ac_cv_os_cray+set}" = set; then : | ||
18115 | $as_echo_n "(cached) " >&6 | ||
18116 | else | ||
18117 | - cat >conftest.$ac_ext <<_ACEOF | ||
18118 | -/* confdefs.h. */ | ||
18119 | -_ACEOF | ||
18120 | -cat confdefs.h >>conftest.$ac_ext | ||
18121 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18122 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18123 | /* end confdefs.h. */ | ||
18124 | #if defined CRAY && ! defined CRAY2 | ||
18125 | webecray | ||
18126 | @@ -20597,7 +15093,7 @@ | ||
18127 | |||
18128 | _ACEOF | ||
18129 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
18130 | - $EGREP "webecray" >/dev/null 2>&1; then | ||
18131 | + $EGREP "webecray" >/dev/null 2>&1; then : | ||
18132 | ac_cv_os_cray=yes | ||
18133 | else | ||
18134 | ac_cv_os_cray=no | ||
18135 | @@ -20605,101 +15101,13 @@ | ||
18136 | rm -f conftest* | ||
18137 | |||
18138 | fi | ||
18139 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 | ||
18140 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 | ||
18141 | $as_echo "$ac_cv_os_cray" >&6; } | ||
18142 | if test $ac_cv_os_cray = yes; then | ||
18143 | for ac_func in _getb67 GETB67 getb67; do | ||
18144 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
18145 | -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
18146 | -$as_echo_n "checking for $ac_func... " >&6; } | ||
18147 | -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
18148 | - $as_echo_n "(cached) " >&6 | ||
18149 | -else | ||
18150 | - cat >conftest.$ac_ext <<_ACEOF | ||
18151 | -/* confdefs.h. */ | ||
18152 | -_ACEOF | ||
18153 | -cat confdefs.h >>conftest.$ac_ext | ||
18154 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18155 | -/* end confdefs.h. */ | ||
18156 | -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
18157 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
18158 | -#define $ac_func innocuous_$ac_func | ||
18159 | - | ||
18160 | -/* System header to define __stub macros and hopefully few prototypes, | ||
18161 | - which can conflict with char $ac_func (); below. | ||
18162 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
18163 | - <limits.h> exists even on freestanding compilers. */ | ||
18164 | - | ||
18165 | -#ifdef __STDC__ | ||
18166 | -# include <limits.h> | ||
18167 | -#else | ||
18168 | -# include <assert.h> | ||
18169 | -#endif | ||
18170 | - | ||
18171 | -#undef $ac_func | ||
18172 | - | ||
18173 | -/* Override any GCC internal prototype to avoid an error. | ||
18174 | - Use char because int might match the return type of a GCC | ||
18175 | - builtin and then its argument prototype would still apply. */ | ||
18176 | -#ifdef __cplusplus | ||
18177 | -extern "C" | ||
18178 | -#endif | ||
18179 | -char $ac_func (); | ||
18180 | -/* The GNU C library defines this for functions which it implements | ||
18181 | - to always fail with ENOSYS. Some functions are actually named | ||
18182 | - something starting with __ and the normal name is an alias. */ | ||
18183 | -#if defined __stub_$ac_func || defined __stub___$ac_func | ||
18184 | -choke me | ||
18185 | -#endif | ||
18186 | - | ||
18187 | -int | ||
18188 | -main () | ||
18189 | -{ | ||
18190 | -return $ac_func (); | ||
18191 | - ; | ||
18192 | - return 0; | ||
18193 | -} | ||
18194 | -_ACEOF | ||
18195 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18196 | -if { (ac_try="$ac_link" | ||
18197 | -case "(($ac_try" in | ||
18198 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18199 | - *) ac_try_echo=$ac_try;; | ||
18200 | -esac | ||
18201 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18202 | -$as_echo "$ac_try_echo") >&5 | ||
18203 | - (eval "$ac_link") 2>conftest.er1 | ||
18204 | - ac_status=$? | ||
18205 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18206 | - rm -f conftest.er1 | ||
18207 | - cat conftest.err >&5 | ||
18208 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18209 | - (exit $ac_status); } && { | ||
18210 | - test -z "$ac_c_werror_flag" || | ||
18211 | - test ! -s conftest.err | ||
18212 | - } && test -s conftest$ac_exeext && { | ||
18213 | - test "$cross_compiling" = yes || | ||
18214 | - $as_test_x conftest$ac_exeext | ||
18215 | - }; then | ||
18216 | - eval "$as_ac_var=yes" | ||
18217 | -else | ||
18218 | - $as_echo "$as_me: failed program was:" >&5 | ||
18219 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18220 | - | ||
18221 | - eval "$as_ac_var=no" | ||
18222 | -fi | ||
18223 | - | ||
18224 | -rm -rf conftest.dSYM | ||
18225 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18226 | - conftest$ac_exeext conftest.$ac_ext | ||
18227 | -fi | ||
18228 | -ac_res=`eval 'as_val=${'$as_ac_var'} | ||
18229 | - $as_echo "$as_val"'` | ||
18230 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
18231 | -$as_echo "$ac_res" >&6; } | ||
18232 | -as_val=`eval 'as_val=${'$as_ac_var'} | ||
18233 | - $as_echo "$as_val"'` | ||
18234 | - if test "x$as_val" = x""yes; then | ||
18235 | +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||
18236 | +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | ||
18237 | |||
18238 | cat >>confdefs.h <<_ACEOF | ||
18239 | #define CRAY_STACKSEG_END $ac_func | ||
18240 | @@ -20711,19 +15119,15 @@ | ||
18241 | done | ||
18242 | fi | ||
18243 | |||
18244 | -{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 | ||
18245 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 | ||
18246 | $as_echo_n "checking stack direction for C alloca... " >&6; } | ||
18247 | -if test "${ac_cv_c_stack_direction+set}" = set; then | ||
18248 | +if test "${ac_cv_c_stack_direction+set}" = set; then : | ||
18249 | $as_echo_n "(cached) " >&6 | ||
18250 | else | ||
18251 | - if test "$cross_compiling" = yes; then | ||
18252 | + if test "$cross_compiling" = yes; then : | ||
18253 | ac_cv_c_stack_direction=0 | ||
18254 | else | ||
18255 | - cat >conftest.$ac_ext <<_ACEOF | ||
18256 | -/* confdefs.h. */ | ||
18257 | -_ACEOF | ||
18258 | -cat confdefs.h >>conftest.$ac_ext | ||
18259 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18260 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18261 | /* end confdefs.h. */ | ||
18262 | $ac_includes_default | ||
18263 | int | ||
18264 | @@ -20746,46 +15150,18 @@ | ||
18265 | return find_stack_direction () < 0; | ||
18266 | } | ||
18267 | _ACEOF | ||
18268 | -rm -f conftest$ac_exeext | ||
18269 | -if { (ac_try="$ac_link" | ||
18270 | -case "(($ac_try" in | ||
18271 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18272 | - *) ac_try_echo=$ac_try;; | ||
18273 | -esac | ||
18274 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18275 | -$as_echo "$ac_try_echo") >&5 | ||
18276 | - (eval "$ac_link") 2>&5 | ||
18277 | - ac_status=$? | ||
18278 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18279 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
18280 | - { (case "(($ac_try" in | ||
18281 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18282 | - *) ac_try_echo=$ac_try;; | ||
18283 | -esac | ||
18284 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18285 | -$as_echo "$ac_try_echo") >&5 | ||
18286 | - (eval "$ac_try") 2>&5 | ||
18287 | - ac_status=$? | ||
18288 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18289 | - (exit $ac_status); }; }; then | ||
18290 | +if ac_fn_c_try_run "$LINENO"; then : | ||
18291 | ac_cv_c_stack_direction=1 | ||
18292 | else | ||
18293 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
18294 | -$as_echo "$as_me: failed program was:" >&5 | ||
18295 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18296 | - | ||
18297 | -( exit $ac_status ) | ||
18298 | -ac_cv_c_stack_direction=-1 | ||
18299 | + ac_cv_c_stack_direction=-1 | ||
18300 | fi | ||
18301 | -rm -rf conftest.dSYM | ||
18302 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
18303 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
18304 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
18305 | fi | ||
18306 | |||
18307 | - | ||
18308 | fi | ||
18309 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 | ||
18310 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 | ||
18311 | $as_echo "$ac_cv_c_stack_direction" >&6; } | ||
18312 | - | ||
18313 | cat >>confdefs.h <<_ACEOF | ||
18314 | #define STACK_DIRECTION $ac_cv_c_stack_direction | ||
18315 | _ACEOF | ||
18316 | @@ -20793,19 +15169,15 @@ | ||
18317 | |||
18318 | fi | ||
18319 | |||
18320 | -{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5 | ||
18321 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 | ||
18322 | $as_echo_n "checking for working strtod... " >&6; } | ||
18323 | -if test "${ac_cv_func_strtod+set}" = set; then | ||
18324 | +if test "${ac_cv_func_strtod+set}" = set; then : | ||
18325 | $as_echo_n "(cached) " >&6 | ||
18326 | else | ||
18327 | - if test "$cross_compiling" = yes; then | ||
18328 | + if test "$cross_compiling" = yes; then : | ||
18329 | ac_cv_func_strtod=no | ||
18330 | else | ||
18331 | - cat >conftest.$ac_ext <<_ACEOF | ||
18332 | -/* confdefs.h. */ | ||
18333 | -_ACEOF | ||
18334 | -cat confdefs.h >>conftest.$ac_ext | ||
18335 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18336 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18337 | /* end confdefs.h. */ | ||
18338 | |||
18339 | $ac_includes_default | ||
18340 | @@ -20838,44 +15210,17 @@ | ||
18341 | } | ||
18342 | |||
18343 | _ACEOF | ||
18344 | -rm -f conftest$ac_exeext | ||
18345 | -if { (ac_try="$ac_link" | ||
18346 | -case "(($ac_try" in | ||
18347 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18348 | - *) ac_try_echo=$ac_try;; | ||
18349 | -esac | ||
18350 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18351 | -$as_echo "$ac_try_echo") >&5 | ||
18352 | - (eval "$ac_link") 2>&5 | ||
18353 | - ac_status=$? | ||
18354 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18355 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
18356 | - { (case "(($ac_try" in | ||
18357 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18358 | - *) ac_try_echo=$ac_try;; | ||
18359 | -esac | ||
18360 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18361 | -$as_echo "$ac_try_echo") >&5 | ||
18362 | - (eval "$ac_try") 2>&5 | ||
18363 | - ac_status=$? | ||
18364 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18365 | - (exit $ac_status); }; }; then | ||
18366 | +if ac_fn_c_try_run "$LINENO"; then : | ||
18367 | ac_cv_func_strtod=yes | ||
18368 | else | ||
18369 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
18370 | -$as_echo "$as_me: failed program was:" >&5 | ||
18371 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18372 | - | ||
18373 | -( exit $ac_status ) | ||
18374 | -ac_cv_func_strtod=no | ||
18375 | + ac_cv_func_strtod=no | ||
18376 | fi | ||
18377 | -rm -rf conftest.dSYM | ||
18378 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
18379 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
18380 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
18381 | fi | ||
18382 | |||
18383 | - | ||
18384 | fi | ||
18385 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5 | ||
18386 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 | ||
18387 | $as_echo "$ac_cv_func_strtod" >&6; } | ||
18388 | if test $ac_cv_func_strtod = no; then | ||
18389 | case " $LIBOBJS " in | ||
18390 | @@ -20884,105 +15229,20 @@ | ||
18391 | ;; | ||
18392 | esac | ||
18393 | |||
18394 | -{ $as_echo "$as_me:$LINENO: checking for pow" >&5 | ||
18395 | -$as_echo_n "checking for pow... " >&6; } | ||
18396 | -if test "${ac_cv_func_pow+set}" = set; then | ||
18397 | - $as_echo_n "(cached) " >&6 | ||
18398 | -else | ||
18399 | - cat >conftest.$ac_ext <<_ACEOF | ||
18400 | -/* confdefs.h. */ | ||
18401 | -_ACEOF | ||
18402 | -cat confdefs.h >>conftest.$ac_ext | ||
18403 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18404 | -/* end confdefs.h. */ | ||
18405 | -/* Define pow to an innocuous variant, in case <limits.h> declares pow. | ||
18406 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
18407 | -#define pow innocuous_pow | ||
18408 | - | ||
18409 | -/* System header to define __stub macros and hopefully few prototypes, | ||
18410 | - which can conflict with char pow (); below. | ||
18411 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
18412 | - <limits.h> exists even on freestanding compilers. */ | ||
18413 | - | ||
18414 | -#ifdef __STDC__ | ||
18415 | -# include <limits.h> | ||
18416 | -#else | ||
18417 | -# include <assert.h> | ||
18418 | -#endif | ||
18419 | - | ||
18420 | -#undef pow | ||
18421 | - | ||
18422 | -/* Override any GCC internal prototype to avoid an error. | ||
18423 | - Use char because int might match the return type of a GCC | ||
18424 | - builtin and then its argument prototype would still apply. */ | ||
18425 | -#ifdef __cplusplus | ||
18426 | -extern "C" | ||
18427 | -#endif | ||
18428 | -char pow (); | ||
18429 | -/* The GNU C library defines this for functions which it implements | ||
18430 | - to always fail with ENOSYS. Some functions are actually named | ||
18431 | - something starting with __ and the normal name is an alias. */ | ||
18432 | -#if defined __stub_pow || defined __stub___pow | ||
18433 | -choke me | ||
18434 | -#endif | ||
18435 | - | ||
18436 | -int | ||
18437 | -main () | ||
18438 | -{ | ||
18439 | -return pow (); | ||
18440 | - ; | ||
18441 | - return 0; | ||
18442 | -} | ||
18443 | -_ACEOF | ||
18444 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18445 | -if { (ac_try="$ac_link" | ||
18446 | -case "(($ac_try" in | ||
18447 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18448 | - *) ac_try_echo=$ac_try;; | ||
18449 | -esac | ||
18450 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18451 | -$as_echo "$ac_try_echo") >&5 | ||
18452 | - (eval "$ac_link") 2>conftest.er1 | ||
18453 | - ac_status=$? | ||
18454 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18455 | - rm -f conftest.er1 | ||
18456 | - cat conftest.err >&5 | ||
18457 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18458 | - (exit $ac_status); } && { | ||
18459 | - test -z "$ac_c_werror_flag" || | ||
18460 | - test ! -s conftest.err | ||
18461 | - } && test -s conftest$ac_exeext && { | ||
18462 | - test "$cross_compiling" = yes || | ||
18463 | - $as_test_x conftest$ac_exeext | ||
18464 | - }; then | ||
18465 | - ac_cv_func_pow=yes | ||
18466 | -else | ||
18467 | - $as_echo "$as_me: failed program was:" >&5 | ||
18468 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18469 | - | ||
18470 | - ac_cv_func_pow=no | ||
18471 | -fi | ||
18472 | +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" | ||
18473 | +if test "x$ac_cv_func_pow" = x""yes; then : | ||
18474 | |||
18475 | -rm -rf conftest.dSYM | ||
18476 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18477 | - conftest$ac_exeext conftest.$ac_ext | ||
18478 | fi | ||
18479 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5 | ||
18480 | -$as_echo "$ac_cv_func_pow" >&6; } | ||
18481 | |||
18482 | if test $ac_cv_func_pow = no; then | ||
18483 | - { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5 | ||
18484 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 | ||
18485 | $as_echo_n "checking for pow in -lm... " >&6; } | ||
18486 | -if test "${ac_cv_lib_m_pow+set}" = set; then | ||
18487 | +if test "${ac_cv_lib_m_pow+set}" = set; then : | ||
18488 | $as_echo_n "(cached) " >&6 | ||
18489 | else | ||
18490 | ac_check_lib_save_LIBS=$LIBS | ||
18491 | LIBS="-lm $LIBS" | ||
18492 | -cat >conftest.$ac_ext <<_ACEOF | ||
18493 | -/* confdefs.h. */ | ||
18494 | -_ACEOF | ||
18495 | -cat confdefs.h >>conftest.$ac_ext | ||
18496 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18497 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18498 | /* end confdefs.h. */ | ||
18499 | |||
18500 | /* Override any GCC internal prototype to avoid an error. | ||
18501 | @@ -21000,46 +15260,21 @@ | ||
18502 | return 0; | ||
18503 | } | ||
18504 | _ACEOF | ||
18505 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18506 | -if { (ac_try="$ac_link" | ||
18507 | -case "(($ac_try" in | ||
18508 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18509 | - *) ac_try_echo=$ac_try;; | ||
18510 | -esac | ||
18511 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18512 | -$as_echo "$ac_try_echo") >&5 | ||
18513 | - (eval "$ac_link") 2>conftest.er1 | ||
18514 | - ac_status=$? | ||
18515 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18516 | - rm -f conftest.er1 | ||
18517 | - cat conftest.err >&5 | ||
18518 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18519 | - (exit $ac_status); } && { | ||
18520 | - test -z "$ac_c_werror_flag" || | ||
18521 | - test ! -s conftest.err | ||
18522 | - } && test -s conftest$ac_exeext && { | ||
18523 | - test "$cross_compiling" = yes || | ||
18524 | - $as_test_x conftest$ac_exeext | ||
18525 | - }; then | ||
18526 | +if ac_fn_c_try_link "$LINENO"; then : | ||
18527 | ac_cv_lib_m_pow=yes | ||
18528 | else | ||
18529 | - $as_echo "$as_me: failed program was:" >&5 | ||
18530 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18531 | - | ||
18532 | - ac_cv_lib_m_pow=no | ||
18533 | + ac_cv_lib_m_pow=no | ||
18534 | fi | ||
18535 | - | ||
18536 | -rm -rf conftest.dSYM | ||
18537 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18538 | - conftest$ac_exeext conftest.$ac_ext | ||
18539 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18540 | + conftest$ac_exeext conftest.$ac_ext | ||
18541 | LIBS=$ac_check_lib_save_LIBS | ||
18542 | fi | ||
18543 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 | ||
18544 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 | ||
18545 | $as_echo "$ac_cv_lib_m_pow" >&6; } | ||
18546 | -if test "x$ac_cv_lib_m_pow" = x""yes; then | ||
18547 | +if test "x$ac_cv_lib_m_pow" = x""yes; then : | ||
18548 | POW_LIB=-lm | ||
18549 | else | ||
18550 | - { $as_echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5 | ||
18551 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 | ||
18552 | $as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} | ||
18553 | fi | ||
18554 | |||
18555 | @@ -21047,194 +15282,18 @@ | ||
18556 | |||
18557 | fi | ||
18558 | |||
18559 | - | ||
18560 | for ac_func in vprintf | ||
18561 | -do | ||
18562 | -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
18563 | -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
18564 | -$as_echo_n "checking for $ac_func... " >&6; } | ||
18565 | -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
18566 | - $as_echo_n "(cached) " >&6 | ||
18567 | -else | ||
18568 | - cat >conftest.$ac_ext <<_ACEOF | ||
18569 | -/* confdefs.h. */ | ||
18570 | -_ACEOF | ||
18571 | -cat confdefs.h >>conftest.$ac_ext | ||
18572 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18573 | -/* end confdefs.h. */ | ||
18574 | -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
18575 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
18576 | -#define $ac_func innocuous_$ac_func | ||
18577 | - | ||
18578 | -/* System header to define __stub macros and hopefully few prototypes, | ||
18579 | - which can conflict with char $ac_func (); below. | ||
18580 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
18581 | - <limits.h> exists even on freestanding compilers. */ | ||
18582 | - | ||
18583 | -#ifdef __STDC__ | ||
18584 | -# include <limits.h> | ||
18585 | -#else | ||
18586 | -# include <assert.h> | ||
18587 | -#endif | ||
18588 | - | ||
18589 | -#undef $ac_func | ||
18590 | - | ||
18591 | -/* Override any GCC internal prototype to avoid an error. | ||
18592 | - Use char because int might match the return type of a GCC | ||
18593 | - builtin and then its argument prototype would still apply. */ | ||
18594 | -#ifdef __cplusplus | ||
18595 | -extern "C" | ||
18596 | -#endif | ||
18597 | -char $ac_func (); | ||
18598 | -/* The GNU C library defines this for functions which it implements | ||
18599 | - to always fail with ENOSYS. Some functions are actually named | ||
18600 | - something starting with __ and the normal name is an alias. */ | ||
18601 | -#if defined __stub_$ac_func || defined __stub___$ac_func | ||
18602 | -choke me | ||
18603 | -#endif | ||
18604 | - | ||
18605 | -int | ||
18606 | -main () | ||
18607 | -{ | ||
18608 | -return $ac_func (); | ||
18609 | - ; | ||
18610 | - return 0; | ||
18611 | -} | ||
18612 | -_ACEOF | ||
18613 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18614 | -if { (ac_try="$ac_link" | ||
18615 | -case "(($ac_try" in | ||
18616 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18617 | - *) ac_try_echo=$ac_try;; | ||
18618 | -esac | ||
18619 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18620 | -$as_echo "$ac_try_echo") >&5 | ||
18621 | - (eval "$ac_link") 2>conftest.er1 | ||
18622 | - ac_status=$? | ||
18623 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18624 | - rm -f conftest.er1 | ||
18625 | - cat conftest.err >&5 | ||
18626 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18627 | - (exit $ac_status); } && { | ||
18628 | - test -z "$ac_c_werror_flag" || | ||
18629 | - test ! -s conftest.err | ||
18630 | - } && test -s conftest$ac_exeext && { | ||
18631 | - test "$cross_compiling" = yes || | ||
18632 | - $as_test_x conftest$ac_exeext | ||
18633 | - }; then | ||
18634 | - eval "$as_ac_var=yes" | ||
18635 | -else | ||
18636 | - $as_echo "$as_me: failed program was:" >&5 | ||
18637 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18638 | - | ||
18639 | - eval "$as_ac_var=no" | ||
18640 | -fi | ||
18641 | - | ||
18642 | -rm -rf conftest.dSYM | ||
18643 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18644 | - conftest$ac_exeext conftest.$ac_ext | ||
18645 | -fi | ||
18646 | -ac_res=`eval 'as_val=${'$as_ac_var'} | ||
18647 | - $as_echo "$as_val"'` | ||
18648 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
18649 | -$as_echo "$ac_res" >&6; } | ||
18650 | -as_val=`eval 'as_val=${'$as_ac_var'} | ||
18651 | - $as_echo "$as_val"'` | ||
18652 | - if test "x$as_val" = x""yes; then | ||
18653 | +do : | ||
18654 | + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" | ||
18655 | +if test "x$ac_cv_func_vprintf" = x""yes; then : | ||
18656 | cat >>confdefs.h <<_ACEOF | ||
18657 | -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
18658 | -_ACEOF | ||
18659 | - | ||
18660 | -{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5 | ||
18661 | -$as_echo_n "checking for _doprnt... " >&6; } | ||
18662 | -if test "${ac_cv_func__doprnt+set}" = set; then | ||
18663 | - $as_echo_n "(cached) " >&6 | ||
18664 | -else | ||
18665 | - cat >conftest.$ac_ext <<_ACEOF | ||
18666 | -/* confdefs.h. */ | ||
18667 | -_ACEOF | ||
18668 | -cat confdefs.h >>conftest.$ac_ext | ||
18669 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18670 | -/* end confdefs.h. */ | ||
18671 | -/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. | ||
18672 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
18673 | -#define _doprnt innocuous__doprnt | ||
18674 | - | ||
18675 | -/* System header to define __stub macros and hopefully few prototypes, | ||
18676 | - which can conflict with char _doprnt (); below. | ||
18677 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
18678 | - <limits.h> exists even on freestanding compilers. */ | ||
18679 | - | ||
18680 | -#ifdef __STDC__ | ||
18681 | -# include <limits.h> | ||
18682 | -#else | ||
18683 | -# include <assert.h> | ||
18684 | -#endif | ||
18685 | - | ||
18686 | -#undef _doprnt | ||
18687 | - | ||
18688 | -/* Override any GCC internal prototype to avoid an error. | ||
18689 | - Use char because int might match the return type of a GCC | ||
18690 | - builtin and then its argument prototype would still apply. */ | ||
18691 | -#ifdef __cplusplus | ||
18692 | -extern "C" | ||
18693 | -#endif | ||
18694 | -char _doprnt (); | ||
18695 | -/* The GNU C library defines this for functions which it implements | ||
18696 | - to always fail with ENOSYS. Some functions are actually named | ||
18697 | - something starting with __ and the normal name is an alias. */ | ||
18698 | -#if defined __stub__doprnt || defined __stub____doprnt | ||
18699 | -choke me | ||
18700 | -#endif | ||
18701 | - | ||
18702 | -int | ||
18703 | -main () | ||
18704 | -{ | ||
18705 | -return _doprnt (); | ||
18706 | - ; | ||
18707 | - return 0; | ||
18708 | -} | ||
18709 | +#define HAVE_VPRINTF 1 | ||
18710 | _ACEOF | ||
18711 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18712 | -if { (ac_try="$ac_link" | ||
18713 | -case "(($ac_try" in | ||
18714 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18715 | - *) ac_try_echo=$ac_try;; | ||
18716 | -esac | ||
18717 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18718 | -$as_echo "$ac_try_echo") >&5 | ||
18719 | - (eval "$ac_link") 2>conftest.er1 | ||
18720 | - ac_status=$? | ||
18721 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18722 | - rm -f conftest.er1 | ||
18723 | - cat conftest.err >&5 | ||
18724 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18725 | - (exit $ac_status); } && { | ||
18726 | - test -z "$ac_c_werror_flag" || | ||
18727 | - test ! -s conftest.err | ||
18728 | - } && test -s conftest$ac_exeext && { | ||
18729 | - test "$cross_compiling" = yes || | ||
18730 | - $as_test_x conftest$ac_exeext | ||
18731 | - }; then | ||
18732 | - ac_cv_func__doprnt=yes | ||
18733 | -else | ||
18734 | - $as_echo "$as_me: failed program was:" >&5 | ||
18735 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18736 | |||
18737 | - ac_cv_func__doprnt=no | ||
18738 | -fi | ||
18739 | - | ||
18740 | -rm -rf conftest.dSYM | ||
18741 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18742 | - conftest$ac_exeext conftest.$ac_ext | ||
18743 | -fi | ||
18744 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 | ||
18745 | -$as_echo "$ac_cv_func__doprnt" >&6; } | ||
18746 | -if test "x$ac_cv_func__doprnt" = x""yes; then | ||
18747 | +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" | ||
18748 | +if test "x$ac_cv_func__doprnt" = x""yes; then : | ||
18749 | |||
18750 | -cat >>confdefs.h <<\_ACEOF | ||
18751 | -#define HAVE_DOPRNT 1 | ||
18752 | -_ACEOF | ||
18753 | +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h | ||
18754 | |||
18755 | fi | ||
18756 | |||
18757 | @@ -21242,19 +15301,14 @@ | ||
18758 | done | ||
18759 | |||
18760 | |||
18761 | - | ||
18762 | -{ $as_echo "$as_me:$LINENO: checking for sin in -lm" >&5 | ||
18763 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 | ||
18764 | $as_echo_n "checking for sin in -lm... " >&6; } | ||
18765 | -if test "${ac_cv_lib_m_sin+set}" = set; then | ||
18766 | +if test "${ac_cv_lib_m_sin+set}" = set; then : | ||
18767 | $as_echo_n "(cached) " >&6 | ||
18768 | else | ||
18769 | ac_check_lib_save_LIBS=$LIBS | ||
18770 | LIBS="-lm $LIBS" | ||
18771 | -cat >conftest.$ac_ext <<_ACEOF | ||
18772 | -/* confdefs.h. */ | ||
18773 | -_ACEOF | ||
18774 | -cat confdefs.h >>conftest.$ac_ext | ||
18775 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18776 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18777 | /* end confdefs.h. */ | ||
18778 | |||
18779 | /* Override any GCC internal prototype to avoid an error. | ||
18780 | @@ -21272,43 +15326,18 @@ | ||
18781 | return 0; | ||
18782 | } | ||
18783 | _ACEOF | ||
18784 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18785 | -if { (ac_try="$ac_link" | ||
18786 | -case "(($ac_try" in | ||
18787 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18788 | - *) ac_try_echo=$ac_try;; | ||
18789 | -esac | ||
18790 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18791 | -$as_echo "$ac_try_echo") >&5 | ||
18792 | - (eval "$ac_link") 2>conftest.er1 | ||
18793 | - ac_status=$? | ||
18794 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18795 | - rm -f conftest.er1 | ||
18796 | - cat conftest.err >&5 | ||
18797 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18798 | - (exit $ac_status); } && { | ||
18799 | - test -z "$ac_c_werror_flag" || | ||
18800 | - test ! -s conftest.err | ||
18801 | - } && test -s conftest$ac_exeext && { | ||
18802 | - test "$cross_compiling" = yes || | ||
18803 | - $as_test_x conftest$ac_exeext | ||
18804 | - }; then | ||
18805 | +if ac_fn_c_try_link "$LINENO"; then : | ||
18806 | ac_cv_lib_m_sin=yes | ||
18807 | else | ||
18808 | - $as_echo "$as_me: failed program was:" >&5 | ||
18809 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18810 | - | ||
18811 | - ac_cv_lib_m_sin=no | ||
18812 | + ac_cv_lib_m_sin=no | ||
18813 | fi | ||
18814 | - | ||
18815 | -rm -rf conftest.dSYM | ||
18816 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18817 | - conftest$ac_exeext conftest.$ac_ext | ||
18818 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18819 | + conftest$ac_exeext conftest.$ac_ext | ||
18820 | LIBS=$ac_check_lib_save_LIBS | ||
18821 | fi | ||
18822 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5 | ||
18823 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5 | ||
18824 | $as_echo "$ac_cv_lib_m_sin" >&6; } | ||
18825 | -if test "x$ac_cv_lib_m_sin" = x""yes; then | ||
18826 | +if test "x$ac_cv_lib_m_sin" = x""yes; then : | ||
18827 | cat >>confdefs.h <<_ACEOF | ||
18828 | #define HAVE_LIBM 1 | ||
18829 | _ACEOF | ||
18830 | @@ -21318,19 +15347,14 @@ | ||
18831 | fi | ||
18832 | |||
18833 | if test "$have_cell" = "yes"; then | ||
18834 | - | ||
18835 | -{ $as_echo "$as_me:$LINENO: checking for spe_context_run in -lspe2" >&5 | ||
18836 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spe_context_run in -lspe2" >&5 | ||
18837 | $as_echo_n "checking for spe_context_run in -lspe2... " >&6; } | ||
18838 | -if test "${ac_cv_lib_spe2_spe_context_run+set}" = set; then | ||
18839 | +if test "${ac_cv_lib_spe2_spe_context_run+set}" = set; then : | ||
18840 | $as_echo_n "(cached) " >&6 | ||
18841 | else | ||
18842 | ac_check_lib_save_LIBS=$LIBS | ||
18843 | LIBS="-lspe2 $LIBS" | ||
18844 | -cat >conftest.$ac_ext <<_ACEOF | ||
18845 | -/* confdefs.h. */ | ||
18846 | -_ACEOF | ||
18847 | -cat confdefs.h >>conftest.$ac_ext | ||
18848 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18849 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18850 | /* end confdefs.h. */ | ||
18851 | |||
18852 | /* Override any GCC internal prototype to avoid an error. | ||
18853 | @@ -21348,43 +15372,18 @@ | ||
18854 | return 0; | ||
18855 | } | ||
18856 | _ACEOF | ||
18857 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18858 | -if { (ac_try="$ac_link" | ||
18859 | -case "(($ac_try" in | ||
18860 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18861 | - *) ac_try_echo=$ac_try;; | ||
18862 | -esac | ||
18863 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18864 | -$as_echo "$ac_try_echo") >&5 | ||
18865 | - (eval "$ac_link") 2>conftest.er1 | ||
18866 | - ac_status=$? | ||
18867 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18868 | - rm -f conftest.er1 | ||
18869 | - cat conftest.err >&5 | ||
18870 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18871 | - (exit $ac_status); } && { | ||
18872 | - test -z "$ac_c_werror_flag" || | ||
18873 | - test ! -s conftest.err | ||
18874 | - } && test -s conftest$ac_exeext && { | ||
18875 | - test "$cross_compiling" = yes || | ||
18876 | - $as_test_x conftest$ac_exeext | ||
18877 | - }; then | ||
18878 | +if ac_fn_c_try_link "$LINENO"; then : | ||
18879 | ac_cv_lib_spe2_spe_context_run=yes | ||
18880 | else | ||
18881 | - $as_echo "$as_me: failed program was:" >&5 | ||
18882 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18883 | - | ||
18884 | - ac_cv_lib_spe2_spe_context_run=no | ||
18885 | + ac_cv_lib_spe2_spe_context_run=no | ||
18886 | fi | ||
18887 | - | ||
18888 | -rm -rf conftest.dSYM | ||
18889 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18890 | - conftest$ac_exeext conftest.$ac_ext | ||
18891 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18892 | + conftest$ac_exeext conftest.$ac_ext | ||
18893 | LIBS=$ac_check_lib_save_LIBS | ||
18894 | fi | ||
18895 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_spe2_spe_context_run" >&5 | ||
18896 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spe2_spe_context_run" >&5 | ||
18897 | $as_echo "$ac_cv_lib_spe2_spe_context_run" >&6; } | ||
18898 | -if test "x$ac_cv_lib_spe2_spe_context_run" = x""yes; then | ||
18899 | +if test "x$ac_cv_lib_spe2_spe_context_run" = x""yes; then : | ||
18900 | cat >>confdefs.h <<_ACEOF | ||
18901 | #define HAVE_LIBSPE2 1 | ||
18902 | _ACEOF | ||
18903 | @@ -21392,19 +15391,14 @@ | ||
18904 | LIBS="-lspe2 $LIBS" | ||
18905 | |||
18906 | else | ||
18907 | - | ||
18908 | -{ $as_echo "$as_me:$LINENO: checking for spe_wait in -lspe" >&5 | ||
18909 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spe_wait in -lspe" >&5 | ||
18910 | $as_echo_n "checking for spe_wait in -lspe... " >&6; } | ||
18911 | -if test "${ac_cv_lib_spe_spe_wait+set}" = set; then | ||
18912 | +if test "${ac_cv_lib_spe_spe_wait+set}" = set; then : | ||
18913 | $as_echo_n "(cached) " >&6 | ||
18914 | else | ||
18915 | ac_check_lib_save_LIBS=$LIBS | ||
18916 | LIBS="-lspe $LIBS" | ||
18917 | -cat >conftest.$ac_ext <<_ACEOF | ||
18918 | -/* confdefs.h. */ | ||
18919 | -_ACEOF | ||
18920 | -cat confdefs.h >>conftest.$ac_ext | ||
18921 | -cat >>conftest.$ac_ext <<_ACEOF | ||
18922 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
18923 | /* end confdefs.h. */ | ||
18924 | |||
18925 | /* Override any GCC internal prototype to avoid an error. | ||
18926 | @@ -21422,43 +15416,18 @@ | ||
18927 | return 0; | ||
18928 | } | ||
18929 | _ACEOF | ||
18930 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
18931 | -if { (ac_try="$ac_link" | ||
18932 | -case "(($ac_try" in | ||
18933 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18934 | - *) ac_try_echo=$ac_try;; | ||
18935 | -esac | ||
18936 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
18937 | -$as_echo "$ac_try_echo") >&5 | ||
18938 | - (eval "$ac_link") 2>conftest.er1 | ||
18939 | - ac_status=$? | ||
18940 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
18941 | - rm -f conftest.er1 | ||
18942 | - cat conftest.err >&5 | ||
18943 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18944 | - (exit $ac_status); } && { | ||
18945 | - test -z "$ac_c_werror_flag" || | ||
18946 | - test ! -s conftest.err | ||
18947 | - } && test -s conftest$ac_exeext && { | ||
18948 | - test "$cross_compiling" = yes || | ||
18949 | - $as_test_x conftest$ac_exeext | ||
18950 | - }; then | ||
18951 | +if ac_fn_c_try_link "$LINENO"; then : | ||
18952 | ac_cv_lib_spe_spe_wait=yes | ||
18953 | else | ||
18954 | - $as_echo "$as_me: failed program was:" >&5 | ||
18955 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
18956 | - | ||
18957 | - ac_cv_lib_spe_spe_wait=no | ||
18958 | + ac_cv_lib_spe_spe_wait=no | ||
18959 | fi | ||
18960 | - | ||
18961 | -rm -rf conftest.dSYM | ||
18962 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18963 | - conftest$ac_exeext conftest.$ac_ext | ||
18964 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18965 | + conftest$ac_exeext conftest.$ac_ext | ||
18966 | LIBS=$ac_check_lib_save_LIBS | ||
18967 | fi | ||
18968 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_spe_spe_wait" >&5 | ||
18969 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spe_spe_wait" >&5 | ||
18970 | $as_echo "$ac_cv_lib_spe_spe_wait" >&6; } | ||
18971 | -if test "x$ac_cv_lib_spe_spe_wait" = x""yes; then | ||
18972 | +if test "x$ac_cv_lib_spe_spe_wait" = x""yes; then : | ||
18973 | cat >>confdefs.h <<_ACEOF | ||
18974 | #define HAVE_LIBSPE 1 | ||
18975 | _ACEOF | ||
18976 | @@ -21471,118 +15440,11 @@ | ||
18977 | |||
18978 | fi | ||
18979 | |||
18980 | - | ||
18981 | - | ||
18982 | - | ||
18983 | - | ||
18984 | - | ||
18985 | - | ||
18986 | - | ||
18987 | - | ||
18988 | - | ||
18989 | - | ||
18990 | - | ||
18991 | - | ||
18992 | - | ||
18993 | - | ||
18994 | - | ||
18995 | - | ||
18996 | - | ||
18997 | - | ||
18998 | - | ||
18999 | for ac_func in BSDgettimeofday gettimeofday gethrtime read_real_time time_base_to_time drand48 sqrt memset posix_memalign memalign _mm_malloc _mm_free clock_gettime mach_absolute_time sysctl abort sinl cosl snprintf | ||
19000 | -do | ||
19001 | -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
19002 | -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
19003 | -$as_echo_n "checking for $ac_func... " >&6; } | ||
19004 | -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
19005 | - $as_echo_n "(cached) " >&6 | ||
19006 | -else | ||
19007 | - cat >conftest.$ac_ext <<_ACEOF | ||
19008 | -/* confdefs.h. */ | ||
19009 | -_ACEOF | ||
19010 | -cat confdefs.h >>conftest.$ac_ext | ||
19011 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19012 | -/* end confdefs.h. */ | ||
19013 | -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
19014 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
19015 | -#define $ac_func innocuous_$ac_func | ||
19016 | - | ||
19017 | -/* System header to define __stub macros and hopefully few prototypes, | ||
19018 | - which can conflict with char $ac_func (); below. | ||
19019 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
19020 | - <limits.h> exists even on freestanding compilers. */ | ||
19021 | - | ||
19022 | -#ifdef __STDC__ | ||
19023 | -# include <limits.h> | ||
19024 | -#else | ||
19025 | -# include <assert.h> | ||
19026 | -#endif | ||
19027 | - | ||
19028 | -#undef $ac_func | ||
19029 | - | ||
19030 | -/* Override any GCC internal prototype to avoid an error. | ||
19031 | - Use char because int might match the return type of a GCC | ||
19032 | - builtin and then its argument prototype would still apply. */ | ||
19033 | -#ifdef __cplusplus | ||
19034 | -extern "C" | ||
19035 | -#endif | ||
19036 | -char $ac_func (); | ||
19037 | -/* The GNU C library defines this for functions which it implements | ||
19038 | - to always fail with ENOSYS. Some functions are actually named | ||
19039 | - something starting with __ and the normal name is an alias. */ | ||
19040 | -#if defined __stub_$ac_func || defined __stub___$ac_func | ||
19041 | -choke me | ||
19042 | -#endif | ||
19043 | - | ||
19044 | -int | ||
19045 | -main () | ||
19046 | -{ | ||
19047 | -return $ac_func (); | ||
19048 | - ; | ||
19049 | - return 0; | ||
19050 | -} | ||
19051 | -_ACEOF | ||
19052 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
19053 | -if { (ac_try="$ac_link" | ||
19054 | -case "(($ac_try" in | ||
19055 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19056 | - *) ac_try_echo=$ac_try;; | ||
19057 | -esac | ||
19058 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19059 | -$as_echo "$ac_try_echo") >&5 | ||
19060 | - (eval "$ac_link") 2>conftest.er1 | ||
19061 | - ac_status=$? | ||
19062 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19063 | - rm -f conftest.er1 | ||
19064 | - cat conftest.err >&5 | ||
19065 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19066 | - (exit $ac_status); } && { | ||
19067 | - test -z "$ac_c_werror_flag" || | ||
19068 | - test ! -s conftest.err | ||
19069 | - } && test -s conftest$ac_exeext && { | ||
19070 | - test "$cross_compiling" = yes || | ||
19071 | - $as_test_x conftest$ac_exeext | ||
19072 | - }; then | ||
19073 | - eval "$as_ac_var=yes" | ||
19074 | -else | ||
19075 | - $as_echo "$as_me: failed program was:" >&5 | ||
19076 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19077 | - | ||
19078 | - eval "$as_ac_var=no" | ||
19079 | -fi | ||
19080 | - | ||
19081 | -rm -rf conftest.dSYM | ||
19082 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
19083 | - conftest$ac_exeext conftest.$ac_ext | ||
19084 | -fi | ||
19085 | -ac_res=`eval 'as_val=${'$as_ac_var'} | ||
19086 | - $as_echo "$as_val"'` | ||
19087 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
19088 | -$as_echo "$ac_res" >&6; } | ||
19089 | -as_val=`eval 'as_val=${'$as_ac_var'} | ||
19090 | - $as_echo "$as_val"'` | ||
19091 | - if test "x$as_val" = x""yes; then | ||
19092 | +do : | ||
19093 | + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
19094 | +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||
19095 | +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | ||
19096 | cat >>confdefs.h <<_ACEOF | ||
19097 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
19098 | _ACEOF | ||
19099 | @@ -21590,352 +15452,62 @@ | ||
19100 | fi | ||
19101 | done | ||
19102 | |||
19103 | -{ $as_echo "$as_me:$LINENO: checking whether drand48 is declared" >&5 | ||
19104 | -$as_echo_n "checking whether drand48 is declared... " >&6; } | ||
19105 | -if test "${ac_cv_have_decl_drand48+set}" = set; then | ||
19106 | - $as_echo_n "(cached) " >&6 | ||
19107 | -else | ||
19108 | - cat >conftest.$ac_ext <<_ACEOF | ||
19109 | -/* confdefs.h. */ | ||
19110 | -_ACEOF | ||
19111 | -cat confdefs.h >>conftest.$ac_ext | ||
19112 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19113 | -/* end confdefs.h. */ | ||
19114 | -$ac_includes_default | ||
19115 | -int | ||
19116 | -main () | ||
19117 | -{ | ||
19118 | -#ifndef drand48 | ||
19119 | - (void) drand48; | ||
19120 | -#endif | ||
19121 | - | ||
19122 | - ; | ||
19123 | - return 0; | ||
19124 | -} | ||
19125 | -_ACEOF | ||
19126 | -rm -f conftest.$ac_objext | ||
19127 | -if { (ac_try="$ac_compile" | ||
19128 | -case "(($ac_try" in | ||
19129 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19130 | - *) ac_try_echo=$ac_try;; | ||
19131 | -esac | ||
19132 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19133 | -$as_echo "$ac_try_echo") >&5 | ||
19134 | - (eval "$ac_compile") 2>conftest.er1 | ||
19135 | - ac_status=$? | ||
19136 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19137 | - rm -f conftest.er1 | ||
19138 | - cat conftest.err >&5 | ||
19139 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19140 | - (exit $ac_status); } && { | ||
19141 | - test -z "$ac_c_werror_flag" || | ||
19142 | - test ! -s conftest.err | ||
19143 | - } && test -s conftest.$ac_objext; then | ||
19144 | - ac_cv_have_decl_drand48=yes | ||
19145 | +ac_fn_c_check_decl "$LINENO" "drand48" "ac_cv_have_decl_drand48" "$ac_includes_default" | ||
19146 | +if test "x$ac_cv_have_decl_drand48" = x""yes; then : | ||
19147 | + ac_have_decl=1 | ||
19148 | else | ||
19149 | - $as_echo "$as_me: failed program was:" >&5 | ||
19150 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19151 | - | ||
19152 | - ac_cv_have_decl_drand48=no | ||
19153 | + ac_have_decl=0 | ||
19154 | fi | ||
19155 | |||
19156 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19157 | -fi | ||
19158 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_drand48" >&5 | ||
19159 | -$as_echo "$ac_cv_have_decl_drand48" >&6; } | ||
19160 | -if test "x$ac_cv_have_decl_drand48" = x""yes; then | ||
19161 | - | ||
19162 | cat >>confdefs.h <<_ACEOF | ||
19163 | -#define HAVE_DECL_DRAND48 1 | ||
19164 | -_ACEOF | ||
19165 | - | ||
19166 | - | ||
19167 | -else | ||
19168 | - cat >>confdefs.h <<_ACEOF | ||
19169 | -#define HAVE_DECL_DRAND48 0 | ||
19170 | -_ACEOF | ||
19171 | - | ||
19172 | - | ||
19173 | -fi | ||
19174 | -{ $as_echo "$as_me:$LINENO: checking whether memalign is declared" >&5 | ||
19175 | -$as_echo_n "checking whether memalign is declared... " >&6; } | ||
19176 | -if test "${ac_cv_have_decl_memalign+set}" = set; then | ||
19177 | - $as_echo_n "(cached) " >&6 | ||
19178 | -else | ||
19179 | - cat >conftest.$ac_ext <<_ACEOF | ||
19180 | -/* confdefs.h. */ | ||
19181 | -_ACEOF | ||
19182 | -cat confdefs.h >>conftest.$ac_ext | ||
19183 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19184 | -/* end confdefs.h. */ | ||
19185 | -$ac_includes_default | ||
19186 | -int | ||
19187 | -main () | ||
19188 | -{ | ||
19189 | -#ifndef memalign | ||
19190 | - (void) memalign; | ||
19191 | -#endif | ||
19192 | - | ||
19193 | - ; | ||
19194 | - return 0; | ||
19195 | -} | ||
19196 | +#define HAVE_DECL_DRAND48 $ac_have_decl | ||
19197 | _ACEOF | ||
19198 | -rm -f conftest.$ac_objext | ||
19199 | -if { (ac_try="$ac_compile" | ||
19200 | -case "(($ac_try" in | ||
19201 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19202 | - *) ac_try_echo=$ac_try;; | ||
19203 | -esac | ||
19204 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19205 | -$as_echo "$ac_try_echo") >&5 | ||
19206 | - (eval "$ac_compile") 2>conftest.er1 | ||
19207 | - ac_status=$? | ||
19208 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19209 | - rm -f conftest.er1 | ||
19210 | - cat conftest.err >&5 | ||
19211 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19212 | - (exit $ac_status); } && { | ||
19213 | - test -z "$ac_c_werror_flag" || | ||
19214 | - test ! -s conftest.err | ||
19215 | - } && test -s conftest.$ac_objext; then | ||
19216 | - ac_cv_have_decl_memalign=yes | ||
19217 | +ac_fn_c_check_decl "$LINENO" "memalign" "ac_cv_have_decl_memalign" "$ac_includes_default" | ||
19218 | +if test "x$ac_cv_have_decl_memalign" = x""yes; then : | ||
19219 | + ac_have_decl=1 | ||
19220 | else | ||
19221 | - $as_echo "$as_me: failed program was:" >&5 | ||
19222 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19223 | - | ||
19224 | - ac_cv_have_decl_memalign=no | ||
19225 | -fi | ||
19226 | - | ||
19227 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19228 | + ac_have_decl=0 | ||
19229 | fi | ||
19230 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_memalign" >&5 | ||
19231 | -$as_echo "$ac_cv_have_decl_memalign" >&6; } | ||
19232 | -if test "x$ac_cv_have_decl_memalign" = x""yes; then | ||
19233 | |||
19234 | cat >>confdefs.h <<_ACEOF | ||
19235 | -#define HAVE_DECL_MEMALIGN 1 | ||
19236 | -_ACEOF | ||
19237 | - | ||
19238 | - | ||
19239 | -else | ||
19240 | - cat >>confdefs.h <<_ACEOF | ||
19241 | -#define HAVE_DECL_MEMALIGN 0 | ||
19242 | -_ACEOF | ||
19243 | - | ||
19244 | - | ||
19245 | -fi | ||
19246 | -{ $as_echo "$as_me:$LINENO: checking whether posix_memalign is declared" >&5 | ||
19247 | -$as_echo_n "checking whether posix_memalign is declared... " >&6; } | ||
19248 | -if test "${ac_cv_have_decl_posix_memalign+set}" = set; then | ||
19249 | - $as_echo_n "(cached) " >&6 | ||
19250 | -else | ||
19251 | - cat >conftest.$ac_ext <<_ACEOF | ||
19252 | -/* confdefs.h. */ | ||
19253 | -_ACEOF | ||
19254 | -cat confdefs.h >>conftest.$ac_ext | ||
19255 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19256 | -/* end confdefs.h. */ | ||
19257 | -$ac_includes_default | ||
19258 | -int | ||
19259 | -main () | ||
19260 | -{ | ||
19261 | -#ifndef posix_memalign | ||
19262 | - (void) posix_memalign; | ||
19263 | -#endif | ||
19264 | - | ||
19265 | - ; | ||
19266 | - return 0; | ||
19267 | -} | ||
19268 | +#define HAVE_DECL_MEMALIGN $ac_have_decl | ||
19269 | _ACEOF | ||
19270 | -rm -f conftest.$ac_objext | ||
19271 | -if { (ac_try="$ac_compile" | ||
19272 | -case "(($ac_try" in | ||
19273 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19274 | - *) ac_try_echo=$ac_try;; | ||
19275 | -esac | ||
19276 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19277 | -$as_echo "$ac_try_echo") >&5 | ||
19278 | - (eval "$ac_compile") 2>conftest.er1 | ||
19279 | - ac_status=$? | ||
19280 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19281 | - rm -f conftest.er1 | ||
19282 | - cat conftest.err >&5 | ||
19283 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19284 | - (exit $ac_status); } && { | ||
19285 | - test -z "$ac_c_werror_flag" || | ||
19286 | - test ! -s conftest.err | ||
19287 | - } && test -s conftest.$ac_objext; then | ||
19288 | - ac_cv_have_decl_posix_memalign=yes | ||
19289 | +ac_fn_c_check_decl "$LINENO" "posix_memalign" "ac_cv_have_decl_posix_memalign" "$ac_includes_default" | ||
19290 | +if test "x$ac_cv_have_decl_posix_memalign" = x""yes; then : | ||
19291 | + ac_have_decl=1 | ||
19292 | else | ||
19293 | - $as_echo "$as_me: failed program was:" >&5 | ||
19294 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19295 | - | ||
19296 | - ac_cv_have_decl_posix_memalign=no | ||
19297 | -fi | ||
19298 | - | ||
19299 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19300 | + ac_have_decl=0 | ||
19301 | fi | ||
19302 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_posix_memalign" >&5 | ||
19303 | -$as_echo "$ac_cv_have_decl_posix_memalign" >&6; } | ||
19304 | -if test "x$ac_cv_have_decl_posix_memalign" = x""yes; then | ||
19305 | |||
19306 | cat >>confdefs.h <<_ACEOF | ||
19307 | -#define HAVE_DECL_POSIX_MEMALIGN 1 | ||
19308 | -_ACEOF | ||
19309 | - | ||
19310 | - | ||
19311 | -else | ||
19312 | - cat >>confdefs.h <<_ACEOF | ||
19313 | -#define HAVE_DECL_POSIX_MEMALIGN 0 | ||
19314 | -_ACEOF | ||
19315 | - | ||
19316 | - | ||
19317 | -fi | ||
19318 | -{ $as_echo "$as_me:$LINENO: checking whether sinl is declared" >&5 | ||
19319 | -$as_echo_n "checking whether sinl is declared... " >&6; } | ||
19320 | -if test "${ac_cv_have_decl_sinl+set}" = set; then | ||
19321 | - $as_echo_n "(cached) " >&6 | ||
19322 | -else | ||
19323 | - cat >conftest.$ac_ext <<_ACEOF | ||
19324 | -/* confdefs.h. */ | ||
19325 | -_ACEOF | ||
19326 | -cat confdefs.h >>conftest.$ac_ext | ||
19327 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19328 | -/* end confdefs.h. */ | ||
19329 | -$ac_includes_default | ||
19330 | -int | ||
19331 | -main () | ||
19332 | -{ | ||
19333 | -#ifndef sinl | ||
19334 | - (void) sinl; | ||
19335 | -#endif | ||
19336 | - | ||
19337 | - ; | ||
19338 | - return 0; | ||
19339 | -} | ||
19340 | +#define HAVE_DECL_POSIX_MEMALIGN $ac_have_decl | ||
19341 | _ACEOF | ||
19342 | -rm -f conftest.$ac_objext | ||
19343 | -if { (ac_try="$ac_compile" | ||
19344 | -case "(($ac_try" in | ||
19345 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19346 | - *) ac_try_echo=$ac_try;; | ||
19347 | -esac | ||
19348 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19349 | -$as_echo "$ac_try_echo") >&5 | ||
19350 | - (eval "$ac_compile") 2>conftest.er1 | ||
19351 | - ac_status=$? | ||
19352 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19353 | - rm -f conftest.er1 | ||
19354 | - cat conftest.err >&5 | ||
19355 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19356 | - (exit $ac_status); } && { | ||
19357 | - test -z "$ac_c_werror_flag" || | ||
19358 | - test ! -s conftest.err | ||
19359 | - } && test -s conftest.$ac_objext; then | ||
19360 | - ac_cv_have_decl_sinl=yes | ||
19361 | +ac_fn_c_check_decl "$LINENO" "sinl" "ac_cv_have_decl_sinl" "$ac_includes_default" | ||
19362 | +if test "x$ac_cv_have_decl_sinl" = x""yes; then : | ||
19363 | + ac_have_decl=1 | ||
19364 | else | ||
19365 | - $as_echo "$as_me: failed program was:" >&5 | ||
19366 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19367 | - | ||
19368 | - ac_cv_have_decl_sinl=no | ||
19369 | -fi | ||
19370 | - | ||
19371 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19372 | + ac_have_decl=0 | ||
19373 | fi | ||
19374 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sinl" >&5 | ||
19375 | -$as_echo "$ac_cv_have_decl_sinl" >&6; } | ||
19376 | -if test "x$ac_cv_have_decl_sinl" = x""yes; then | ||
19377 | |||
19378 | cat >>confdefs.h <<_ACEOF | ||
19379 | -#define HAVE_DECL_SINL 1 | ||
19380 | -_ACEOF | ||
19381 | - | ||
19382 | - | ||
19383 | -else | ||
19384 | - cat >>confdefs.h <<_ACEOF | ||
19385 | -#define HAVE_DECL_SINL 0 | ||
19386 | -_ACEOF | ||
19387 | - | ||
19388 | - | ||
19389 | -fi | ||
19390 | -{ $as_echo "$as_me:$LINENO: checking whether cosl is declared" >&5 | ||
19391 | -$as_echo_n "checking whether cosl is declared... " >&6; } | ||
19392 | -if test "${ac_cv_have_decl_cosl+set}" = set; then | ||
19393 | - $as_echo_n "(cached) " >&6 | ||
19394 | -else | ||
19395 | - cat >conftest.$ac_ext <<_ACEOF | ||
19396 | -/* confdefs.h. */ | ||
19397 | -_ACEOF | ||
19398 | -cat confdefs.h >>conftest.$ac_ext | ||
19399 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19400 | -/* end confdefs.h. */ | ||
19401 | -$ac_includes_default | ||
19402 | -int | ||
19403 | -main () | ||
19404 | -{ | ||
19405 | -#ifndef cosl | ||
19406 | - (void) cosl; | ||
19407 | -#endif | ||
19408 | - | ||
19409 | - ; | ||
19410 | - return 0; | ||
19411 | -} | ||
19412 | +#define HAVE_DECL_SINL $ac_have_decl | ||
19413 | _ACEOF | ||
19414 | -rm -f conftest.$ac_objext | ||
19415 | -if { (ac_try="$ac_compile" | ||
19416 | -case "(($ac_try" in | ||
19417 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19418 | - *) ac_try_echo=$ac_try;; | ||
19419 | -esac | ||
19420 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19421 | -$as_echo "$ac_try_echo") >&5 | ||
19422 | - (eval "$ac_compile") 2>conftest.er1 | ||
19423 | - ac_status=$? | ||
19424 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19425 | - rm -f conftest.er1 | ||
19426 | - cat conftest.err >&5 | ||
19427 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19428 | - (exit $ac_status); } && { | ||
19429 | - test -z "$ac_c_werror_flag" || | ||
19430 | - test ! -s conftest.err | ||
19431 | - } && test -s conftest.$ac_objext; then | ||
19432 | - ac_cv_have_decl_cosl=yes | ||
19433 | +ac_fn_c_check_decl "$LINENO" "cosl" "ac_cv_have_decl_cosl" "$ac_includes_default" | ||
19434 | +if test "x$ac_cv_have_decl_cosl" = x""yes; then : | ||
19435 | + ac_have_decl=1 | ||
19436 | else | ||
19437 | - $as_echo "$as_me: failed program was:" >&5 | ||
19438 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19439 | - | ||
19440 | - ac_cv_have_decl_cosl=no | ||
19441 | -fi | ||
19442 | - | ||
19443 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19444 | + ac_have_decl=0 | ||
19445 | fi | ||
19446 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_cosl" >&5 | ||
19447 | -$as_echo "$ac_cv_have_decl_cosl" >&6; } | ||
19448 | -if test "x$ac_cv_have_decl_cosl" = x""yes; then | ||
19449 | |||
19450 | cat >>confdefs.h <<_ACEOF | ||
19451 | -#define HAVE_DECL_COSL 1 | ||
19452 | -_ACEOF | ||
19453 | - | ||
19454 | - | ||
19455 | -else | ||
19456 | - cat >>confdefs.h <<_ACEOF | ||
19457 | -#define HAVE_DECL_COSL 0 | ||
19458 | +#define HAVE_DECL_COSL $ac_have_decl | ||
19459 | _ACEOF | ||
19460 | |||
19461 | |||
19462 | -fi | ||
19463 | - | ||
19464 | - | ||
19465 | - | ||
19466 | -{ $as_echo "$as_me:$LINENO: checking for _rtc intrinsic" >&5 | ||
19467 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _rtc intrinsic" >&5 | ||
19468 | $as_echo_n "checking for _rtc intrinsic... " >&6; } | ||
19469 | rtc_ok=yes | ||
19470 | -cat >conftest.$ac_ext <<_ACEOF | ||
19471 | -/* confdefs.h. */ | ||
19472 | -_ACEOF | ||
19473 | -cat confdefs.h >>conftest.$ac_ext | ||
19474 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19475 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19476 | /* end confdefs.h. */ | ||
19477 | #ifdef HAVE_INTRINSICS_H | ||
19478 | #include <intrinsics.h> | ||
19479 | @@ -21948,162 +15520,38 @@ | ||
19480 | return 0; | ||
19481 | } | ||
19482 | _ACEOF | ||
19483 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
19484 | -if { (ac_try="$ac_link" | ||
19485 | -case "(($ac_try" in | ||
19486 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19487 | - *) ac_try_echo=$ac_try;; | ||
19488 | -esac | ||
19489 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19490 | -$as_echo "$ac_try_echo") >&5 | ||
19491 | - (eval "$ac_link") 2>conftest.er1 | ||
19492 | - ac_status=$? | ||
19493 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19494 | - rm -f conftest.er1 | ||
19495 | - cat conftest.err >&5 | ||
19496 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19497 | - (exit $ac_status); } && { | ||
19498 | - test -z "$ac_c_werror_flag" || | ||
19499 | - test ! -s conftest.err | ||
19500 | - } && test -s conftest$ac_exeext && { | ||
19501 | - test "$cross_compiling" = yes || | ||
19502 | - $as_test_x conftest$ac_exeext | ||
19503 | - }; then | ||
19504 | +if ac_fn_c_try_link "$LINENO"; then : | ||
19505 | |||
19506 | -cat >>confdefs.h <<\_ACEOF | ||
19507 | -#define HAVE__RTC 1 | ||
19508 | -_ACEOF | ||
19509 | +$as_echo "#define HAVE__RTC 1" >>confdefs.h | ||
19510 | |||
19511 | else | ||
19512 | - $as_echo "$as_me: failed program was:" >&5 | ||
19513 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19514 | - | ||
19515 | - rtc_ok=no | ||
19516 | + rtc_ok=no | ||
19517 | fi | ||
19518 | - | ||
19519 | -rm -rf conftest.dSYM | ||
19520 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
19521 | - conftest$ac_exeext conftest.$ac_ext | ||
19522 | -{ $as_echo "$as_me:$LINENO: result: $rtc_ok" >&5 | ||
19523 | +rm -f core conftest.err conftest.$ac_objext \ | ||
19524 | + conftest$ac_exeext conftest.$ac_ext | ||
19525 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rtc_ok" >&5 | ||
19526 | $as_echo "$rtc_ok" >&6; } | ||
19527 | |||
19528 | if test "$PRECISION" = "l"; then | ||
19529 | - | ||
19530 | - | ||
19531 | - | ||
19532 | -for ac_func in cosl sinl tanl | ||
19533 | -do | ||
19534 | -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
19535 | -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
19536 | -$as_echo_n "checking for $ac_func... " >&6; } | ||
19537 | -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
19538 | - $as_echo_n "(cached) " >&6 | ||
19539 | -else | ||
19540 | - cat >conftest.$ac_ext <<_ACEOF | ||
19541 | -/* confdefs.h. */ | ||
19542 | -_ACEOF | ||
19543 | -cat confdefs.h >>conftest.$ac_ext | ||
19544 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19545 | -/* end confdefs.h. */ | ||
19546 | -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
19547 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
19548 | -#define $ac_func innocuous_$ac_func | ||
19549 | - | ||
19550 | -/* System header to define __stub macros and hopefully few prototypes, | ||
19551 | - which can conflict with char $ac_func (); below. | ||
19552 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
19553 | - <limits.h> exists even on freestanding compilers. */ | ||
19554 | - | ||
19555 | -#ifdef __STDC__ | ||
19556 | -# include <limits.h> | ||
19557 | -#else | ||
19558 | -# include <assert.h> | ||
19559 | -#endif | ||
19560 | - | ||
19561 | -#undef $ac_func | ||
19562 | - | ||
19563 | -/* Override any GCC internal prototype to avoid an error. | ||
19564 | - Use char because int might match the return type of a GCC | ||
19565 | - builtin and then its argument prototype would still apply. */ | ||
19566 | -#ifdef __cplusplus | ||
19567 | -extern "C" | ||
19568 | -#endif | ||
19569 | -char $ac_func (); | ||
19570 | -/* The GNU C library defines this for functions which it implements | ||
19571 | - to always fail with ENOSYS. Some functions are actually named | ||
19572 | - something starting with __ and the normal name is an alias. */ | ||
19573 | -#if defined __stub_$ac_func || defined __stub___$ac_func | ||
19574 | -choke me | ||
19575 | -#endif | ||
19576 | - | ||
19577 | -int | ||
19578 | -main () | ||
19579 | -{ | ||
19580 | -return $ac_func (); | ||
19581 | - ; | ||
19582 | - return 0; | ||
19583 | -} | ||
19584 | -_ACEOF | ||
19585 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
19586 | -if { (ac_try="$ac_link" | ||
19587 | -case "(($ac_try" in | ||
19588 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19589 | - *) ac_try_echo=$ac_try;; | ||
19590 | -esac | ||
19591 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19592 | -$as_echo "$ac_try_echo") >&5 | ||
19593 | - (eval "$ac_link") 2>conftest.er1 | ||
19594 | - ac_status=$? | ||
19595 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19596 | - rm -f conftest.er1 | ||
19597 | - cat conftest.err >&5 | ||
19598 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19599 | - (exit $ac_status); } && { | ||
19600 | - test -z "$ac_c_werror_flag" || | ||
19601 | - test ! -s conftest.err | ||
19602 | - } && test -s conftest$ac_exeext && { | ||
19603 | - test "$cross_compiling" = yes || | ||
19604 | - $as_test_x conftest$ac_exeext | ||
19605 | - }; then | ||
19606 | - eval "$as_ac_var=yes" | ||
19607 | -else | ||
19608 | - $as_echo "$as_me: failed program was:" >&5 | ||
19609 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19610 | - | ||
19611 | - eval "$as_ac_var=no" | ||
19612 | -fi | ||
19613 | - | ||
19614 | -rm -rf conftest.dSYM | ||
19615 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
19616 | - conftest$ac_exeext conftest.$ac_ext | ||
19617 | -fi | ||
19618 | -ac_res=`eval 'as_val=${'$as_ac_var'} | ||
19619 | - $as_echo "$as_val"'` | ||
19620 | - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
19621 | -$as_echo "$ac_res" >&6; } | ||
19622 | -as_val=`eval 'as_val=${'$as_ac_var'} | ||
19623 | - $as_echo "$as_val"'` | ||
19624 | - if test "x$as_val" = x""yes; then | ||
19625 | + for ac_func in cosl sinl tanl | ||
19626 | +do : | ||
19627 | + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
19628 | +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||
19629 | +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | ||
19630 | cat >>confdefs.h <<_ACEOF | ||
19631 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
19632 | _ACEOF | ||
19633 | |||
19634 | else | ||
19635 | - { { $as_echo "$as_me:$LINENO: error: long-double precision requires long-double trigonometric routines" >&5 | ||
19636 | -$as_echo "$as_me: error: long-double precision requires long-double trigonometric routines" >&2;} | ||
19637 | - { (exit 1); exit 1; }; } | ||
19638 | + as_fn_error $? "long-double precision requires long-double trigonometric routines" "$LINENO" 5 | ||
19639 | fi | ||
19640 | done | ||
19641 | |||
19642 | fi | ||
19643 | |||
19644 | -{ $as_echo "$as_me:$LINENO: checking for isnan" >&5 | ||
19645 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan" >&5 | ||
19646 | $as_echo_n "checking for isnan... " >&6; } | ||
19647 | -cat >conftest.$ac_ext <<_ACEOF | ||
19648 | -/* confdefs.h. */ | ||
19649 | -_ACEOF | ||
19650 | -cat confdefs.h >>conftest.$ac_ext | ||
19651 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19652 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19653 | /* end confdefs.h. */ | ||
19654 | #include <math.h> | ||
19655 | |||
19656 | @@ -22115,65 +15563,30 @@ | ||
19657 | return 0; | ||
19658 | } | ||
19659 | _ACEOF | ||
19660 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
19661 | -if { (ac_try="$ac_link" | ||
19662 | -case "(($ac_try" in | ||
19663 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19664 | - *) ac_try_echo=$ac_try;; | ||
19665 | -esac | ||
19666 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19667 | -$as_echo "$ac_try_echo") >&5 | ||
19668 | - (eval "$ac_link") 2>conftest.er1 | ||
19669 | - ac_status=$? | ||
19670 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19671 | - rm -f conftest.er1 | ||
19672 | - cat conftest.err >&5 | ||
19673 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19674 | - (exit $ac_status); } && { | ||
19675 | - test -z "$ac_c_werror_flag" || | ||
19676 | - test ! -s conftest.err | ||
19677 | - } && test -s conftest$ac_exeext && { | ||
19678 | - test "$cross_compiling" = yes || | ||
19679 | - $as_test_x conftest$ac_exeext | ||
19680 | - }; then | ||
19681 | +if ac_fn_c_try_link "$LINENO"; then : | ||
19682 | ok=yes | ||
19683 | else | ||
19684 | - $as_echo "$as_me: failed program was:" >&5 | ||
19685 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19686 | - | ||
19687 | - ok=no | ||
19688 | + ok=no | ||
19689 | fi | ||
19690 | - | ||
19691 | -rm -rf conftest.dSYM | ||
19692 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
19693 | - conftest$ac_exeext conftest.$ac_ext | ||
19694 | +rm -f core conftest.err conftest.$ac_objext \ | ||
19695 | + conftest$ac_exeext conftest.$ac_ext | ||
19696 | if test "$ok" = "yes"; then | ||
19697 | |||
19698 | -cat >>confdefs.h <<\_ACEOF | ||
19699 | -#define HAVE_ISNAN 1 | ||
19700 | -_ACEOF | ||
19701 | +$as_echo "#define HAVE_ISNAN 1" >>confdefs.h | ||
19702 | |||
19703 | fi | ||
19704 | -{ $as_echo "$as_me:$LINENO: result: ${ok}" >&5 | ||
19705 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ok}" >&5 | ||
19706 | $as_echo "${ok}" >&6; } | ||
19707 | |||
19708 | |||
19709 | |||
19710 | ax_gcc_aligns_stack=no | ||
19711 | if test "$GCC" = "yes"; then | ||
19712 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -mpreferred-stack-boundary=4" >&5 | ||
19713 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mpreferred-stack-boundary=4" >&5 | ||
19714 | $as_echo_n "checking whether C compiler accepts -mpreferred-stack-boundary=4... " >&6; } | ||
19715 | -if test "${ax_cv_c_flags__mpreferred_stack_boundary_4+set}" = set; then | ||
19716 | - $as_echo_n "(cached) " >&6 | ||
19717 | -else | ||
19718 | - | ||
19719 | - ax_save_FLAGS=$CFLAGS | ||
19720 | - CFLAGS="-mpreferred-stack-boundary=4" | ||
19721 | - cat >conftest.$ac_ext <<_ACEOF | ||
19722 | -/* confdefs.h. */ | ||
19723 | -_ACEOF | ||
19724 | -cat confdefs.h >>conftest.$ac_ext | ||
19725 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19726 | +ax_save_FLAGS=$CFLAGS | ||
19727 | + CFLAGS="-mpreferred-stack-boundary=4" | ||
19728 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19729 | /* end confdefs.h. */ | ||
19730 | |||
19731 | int | ||
19732 | @@ -22184,58 +15597,31 @@ | ||
19733 | return 0; | ||
19734 | } | ||
19735 | _ACEOF | ||
19736 | -rm -f conftest.$ac_objext | ||
19737 | -if { (ac_try="$ac_compile" | ||
19738 | -case "(($ac_try" in | ||
19739 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19740 | - *) ac_try_echo=$ac_try;; | ||
19741 | -esac | ||
19742 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19743 | -$as_echo "$ac_try_echo") >&5 | ||
19744 | - (eval "$ac_compile") 2>conftest.er1 | ||
19745 | - ac_status=$? | ||
19746 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19747 | - rm -f conftest.er1 | ||
19748 | - cat conftest.err >&5 | ||
19749 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19750 | - (exit $ac_status); } && { | ||
19751 | - test -z "$ac_c_werror_flag" || | ||
19752 | - test ! -s conftest.err | ||
19753 | - } && test -s conftest.$ac_objext; then | ||
19754 | - ax_cv_c_flags__mpreferred_stack_boundary_4=yes | ||
19755 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
19756 | + eval `$as_echo "ax_cv_c_flags_-mpreferred-stack-boundary=4" | $as_tr_sh`=yes | ||
19757 | else | ||
19758 | - $as_echo "$as_me: failed program was:" >&5 | ||
19759 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19760 | - | ||
19761 | - ax_cv_c_flags__mpreferred_stack_boundary_4=no | ||
19762 | + eval `$as_echo "ax_cv_c_flags_-mpreferred-stack-boundary=4" | $as_tr_sh`=no | ||
19763 | fi | ||
19764 | - | ||
19765 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19766 | - CFLAGS=$ax_save_FLAGS | ||
19767 | -fi | ||
19768 | - | ||
19769 | -eval ax_check_compiler_flags=$ax_cv_c_flags__mpreferred_stack_boundary_4 | ||
19770 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
19771 | + CFLAGS=$ax_save_FLAGS | ||
19772 | +eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_-mpreferred-stack-boundary=4" | $as_tr_sh` | ||
19773 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
19774 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
19775 | if test "x$ax_check_compiler_flags" = xyes; then | ||
19776 | |||
19777 | - { $as_echo "$as_me:$LINENO: checking whether the stack is at least 8-byte aligned by gcc" >&5 | ||
19778 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the stack is at least 8-byte aligned by gcc" >&5 | ||
19779 | $as_echo_n "checking whether the stack is at least 8-byte aligned by gcc... " >&6; } | ||
19780 | save_CFLAGS="$CFLAGS" | ||
19781 | CFLAGS="-O" | ||
19782 | - { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -malign-double" >&5 | ||
19783 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5 | ||
19784 | $as_echo_n "checking whether C compiler accepts -malign-double... " >&6; } | ||
19785 | -if test "${ax_cv_c_flags__malign_double+set}" = set; then | ||
19786 | +if test "${ax_cv_c_flags__malign_double+set}" = set; then : | ||
19787 | $as_echo_n "(cached) " >&6 | ||
19788 | else | ||
19789 | |||
19790 | ax_save_FLAGS=$CFLAGS | ||
19791 | CFLAGS="-malign-double" | ||
19792 | - cat >conftest.$ac_ext <<_ACEOF | ||
19793 | -/* confdefs.h. */ | ||
19794 | -_ACEOF | ||
19795 | -cat confdefs.h >>conftest.$ac_ext | ||
19796 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19797 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19798 | /* end confdefs.h. */ | ||
19799 | |||
19800 | int | ||
19801 | @@ -22246,38 +15632,17 @@ | ||
19802 | return 0; | ||
19803 | } | ||
19804 | _ACEOF | ||
19805 | -rm -f conftest.$ac_objext | ||
19806 | -if { (ac_try="$ac_compile" | ||
19807 | -case "(($ac_try" in | ||
19808 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19809 | - *) ac_try_echo=$ac_try;; | ||
19810 | -esac | ||
19811 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19812 | -$as_echo "$ac_try_echo") >&5 | ||
19813 | - (eval "$ac_compile") 2>conftest.er1 | ||
19814 | - ac_status=$? | ||
19815 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
19816 | - rm -f conftest.er1 | ||
19817 | - cat conftest.err >&5 | ||
19818 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19819 | - (exit $ac_status); } && { | ||
19820 | - test -z "$ac_c_werror_flag" || | ||
19821 | - test ! -s conftest.err | ||
19822 | - } && test -s conftest.$ac_objext; then | ||
19823 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
19824 | ax_cv_c_flags__malign_double=yes | ||
19825 | else | ||
19826 | - $as_echo "$as_me: failed program was:" >&5 | ||
19827 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19828 | - | ||
19829 | - ax_cv_c_flags__malign_double=no | ||
19830 | + ax_cv_c_flags__malign_double=no | ||
19831 | fi | ||
19832 | - | ||
19833 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19834 | CFLAGS=$ax_save_FLAGS | ||
19835 | fi | ||
19836 | |||
19837 | eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double | ||
19838 | -{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 | ||
19839 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 | ||
19840 | $as_echo "$ax_check_compiler_flags" >&6; } | ||
19841 | if test "x$ax_check_compiler_flags" = xyes; then | ||
19842 | CFLAGS="$CFLAGS -malign-double" | ||
19843 | @@ -22285,22 +15650,18 @@ | ||
19844 | : | ||
19845 | fi | ||
19846 | |||
19847 | - if test "$cross_compiling" = yes; then | ||
19848 | + if test "$cross_compiling" = yes; then : | ||
19849 | |||
19850 | |||
19851 | -{ $as_echo "$as_me:$LINENO: checking whether we are using gcc 3.0.0 or later" >&5 | ||
19852 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using gcc 3.0.0 or later" >&5 | ||
19853 | $as_echo_n "checking whether we are using gcc 3.0.0 or later... " >&6; } | ||
19854 | -if test "${ax_cv_gcc_3_0_0+set}" = set; then | ||
19855 | +if test "${ax_cv_gcc_3_0_0+set}" = set; then : | ||
19856 | $as_echo_n "(cached) " >&6 | ||
19857 | else | ||
19858 | |||
19859 | ax_cv_gcc_3_0_0=no | ||
19860 | if test "$GCC" = "yes"; then | ||
19861 | -cat >conftest.$ac_ext <<_ACEOF | ||
19862 | -/* confdefs.h. */ | ||
19863 | -_ACEOF | ||
19864 | -cat confdefs.h >>conftest.$ac_ext | ||
19865 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19866 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19867 | /* end confdefs.h. */ | ||
19868 | |||
19869 | #ifdef __GNUC__ | ||
19870 | @@ -22312,7 +15673,7 @@ | ||
19871 | |||
19872 | _ACEOF | ||
19873 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
19874 | - $EGREP "yes" >/dev/null 2>&1; then | ||
19875 | + $EGREP "yes" >/dev/null 2>&1; then : | ||
19876 | ax_cv_gcc_3_0_0=yes | ||
19877 | fi | ||
19878 | rm -f conftest* | ||
19879 | @@ -22320,7 +15681,7 @@ | ||
19880 | fi | ||
19881 | |||
19882 | fi | ||
19883 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_3_0_0" >&5 | ||
19884 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_3_0_0" >&5 | ||
19885 | $as_echo "$ax_cv_gcc_3_0_0" >&6; } | ||
19886 | if test "$ax_cv_gcc_3_0_0" = yes; then | ||
19887 | ax_gcc_stack_align_bug=no | ||
19888 | @@ -22329,11 +15690,7 @@ | ||
19889 | fi | ||
19890 | |||
19891 | else | ||
19892 | - cat >conftest.$ac_ext <<_ACEOF | ||
19893 | -/* confdefs.h. */ | ||
19894 | -_ACEOF | ||
19895 | -cat confdefs.h >>conftest.$ac_ext | ||
19896 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19897 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
19898 | /* end confdefs.h. */ | ||
19899 | #include <stdlib.h> | ||
19900 | # include <stdio.h> | ||
19901 | @@ -22347,44 +15704,17 @@ | ||
19902 | int main(void) { if ((((long) (__builtin_alloca(0))) & 0x7)) __builtin_alloca(4); return main2(); } | ||
19903 | |||
19904 | _ACEOF | ||
19905 | -rm -f conftest$ac_exeext | ||
19906 | -if { (ac_try="$ac_link" | ||
19907 | -case "(($ac_try" in | ||
19908 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19909 | - *) ac_try_echo=$ac_try;; | ||
19910 | -esac | ||
19911 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19912 | -$as_echo "$ac_try_echo") >&5 | ||
19913 | - (eval "$ac_link") 2>&5 | ||
19914 | - ac_status=$? | ||
19915 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19916 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
19917 | - { (case "(($ac_try" in | ||
19918 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19919 | - *) ac_try_echo=$ac_try;; | ||
19920 | -esac | ||
19921 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
19922 | -$as_echo "$ac_try_echo") >&5 | ||
19923 | - (eval "$ac_try") 2>&5 | ||
19924 | - ac_status=$? | ||
19925 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19926 | - (exit $ac_status); }; }; then | ||
19927 | +if ac_fn_c_try_run "$LINENO"; then : | ||
19928 | ax_gcc_aligns_stack=yes; ax_gcc_stack_align_bug=no | ||
19929 | else | ||
19930 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
19931 | -$as_echo "$as_me: failed program was:" >&5 | ||
19932 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
19933 | - | ||
19934 | -( exit $ac_status ) | ||
19935 | -ax_gcc_stack_align_bug=yes | ||
19936 | + ax_gcc_stack_align_bug=yes | ||
19937 | fi | ||
19938 | -rm -rf conftest.dSYM | ||
19939 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
19940 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
19941 | + conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
19942 | fi | ||
19943 | |||
19944 | - | ||
19945 | CFLAGS="$save_CFLAGS" | ||
19946 | - { $as_echo "$as_me:$LINENO: result: $ax_gcc_aligns_stack" >&5 | ||
19947 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_gcc_aligns_stack" >&5 | ||
19948 | $as_echo "$ax_gcc_aligns_stack" >&6; } | ||
19949 | |||
19950 | else | ||
19951 | @@ -22413,7 +15743,7 @@ | ||
19952 | |||
19953 | |||
19954 | # Check whether --enable-fortran was given. | ||
19955 | -if test "${enable_fortran+set}" = set; then | ||
19956 | +if test "${enable_fortran+set}" = set; then : | ||
19957 | enableval=$enable_fortran; enable_fortran=$enableval | ||
19958 | else | ||
19959 | enable_fortran=yes | ||
19960 | @@ -22426,13 +15756,13 @@ | ||
19961 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
19962 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | ||
19963 | if test -n "$ac_tool_prefix"; then | ||
19964 | - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn | ||
19965 | + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn | ||
19966 | do | ||
19967 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
19968 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
19969 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
19970 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
19971 | $as_echo_n "checking for $ac_word... " >&6; } | ||
19972 | -if test "${ac_cv_prog_F77+set}" = set; then | ||
19973 | +if test "${ac_cv_prog_F77+set}" = set; then : | ||
19974 | $as_echo_n "(cached) " >&6 | ||
19975 | else | ||
19976 | if test -n "$F77"; then | ||
19977 | @@ -22443,24 +15773,24 @@ | ||
19978 | do | ||
19979 | IFS=$as_save_IFS | ||
19980 | test -z "$as_dir" && as_dir=. | ||
19981 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
19982 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
19983 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
19984 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" | ||
19985 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19986 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
19987 | break 2 | ||
19988 | fi | ||
19989 | done | ||
19990 | -done | ||
19991 | + done | ||
19992 | IFS=$as_save_IFS | ||
19993 | |||
19994 | fi | ||
19995 | fi | ||
19996 | F77=$ac_cv_prog_F77 | ||
19997 | if test -n "$F77"; then | ||
19998 | - { $as_echo "$as_me:$LINENO: result: $F77" >&5 | ||
19999 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 | ||
20000 | $as_echo "$F77" >&6; } | ||
20001 | else | ||
20002 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
20003 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20004 | $as_echo "no" >&6; } | ||
20005 | fi | ||
20006 | |||
20007 | @@ -22470,13 +15800,13 @@ | ||
20008 | fi | ||
20009 | if test -z "$F77"; then | ||
20010 | ac_ct_F77=$F77 | ||
20011 | - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn | ||
20012 | + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn | ||
20013 | do | ||
20014 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
20015 | set dummy $ac_prog; ac_word=$2 | ||
20016 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
20017 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
20018 | $as_echo_n "checking for $ac_word... " >&6; } | ||
20019 | -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then | ||
20020 | +if test "${ac_cv_prog_ac_ct_F77+set}" = set; then : | ||
20021 | $as_echo_n "(cached) " >&6 | ||
20022 | else | ||
20023 | if test -n "$ac_ct_F77"; then | ||
20024 | @@ -22487,24 +15817,24 @@ | ||
20025 | do | ||
20026 | IFS=$as_save_IFS | ||
20027 | test -z "$as_dir" && as_dir=. | ||
20028 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
20029 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
20030 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
20031 | ac_cv_prog_ac_ct_F77="$ac_prog" | ||
20032 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20033 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20034 | break 2 | ||
20035 | fi | ||
20036 | done | ||
20037 | -done | ||
20038 | + done | ||
20039 | IFS=$as_save_IFS | ||
20040 | |||
20041 | fi | ||
20042 | fi | ||
20043 | ac_ct_F77=$ac_cv_prog_ac_ct_F77 | ||
20044 | if test -n "$ac_ct_F77"; then | ||
20045 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 | ||
20046 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 | ||
20047 | $as_echo "$ac_ct_F77" >&6; } | ||
20048 | else | ||
20049 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
20050 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20051 | $as_echo "no" >&6; } | ||
20052 | fi | ||
20053 | |||
20054 | @@ -22517,7 +15847,7 @@ | ||
20055 | else | ||
20056 | case $cross_compiling:$ac_tool_warned in | ||
20057 | yes:) | ||
20058 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
20059 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
20060 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
20061 | ac_tool_warned=yes ;; | ||
20062 | esac | ||
20063 | @@ -22527,54 +15857,41 @@ | ||
20064 | |||
20065 | |||
20066 | # Provide some information about the compiler. | ||
20067 | -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 | ||
20068 | +$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 | ||
20069 | set X $ac_compile | ||
20070 | ac_compiler=$2 | ||
20071 | -{ (ac_try="$ac_compiler --version >&5" | ||
20072 | -case "(($ac_try" in | ||
20073 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20074 | - *) ac_try_echo=$ac_try;; | ||
20075 | -esac | ||
20076 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20077 | -$as_echo "$ac_try_echo") >&5 | ||
20078 | - (eval "$ac_compiler --version >&5") 2>&5 | ||
20079 | - ac_status=$? | ||
20080 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20081 | - (exit $ac_status); } | ||
20082 | -{ (ac_try="$ac_compiler -v >&5" | ||
20083 | -case "(($ac_try" in | ||
20084 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20085 | - *) ac_try_echo=$ac_try;; | ||
20086 | -esac | ||
20087 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20088 | -$as_echo "$ac_try_echo") >&5 | ||
20089 | - (eval "$ac_compiler -v >&5") 2>&5 | ||
20090 | - ac_status=$? | ||
20091 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20092 | - (exit $ac_status); } | ||
20093 | -{ (ac_try="$ac_compiler -V >&5" | ||
20094 | +for ac_option in --version -v -V -qversion; do | ||
20095 | + { { ac_try="$ac_compiler $ac_option >&5" | ||
20096 | case "(($ac_try" in | ||
20097 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20098 | *) ac_try_echo=$ac_try;; | ||
20099 | esac | ||
20100 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20101 | -$as_echo "$ac_try_echo") >&5 | ||
20102 | - (eval "$ac_compiler -V >&5") 2>&5 | ||
20103 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
20104 | +$as_echo "$ac_try_echo"; } >&5 | ||
20105 | + (eval "$ac_compiler $ac_option >&5") 2>conftest.err | ||
20106 | ac_status=$? | ||
20107 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20108 | - (exit $ac_status); } | ||
20109 | + if test -s conftest.err; then | ||
20110 | + sed '10a\ | ||
20111 | +... rest of stderr output deleted ... | ||
20112 | + 10q' conftest.err >conftest.er1 | ||
20113 | + cat conftest.er1 >&5 | ||
20114 | + fi | ||
20115 | + rm -f conftest.er1 conftest.err | ||
20116 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
20117 | + test $ac_status = 0; } | ||
20118 | +done | ||
20119 | rm -f a.out | ||
20120 | |||
20121 | # If we don't use `.F' as extension, the preprocessor is not run on the | ||
20122 | # input file. (Note that this only needs to work for GNU compilers.) | ||
20123 | ac_save_ext=$ac_ext | ||
20124 | ac_ext=F | ||
20125 | -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 | ||
20126 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 | ||
20127 | $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } | ||
20128 | -if test "${ac_cv_f77_compiler_gnu+set}" = set; then | ||
20129 | +if test "${ac_cv_f77_compiler_gnu+set}" = set; then : | ||
20130 | $as_echo_n "(cached) " >&6 | ||
20131 | else | ||
20132 | - cat >conftest.$ac_ext <<_ACEOF | ||
20133 | + cat > conftest.$ac_ext <<_ACEOF | ||
20134 | program main | ||
20135 | #ifndef __GNUC__ | ||
20136 | choke me | ||
20137 | @@ -22582,83 +15899,41 @@ | ||
20138 | |||
20139 | end | ||
20140 | _ACEOF | ||
20141 | -rm -f conftest.$ac_objext | ||
20142 | -if { (ac_try="$ac_compile" | ||
20143 | -case "(($ac_try" in | ||
20144 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20145 | - *) ac_try_echo=$ac_try;; | ||
20146 | -esac | ||
20147 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20148 | -$as_echo "$ac_try_echo") >&5 | ||
20149 | - (eval "$ac_compile") 2>conftest.er1 | ||
20150 | - ac_status=$? | ||
20151 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20152 | - rm -f conftest.er1 | ||
20153 | - cat conftest.err >&5 | ||
20154 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20155 | - (exit $ac_status); } && { | ||
20156 | - test -z "$ac_f77_werror_flag" || | ||
20157 | - test ! -s conftest.err | ||
20158 | - } && test -s conftest.$ac_objext; then | ||
20159 | +if ac_fn_f77_try_compile "$LINENO"; then : | ||
20160 | ac_compiler_gnu=yes | ||
20161 | else | ||
20162 | - $as_echo "$as_me: failed program was:" >&5 | ||
20163 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20164 | - | ||
20165 | - ac_compiler_gnu=no | ||
20166 | + ac_compiler_gnu=no | ||
20167 | fi | ||
20168 | - | ||
20169 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20170 | ac_cv_f77_compiler_gnu=$ac_compiler_gnu | ||
20171 | |||
20172 | fi | ||
20173 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 | ||
20174 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 | ||
20175 | $as_echo "$ac_cv_f77_compiler_gnu" >&6; } | ||
20176 | ac_ext=$ac_save_ext | ||
20177 | ac_test_FFLAGS=${FFLAGS+set} | ||
20178 | ac_save_FFLAGS=$FFLAGS | ||
20179 | FFLAGS= | ||
20180 | -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 | ||
20181 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 | ||
20182 | $as_echo_n "checking whether $F77 accepts -g... " >&6; } | ||
20183 | -if test "${ac_cv_prog_f77_g+set}" = set; then | ||
20184 | +if test "${ac_cv_prog_f77_g+set}" = set; then : | ||
20185 | $as_echo_n "(cached) " >&6 | ||
20186 | else | ||
20187 | FFLAGS=-g | ||
20188 | -cat >conftest.$ac_ext <<_ACEOF | ||
20189 | +cat > conftest.$ac_ext <<_ACEOF | ||
20190 | program main | ||
20191 | |||
20192 | end | ||
20193 | _ACEOF | ||
20194 | -rm -f conftest.$ac_objext | ||
20195 | -if { (ac_try="$ac_compile" | ||
20196 | -case "(($ac_try" in | ||
20197 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20198 | - *) ac_try_echo=$ac_try;; | ||
20199 | -esac | ||
20200 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20201 | -$as_echo "$ac_try_echo") >&5 | ||
20202 | - (eval "$ac_compile") 2>conftest.er1 | ||
20203 | - ac_status=$? | ||
20204 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20205 | - rm -f conftest.er1 | ||
20206 | - cat conftest.err >&5 | ||
20207 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20208 | - (exit $ac_status); } && { | ||
20209 | - test -z "$ac_f77_werror_flag" || | ||
20210 | - test ! -s conftest.err | ||
20211 | - } && test -s conftest.$ac_objext; then | ||
20212 | +if ac_fn_f77_try_compile "$LINENO"; then : | ||
20213 | ac_cv_prog_f77_g=yes | ||
20214 | else | ||
20215 | - $as_echo "$as_me: failed program was:" >&5 | ||
20216 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20217 | - | ||
20218 | - ac_cv_prog_f77_g=no | ||
20219 | + ac_cv_prog_f77_g=no | ||
20220 | fi | ||
20221 | - | ||
20222 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20223 | |||
20224 | fi | ||
20225 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 | ||
20226 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 | ||
20227 | $as_echo "$ac_cv_prog_f77_g" >&6; } | ||
20228 | if test "$ac_test_FFLAGS" = set; then | ||
20229 | FFLAGS=$ac_save_FFLAGS | ||
20230 | @@ -22693,13 +15968,13 @@ | ||
20231 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
20232 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | ||
20233 | if test -n "$ac_tool_prefix"; then | ||
20234 | - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn | ||
20235 | + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn | ||
20236 | do | ||
20237 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
20238 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
20239 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
20240 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
20241 | $as_echo_n "checking for $ac_word... " >&6; } | ||
20242 | -if test "${ac_cv_prog_F77+set}" = set; then | ||
20243 | +if test "${ac_cv_prog_F77+set}" = set; then : | ||
20244 | $as_echo_n "(cached) " >&6 | ||
20245 | else | ||
20246 | if test -n "$F77"; then | ||
20247 | @@ -22710,24 +15985,24 @@ | ||
20248 | do | ||
20249 | IFS=$as_save_IFS | ||
20250 | test -z "$as_dir" && as_dir=. | ||
20251 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
20252 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
20253 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
20254 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" | ||
20255 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20256 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20257 | break 2 | ||
20258 | fi | ||
20259 | done | ||
20260 | -done | ||
20261 | + done | ||
20262 | IFS=$as_save_IFS | ||
20263 | |||
20264 | fi | ||
20265 | fi | ||
20266 | F77=$ac_cv_prog_F77 | ||
20267 | if test -n "$F77"; then | ||
20268 | - { $as_echo "$as_me:$LINENO: result: $F77" >&5 | ||
20269 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 | ||
20270 | $as_echo "$F77" >&6; } | ||
20271 | else | ||
20272 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
20273 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20274 | $as_echo "no" >&6; } | ||
20275 | fi | ||
20276 | |||
20277 | @@ -22737,13 +16012,13 @@ | ||
20278 | fi | ||
20279 | if test -z "$F77"; then | ||
20280 | ac_ct_F77=$F77 | ||
20281 | - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn | ||
20282 | + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn | ||
20283 | do | ||
20284 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
20285 | set dummy $ac_prog; ac_word=$2 | ||
20286 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
20287 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
20288 | $as_echo_n "checking for $ac_word... " >&6; } | ||
20289 | -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then | ||
20290 | +if test "${ac_cv_prog_ac_ct_F77+set}" = set; then : | ||
20291 | $as_echo_n "(cached) " >&6 | ||
20292 | else | ||
20293 | if test -n "$ac_ct_F77"; then | ||
20294 | @@ -22754,24 +16029,24 @@ | ||
20295 | do | ||
20296 | IFS=$as_save_IFS | ||
20297 | test -z "$as_dir" && as_dir=. | ||
20298 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
20299 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
20300 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
20301 | ac_cv_prog_ac_ct_F77="$ac_prog" | ||
20302 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20303 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
20304 | break 2 | ||
20305 | fi | ||
20306 | done | ||
20307 | -done | ||
20308 | + done | ||
20309 | IFS=$as_save_IFS | ||
20310 | |||
20311 | fi | ||
20312 | fi | ||
20313 | ac_ct_F77=$ac_cv_prog_ac_ct_F77 | ||
20314 | if test -n "$ac_ct_F77"; then | ||
20315 | - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 | ||
20316 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 | ||
20317 | $as_echo "$ac_ct_F77" >&6; } | ||
20318 | else | ||
20319 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
20320 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20321 | $as_echo "no" >&6; } | ||
20322 | fi | ||
20323 | |||
20324 | @@ -22784,7 +16059,7 @@ | ||
20325 | else | ||
20326 | case $cross_compiling:$ac_tool_warned in | ||
20327 | yes:) | ||
20328 | -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
20329 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
20330 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
20331 | ac_tool_warned=yes ;; | ||
20332 | esac | ||
20333 | @@ -22794,54 +16069,41 @@ | ||
20334 | |||
20335 | |||
20336 | # Provide some information about the compiler. | ||
20337 | -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 | ||
20338 | +$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 | ||
20339 | set X $ac_compile | ||
20340 | ac_compiler=$2 | ||
20341 | -{ (ac_try="$ac_compiler --version >&5" | ||
20342 | -case "(($ac_try" in | ||
20343 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20344 | - *) ac_try_echo=$ac_try;; | ||
20345 | -esac | ||
20346 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20347 | -$as_echo "$ac_try_echo") >&5 | ||
20348 | - (eval "$ac_compiler --version >&5") 2>&5 | ||
20349 | - ac_status=$? | ||
20350 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20351 | - (exit $ac_status); } | ||
20352 | -{ (ac_try="$ac_compiler -v >&5" | ||
20353 | -case "(($ac_try" in | ||
20354 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20355 | - *) ac_try_echo=$ac_try;; | ||
20356 | -esac | ||
20357 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20358 | -$as_echo "$ac_try_echo") >&5 | ||
20359 | - (eval "$ac_compiler -v >&5") 2>&5 | ||
20360 | - ac_status=$? | ||
20361 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20362 | - (exit $ac_status); } | ||
20363 | -{ (ac_try="$ac_compiler -V >&5" | ||
20364 | +for ac_option in --version -v -V -qversion; do | ||
20365 | + { { ac_try="$ac_compiler $ac_option >&5" | ||
20366 | case "(($ac_try" in | ||
20367 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20368 | *) ac_try_echo=$ac_try;; | ||
20369 | esac | ||
20370 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20371 | -$as_echo "$ac_try_echo") >&5 | ||
20372 | - (eval "$ac_compiler -V >&5") 2>&5 | ||
20373 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
20374 | +$as_echo "$ac_try_echo"; } >&5 | ||
20375 | + (eval "$ac_compiler $ac_option >&5") 2>conftest.err | ||
20376 | ac_status=$? | ||
20377 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20378 | - (exit $ac_status); } | ||
20379 | + if test -s conftest.err; then | ||
20380 | + sed '10a\ | ||
20381 | +... rest of stderr output deleted ... | ||
20382 | + 10q' conftest.err >conftest.er1 | ||
20383 | + cat conftest.er1 >&5 | ||
20384 | + fi | ||
20385 | + rm -f conftest.er1 conftest.err | ||
20386 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
20387 | + test $ac_status = 0; } | ||
20388 | +done | ||
20389 | rm -f a.out | ||
20390 | |||
20391 | # If we don't use `.F' as extension, the preprocessor is not run on the | ||
20392 | # input file. (Note that this only needs to work for GNU compilers.) | ||
20393 | ac_save_ext=$ac_ext | ||
20394 | ac_ext=F | ||
20395 | -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 | ||
20396 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 | ||
20397 | $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } | ||
20398 | -if test "${ac_cv_f77_compiler_gnu+set}" = set; then | ||
20399 | +if test "${ac_cv_f77_compiler_gnu+set}" = set; then : | ||
20400 | $as_echo_n "(cached) " >&6 | ||
20401 | else | ||
20402 | - cat >conftest.$ac_ext <<_ACEOF | ||
20403 | + cat > conftest.$ac_ext <<_ACEOF | ||
20404 | program main | ||
20405 | #ifndef __GNUC__ | ||
20406 | choke me | ||
20407 | @@ -22849,83 +16111,41 @@ | ||
20408 | |||
20409 | end | ||
20410 | _ACEOF | ||
20411 | -rm -f conftest.$ac_objext | ||
20412 | -if { (ac_try="$ac_compile" | ||
20413 | -case "(($ac_try" in | ||
20414 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20415 | - *) ac_try_echo=$ac_try;; | ||
20416 | -esac | ||
20417 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20418 | -$as_echo "$ac_try_echo") >&5 | ||
20419 | - (eval "$ac_compile") 2>conftest.er1 | ||
20420 | - ac_status=$? | ||
20421 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20422 | - rm -f conftest.er1 | ||
20423 | - cat conftest.err >&5 | ||
20424 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20425 | - (exit $ac_status); } && { | ||
20426 | - test -z "$ac_f77_werror_flag" || | ||
20427 | - test ! -s conftest.err | ||
20428 | - } && test -s conftest.$ac_objext; then | ||
20429 | +if ac_fn_f77_try_compile "$LINENO"; then : | ||
20430 | ac_compiler_gnu=yes | ||
20431 | else | ||
20432 | - $as_echo "$as_me: failed program was:" >&5 | ||
20433 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20434 | - | ||
20435 | - ac_compiler_gnu=no | ||
20436 | + ac_compiler_gnu=no | ||
20437 | fi | ||
20438 | - | ||
20439 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20440 | ac_cv_f77_compiler_gnu=$ac_compiler_gnu | ||
20441 | |||
20442 | fi | ||
20443 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 | ||
20444 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 | ||
20445 | $as_echo "$ac_cv_f77_compiler_gnu" >&6; } | ||
20446 | ac_ext=$ac_save_ext | ||
20447 | ac_test_FFLAGS=${FFLAGS+set} | ||
20448 | ac_save_FFLAGS=$FFLAGS | ||
20449 | FFLAGS= | ||
20450 | -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 | ||
20451 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 | ||
20452 | $as_echo_n "checking whether $F77 accepts -g... " >&6; } | ||
20453 | -if test "${ac_cv_prog_f77_g+set}" = set; then | ||
20454 | +if test "${ac_cv_prog_f77_g+set}" = set; then : | ||
20455 | $as_echo_n "(cached) " >&6 | ||
20456 | else | ||
20457 | FFLAGS=-g | ||
20458 | -cat >conftest.$ac_ext <<_ACEOF | ||
20459 | +cat > conftest.$ac_ext <<_ACEOF | ||
20460 | program main | ||
20461 | |||
20462 | end | ||
20463 | _ACEOF | ||
20464 | -rm -f conftest.$ac_objext | ||
20465 | -if { (ac_try="$ac_compile" | ||
20466 | -case "(($ac_try" in | ||
20467 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20468 | - *) ac_try_echo=$ac_try;; | ||
20469 | -esac | ||
20470 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20471 | -$as_echo "$ac_try_echo") >&5 | ||
20472 | - (eval "$ac_compile") 2>conftest.er1 | ||
20473 | - ac_status=$? | ||
20474 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20475 | - rm -f conftest.er1 | ||
20476 | - cat conftest.err >&5 | ||
20477 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20478 | - (exit $ac_status); } && { | ||
20479 | - test -z "$ac_f77_werror_flag" || | ||
20480 | - test ! -s conftest.err | ||
20481 | - } && test -s conftest.$ac_objext; then | ||
20482 | +if ac_fn_f77_try_compile "$LINENO"; then : | ||
20483 | ac_cv_prog_f77_g=yes | ||
20484 | else | ||
20485 | - $as_echo "$as_me: failed program was:" >&5 | ||
20486 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20487 | - | ||
20488 | - ac_cv_prog_f77_g=no | ||
20489 | + ac_cv_prog_f77_g=no | ||
20490 | fi | ||
20491 | - | ||
20492 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20493 | |||
20494 | fi | ||
20495 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 | ||
20496 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 | ||
20497 | $as_echo "$ac_cv_prog_f77_g" >&6; } | ||
20498 | if test "$ac_test_FFLAGS" = set; then | ||
20499 | FFLAGS=$ac_save_FFLAGS | ||
20500 | @@ -23061,12 +16281,12 @@ | ||
20501 | |||
20502 | GCC=$G77 | ||
20503 | if test -n "$compiler"; then | ||
20504 | - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | ||
20505 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 | ||
20506 | $as_echo_n "checking if libtool supports shared libraries... " >&6; } | ||
20507 | - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 | ||
20508 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 | ||
20509 | $as_echo "$can_build_shared" >&6; } | ||
20510 | |||
20511 | - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | ||
20512 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 | ||
20513 | $as_echo_n "checking whether to build shared libraries... " >&6; } | ||
20514 | test "$can_build_shared" = "no" && enable_shared=no | ||
20515 | |||
20516 | @@ -23086,14 +16306,14 @@ | ||
20517 | fi | ||
20518 | ;; | ||
20519 | esac | ||
20520 | - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 | ||
20521 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 | ||
20522 | $as_echo "$enable_shared" >&6; } | ||
20523 | |||
20524 | - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | ||
20525 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 | ||
20526 | $as_echo_n "checking whether to build static libraries... " >&6; } | ||
20527 | # Make sure either enable_shared or enable_static is yes. | ||
20528 | test "$enable_shared" = yes || enable_static=yes | ||
20529 | - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 | ||
20530 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 | ||
20531 | $as_echo "$enable_static" >&6; } | ||
20532 | |||
20533 | GCC_F77="$G77" | ||
20534 | @@ -23107,7 +16327,7 @@ | ||
20535 | lt_prog_compiler_pic_F77= | ||
20536 | lt_prog_compiler_static_F77= | ||
20537 | |||
20538 | -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
20539 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
20540 | $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
20541 | |||
20542 | if test "$GCC" = yes; then | ||
20543 | @@ -23379,7 +16599,7 @@ | ||
20544 | lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" | ||
20545 | ;; | ||
20546 | esac | ||
20547 | -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 | ||
20548 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_F77" >&5 | ||
20549 | $as_echo "$lt_prog_compiler_pic_F77" >&6; } | ||
20550 | |||
20551 | |||
20552 | @@ -23388,9 +16608,9 @@ | ||
20553 | # Check to make sure the PIC flag actually works. | ||
20554 | # | ||
20555 | if test -n "$lt_prog_compiler_pic_F77"; then | ||
20556 | - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | ||
20557 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | ||
20558 | $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } | ||
20559 | -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then | ||
20560 | +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then : | ||
20561 | $as_echo_n "(cached) " >&6 | ||
20562 | else | ||
20563 | lt_cv_prog_compiler_pic_works_F77=no | ||
20564 | @@ -23406,11 +16626,11 @@ | ||
20565 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
20566 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
20567 | -e 's:$: $lt_compiler_flag:'` | ||
20568 | - (eval echo "\"\$as_me:23409: $lt_compile\"" >&5) | ||
20569 | + (eval echo "\"\$as_me:16629: $lt_compile\"" >&5) | ||
20570 | (eval "$lt_compile" 2>conftest.err) | ||
20571 | ac_status=$? | ||
20572 | cat conftest.err >&5 | ||
20573 | - echo "$as_me:23413: \$? = $ac_status" >&5 | ||
20574 | + echo "$as_me:16633: \$? = $ac_status" >&5 | ||
20575 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
20576 | # The compiler can only warn and ignore the option if not recognized | ||
20577 | # So say no if there are warnings other than the usual output. | ||
20578 | @@ -23423,7 +16643,7 @@ | ||
20579 | $RM conftest* | ||
20580 | |||
20581 | fi | ||
20582 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 | ||
20583 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5 | ||
20584 | $as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } | ||
20585 | |||
20586 | if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then | ||
20587 | @@ -23444,9 +16664,9 @@ | ||
20588 | # Check to make sure the static flag actually works. | ||
20589 | # | ||
20590 | wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" | ||
20591 | -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
20592 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
20593 | $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } | ||
20594 | -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then | ||
20595 | +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then : | ||
20596 | $as_echo_n "(cached) " >&6 | ||
20597 | else | ||
20598 | lt_cv_prog_compiler_static_works_F77=no | ||
20599 | @@ -23472,7 +16692,7 @@ | ||
20600 | LDFLAGS="$save_LDFLAGS" | ||
20601 | |||
20602 | fi | ||
20603 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 | ||
20604 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5 | ||
20605 | $as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } | ||
20606 | |||
20607 | if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then | ||
20608 | @@ -23484,9 +16704,9 @@ | ||
20609 | |||
20610 | |||
20611 | |||
20612 | - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
20613 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
20614 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } | ||
20615 | -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then | ||
20616 | +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then : | ||
20617 | $as_echo_n "(cached) " >&6 | ||
20618 | else | ||
20619 | lt_cv_prog_compiler_c_o_F77=no | ||
20620 | @@ -23505,11 +16725,11 @@ | ||
20621 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
20622 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
20623 | -e 's:$: $lt_compiler_flag:'` | ||
20624 | - (eval echo "\"\$as_me:23508: $lt_compile\"" >&5) | ||
20625 | + (eval echo "\"\$as_me:16728: $lt_compile\"" >&5) | ||
20626 | (eval "$lt_compile" 2>out/conftest.err) | ||
20627 | ac_status=$? | ||
20628 | cat out/conftest.err >&5 | ||
20629 | - echo "$as_me:23512: \$? = $ac_status" >&5 | ||
20630 | + echo "$as_me:16732: \$? = $ac_status" >&5 | ||
20631 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
20632 | then | ||
20633 | # The compiler can only warn and ignore the option if not recognized | ||
20634 | @@ -23531,14 +16751,14 @@ | ||
20635 | $RM conftest* | ||
20636 | |||
20637 | fi | ||
20638 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 | ||
20639 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 | ||
20640 | $as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } | ||
20641 | |||
20642 | |||
20643 | |||
20644 | - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
20645 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
20646 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } | ||
20647 | -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then | ||
20648 | +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then : | ||
20649 | $as_echo_n "(cached) " >&6 | ||
20650 | else | ||
20651 | lt_cv_prog_compiler_c_o_F77=no | ||
20652 | @@ -23557,11 +16777,11 @@ | ||
20653 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
20654 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
20655 | -e 's:$: $lt_compiler_flag:'` | ||
20656 | - (eval echo "\"\$as_me:23560: $lt_compile\"" >&5) | ||
20657 | + (eval echo "\"\$as_me:16780: $lt_compile\"" >&5) | ||
20658 | (eval "$lt_compile" 2>out/conftest.err) | ||
20659 | ac_status=$? | ||
20660 | cat out/conftest.err >&5 | ||
20661 | - echo "$as_me:23564: \$? = $ac_status" >&5 | ||
20662 | + echo "$as_me:16784: \$? = $ac_status" >&5 | ||
20663 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
20664 | then | ||
20665 | # The compiler can only warn and ignore the option if not recognized | ||
20666 | @@ -23583,7 +16803,7 @@ | ||
20667 | $RM conftest* | ||
20668 | |||
20669 | fi | ||
20670 | -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 | ||
20671 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 | ||
20672 | $as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } | ||
20673 | |||
20674 | |||
20675 | @@ -23592,7 +16812,7 @@ | ||
20676 | hard_links="nottested" | ||
20677 | if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then | ||
20678 | # do not overwrite the value of need_locks provided by the user | ||
20679 | - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
20680 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 | ||
20681 | $as_echo_n "checking if we can lock with hard links... " >&6; } | ||
20682 | hard_links=yes | ||
20683 | $RM conftest* | ||
20684 | @@ -23600,10 +16820,10 @@ | ||
20685 | touch conftest.a | ||
20686 | ln conftest.a conftest.b 2>&5 || hard_links=no | ||
20687 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
20688 | - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
20689 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 | ||
20690 | $as_echo "$hard_links" >&6; } | ||
20691 | if test "$hard_links" = no; then | ||
20692 | - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
20693 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
20694 | $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | ||
20695 | need_locks=warn | ||
20696 | fi | ||
20697 | @@ -23613,7 +16833,7 @@ | ||
20698 | |||
20699 | |||
20700 | |||
20701 | - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
20702 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
20703 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | ||
20704 | |||
20705 | runpath_var= | ||
20706 | @@ -24059,32 +17279,12 @@ | ||
20707 | allow_undefined_flag_F77='-berok' | ||
20708 | # Determine the default libpath from the value encoded in an | ||
20709 | # empty executable. | ||
20710 | - cat >conftest.$ac_ext <<_ACEOF | ||
20711 | + cat > conftest.$ac_ext <<_ACEOF | ||
20712 | program main | ||
20713 | |||
20714 | end | ||
20715 | _ACEOF | ||
20716 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
20717 | -if { (ac_try="$ac_link" | ||
20718 | -case "(($ac_try" in | ||
20719 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20720 | - *) ac_try_echo=$ac_try;; | ||
20721 | -esac | ||
20722 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20723 | -$as_echo "$ac_try_echo") >&5 | ||
20724 | - (eval "$ac_link") 2>conftest.er1 | ||
20725 | - ac_status=$? | ||
20726 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20727 | - rm -f conftest.er1 | ||
20728 | - cat conftest.err >&5 | ||
20729 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20730 | - (exit $ac_status); } && { | ||
20731 | - test -z "$ac_f77_werror_flag" || | ||
20732 | - test ! -s conftest.err | ||
20733 | - } && test -s conftest$ac_exeext && { | ||
20734 | - test "$cross_compiling" = yes || | ||
20735 | - $as_test_x conftest$ac_exeext | ||
20736 | - }; then | ||
20737 | +if ac_fn_f77_try_link "$LINENO"; then : | ||
20738 | |||
20739 | lt_aix_libpath_sed=' | ||
20740 | /Import File Strings/,/^$/ { | ||
20741 | @@ -24098,16 +17298,9 @@ | ||
20742 | if test -z "$aix_libpath"; then | ||
20743 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20744 | fi | ||
20745 | -else | ||
20746 | - $as_echo "$as_me: failed program was:" >&5 | ||
20747 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20748 | - | ||
20749 | - | ||
20750 | fi | ||
20751 | - | ||
20752 | -rm -rf conftest.dSYM | ||
20753 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
20754 | - conftest$ac_exeext conftest.$ac_ext | ||
20755 | +rm -f core conftest.err conftest.$ac_objext \ | ||
20756 | + conftest$ac_exeext conftest.$ac_ext | ||
20757 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20758 | |||
20759 | hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
20760 | @@ -24120,32 +17313,12 @@ | ||
20761 | else | ||
20762 | # Determine the default libpath from the value encoded in an | ||
20763 | # empty executable. | ||
20764 | - cat >conftest.$ac_ext <<_ACEOF | ||
20765 | + cat > conftest.$ac_ext <<_ACEOF | ||
20766 | program main | ||
20767 | |||
20768 | end | ||
20769 | _ACEOF | ||
20770 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
20771 | -if { (ac_try="$ac_link" | ||
20772 | -case "(($ac_try" in | ||
20773 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20774 | - *) ac_try_echo=$ac_try;; | ||
20775 | -esac | ||
20776 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20777 | -$as_echo "$ac_try_echo") >&5 | ||
20778 | - (eval "$ac_link") 2>conftest.er1 | ||
20779 | - ac_status=$? | ||
20780 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20781 | - rm -f conftest.er1 | ||
20782 | - cat conftest.err >&5 | ||
20783 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20784 | - (exit $ac_status); } && { | ||
20785 | - test -z "$ac_f77_werror_flag" || | ||
20786 | - test ! -s conftest.err | ||
20787 | - } && test -s conftest$ac_exeext && { | ||
20788 | - test "$cross_compiling" = yes || | ||
20789 | - $as_test_x conftest$ac_exeext | ||
20790 | - }; then | ||
20791 | +if ac_fn_f77_try_link "$LINENO"; then : | ||
20792 | |||
20793 | lt_aix_libpath_sed=' | ||
20794 | /Import File Strings/,/^$/ { | ||
20795 | @@ -24159,16 +17332,9 @@ | ||
20796 | if test -z "$aix_libpath"; then | ||
20797 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
20798 | fi | ||
20799 | -else | ||
20800 | - $as_echo "$as_me: failed program was:" >&5 | ||
20801 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20802 | - | ||
20803 | - | ||
20804 | fi | ||
20805 | - | ||
20806 | -rm -rf conftest.dSYM | ||
20807 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
20808 | - conftest$ac_exeext conftest.$ac_ext | ||
20809 | +rm -f core conftest.err conftest.$ac_objext \ | ||
20810 | + conftest$ac_exeext conftest.$ac_ext | ||
20811 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
20812 | |||
20813 | hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
20814 | @@ -24380,42 +17546,15 @@ | ||
20815 | # implicitly export all symbols. | ||
20816 | save_LDFLAGS="$LDFLAGS" | ||
20817 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
20818 | - cat >conftest.$ac_ext <<_ACEOF | ||
20819 | + cat > conftest.$ac_ext <<_ACEOF | ||
20820 | int foo(void) {} | ||
20821 | _ACEOF | ||
20822 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
20823 | -if { (ac_try="$ac_link" | ||
20824 | -case "(($ac_try" in | ||
20825 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20826 | - *) ac_try_echo=$ac_try;; | ||
20827 | -esac | ||
20828 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20829 | -$as_echo "$ac_try_echo") >&5 | ||
20830 | - (eval "$ac_link") 2>conftest.er1 | ||
20831 | - ac_status=$? | ||
20832 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20833 | - rm -f conftest.er1 | ||
20834 | - cat conftest.err >&5 | ||
20835 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20836 | - (exit $ac_status); } && { | ||
20837 | - test -z "$ac_f77_werror_flag" || | ||
20838 | - test ! -s conftest.err | ||
20839 | - } && test -s conftest$ac_exeext && { | ||
20840 | - test "$cross_compiling" = yes || | ||
20841 | - $as_test_x conftest$ac_exeext | ||
20842 | - }; then | ||
20843 | +if ac_fn_f77_try_link "$LINENO"; then : | ||
20844 | archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
20845 | |||
20846 | -else | ||
20847 | - $as_echo "$as_me: failed program was:" >&5 | ||
20848 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20849 | - | ||
20850 | - | ||
20851 | fi | ||
20852 | - | ||
20853 | -rm -rf conftest.dSYM | ||
20854 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
20855 | - conftest$ac_exeext conftest.$ac_ext | ||
20856 | +rm -f core conftest.err conftest.$ac_objext \ | ||
20857 | + conftest$ac_exeext conftest.$ac_ext | ||
20858 | LDFLAGS="$save_LDFLAGS" | ||
20859 | else | ||
20860 | archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' | ||
20861 | @@ -24671,7 +17810,7 @@ | ||
20862 | fi | ||
20863 | fi | ||
20864 | |||
20865 | -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 | ||
20866 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5 | ||
20867 | $as_echo "$ld_shlibs_F77" >&6; } | ||
20868 | test "$ld_shlibs_F77" = no && can_build_shared=no | ||
20869 | |||
20870 | @@ -24699,16 +17838,16 @@ | ||
20871 | # Test whether the compiler implicitly links with -lc since on some | ||
20872 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | ||
20873 | # to ld, don't add -lc before -lgcc. | ||
20874 | - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
20875 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 | ||
20876 | $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } | ||
20877 | $RM conftest* | ||
20878 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
20879 | |||
20880 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
20881 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
20882 | (eval $ac_compile) 2>&5 | ||
20883 | ac_status=$? | ||
20884 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20885 | - (exit $ac_status); } 2>conftest.err; then | ||
20886 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
20887 | + test $ac_status = 0; } 2>conftest.err; then | ||
20888 | soname=conftest | ||
20889 | lib=conftest | ||
20890 | libobjs=conftest.$ac_objext | ||
20891 | @@ -24722,11 +17861,11 @@ | ||
20892 | libname=conftest | ||
20893 | lt_save_allow_undefined_flag=$allow_undefined_flag_F77 | ||
20894 | allow_undefined_flag_F77= | ||
20895 | - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 | ||
20896 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 | ||
20897 | (eval $archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 | ||
20898 | ac_status=$? | ||
20899 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20900 | - (exit $ac_status); } | ||
20901 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
20902 | + test $ac_status = 0; } | ||
20903 | then | ||
20904 | archive_cmds_need_lc_F77=no | ||
20905 | else | ||
20906 | @@ -24737,7 +17876,7 @@ | ||
20907 | cat conftest.err 1>&5 | ||
20908 | fi | ||
20909 | $RM conftest* | ||
20910 | - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 | ||
20911 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_F77" >&5 | ||
20912 | $as_echo "$archive_cmds_need_lc_F77" >&6; } | ||
20913 | ;; | ||
20914 | esac | ||
20915 | @@ -24808,7 +17947,7 @@ | ||
20916 | |||
20917 | |||
20918 | |||
20919 | - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
20920 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | ||
20921 | $as_echo_n "checking dynamic linker characteristics... " >&6; } | ||
20922 | |||
20923 | library_names_spec= | ||
20924 | @@ -25178,46 +18317,18 @@ | ||
20925 | save_libdir=$libdir | ||
20926 | eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_F77\"; \ | ||
20927 | LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_F77\"" | ||
20928 | - cat >conftest.$ac_ext <<_ACEOF | ||
20929 | + cat > conftest.$ac_ext <<_ACEOF | ||
20930 | program main | ||
20931 | |||
20932 | end | ||
20933 | _ACEOF | ||
20934 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
20935 | -if { (ac_try="$ac_link" | ||
20936 | -case "(($ac_try" in | ||
20937 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20938 | - *) ac_try_echo=$ac_try;; | ||
20939 | -esac | ||
20940 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
20941 | -$as_echo "$ac_try_echo") >&5 | ||
20942 | - (eval "$ac_link") 2>conftest.er1 | ||
20943 | - ac_status=$? | ||
20944 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
20945 | - rm -f conftest.er1 | ||
20946 | - cat conftest.err >&5 | ||
20947 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20948 | - (exit $ac_status); } && { | ||
20949 | - test -z "$ac_f77_werror_flag" || | ||
20950 | - test ! -s conftest.err | ||
20951 | - } && test -s conftest$ac_exeext && { | ||
20952 | - test "$cross_compiling" = yes || | ||
20953 | - $as_test_x conftest$ac_exeext | ||
20954 | - }; then | ||
20955 | - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then | ||
20956 | +if ac_fn_f77_try_link "$LINENO"; then : | ||
20957 | + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : | ||
20958 | shlibpath_overrides_runpath=yes | ||
20959 | fi | ||
20960 | - | ||
20961 | -else | ||
20962 | - $as_echo "$as_me: failed program was:" >&5 | ||
20963 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
20964 | - | ||
20965 | - | ||
20966 | fi | ||
20967 | - | ||
20968 | -rm -rf conftest.dSYM | ||
20969 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
20970 | - conftest$ac_exeext conftest.$ac_ext | ||
20971 | +rm -f core conftest.err conftest.$ac_objext \ | ||
20972 | + conftest$ac_exeext conftest.$ac_ext | ||
20973 | LDFLAGS=$save_LDFLAGS | ||
20974 | libdir=$save_libdir | ||
20975 | |||
20976 | @@ -25441,7 +18552,7 @@ | ||
20977 | dynamic_linker=no | ||
20978 | ;; | ||
20979 | esac | ||
20980 | -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
20981 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 | ||
20982 | $as_echo "$dynamic_linker" >&6; } | ||
20983 | test "$dynamic_linker" = no && can_build_shared=no | ||
20984 | |||
20985 | @@ -25492,7 +18603,7 @@ | ||
20986 | |||
20987 | |||
20988 | |||
20989 | - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
20990 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 | ||
20991 | $as_echo_n "checking how to hardcode library paths into programs... " >&6; } | ||
20992 | hardcode_action_F77= | ||
20993 | if test -n "$hardcode_libdir_flag_spec_F77" || | ||
20994 | @@ -25517,7 +18628,7 @@ | ||
20995 | # directories. | ||
20996 | hardcode_action_F77=unsupported | ||
20997 | fi | ||
20998 | -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | ||
20999 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5 | ||
21000 | $as_echo "$hardcode_action_F77" >&6; } | ||
21001 | |||
21002 | if test "$hardcode_action_F77" = relink || | ||
21003 | @@ -25551,45 +18662,28 @@ | ||
21004 | |||
21005 | if test -z "$F77"; then | ||
21006 | enable_fortran=no | ||
21007 | - { $as_echo "$as_me:$LINENO: WARNING: *** Couldn't find f77 compiler; using default Fortran wrappers." >&5 | ||
21008 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Couldn't find f77 compiler; using default Fortran wrappers." >&5 | ||
21009 | $as_echo "$as_me: WARNING: *** Couldn't find f77 compiler; using default Fortran wrappers." >&2;} | ||
21010 | else | ||
21011 | ac_ext=f | ||
21012 | ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' | ||
21013 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
21014 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | ||
21015 | -{ $as_echo "$as_me:$LINENO: checking how to get verbose linking output from $F77" >&5 | ||
21016 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5 | ||
21017 | $as_echo_n "checking how to get verbose linking output from $F77... " >&6; } | ||
21018 | -if test "${ac_cv_prog_f77_v+set}" = set; then | ||
21019 | +if test "${ac_cv_prog_f77_v+set}" = set; then : | ||
21020 | $as_echo_n "(cached) " >&6 | ||
21021 | else | ||
21022 | - cat >conftest.$ac_ext <<_ACEOF | ||
21023 | + cat > conftest.$ac_ext <<_ACEOF | ||
21024 | program main | ||
21025 | |||
21026 | end | ||
21027 | _ACEOF | ||
21028 | -rm -f conftest.$ac_objext | ||
21029 | -if { (ac_try="$ac_compile" | ||
21030 | -case "(($ac_try" in | ||
21031 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21032 | - *) ac_try_echo=$ac_try;; | ||
21033 | -esac | ||
21034 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21035 | -$as_echo "$ac_try_echo") >&5 | ||
21036 | - (eval "$ac_compile") 2>conftest.er1 | ||
21037 | - ac_status=$? | ||
21038 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21039 | - rm -f conftest.er1 | ||
21040 | - cat conftest.err >&5 | ||
21041 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21042 | - (exit $ac_status); } && { | ||
21043 | - test -z "$ac_f77_werror_flag" || | ||
21044 | - test ! -s conftest.err | ||
21045 | - } && test -s conftest.$ac_objext; then | ||
21046 | +if ac_fn_f77_try_compile "$LINENO"; then : | ||
21047 | ac_cv_prog_f77_v= | ||
21048 | # Try some options frequently used verbose output | ||
21049 | for ac_verb in -v -verbose --verbose -V -\#\#\#; do | ||
21050 | - cat >conftest.$ac_ext <<_ACEOF | ||
21051 | + cat > conftest.$ac_ext <<_ACEOF | ||
21052 | program main | ||
21053 | |||
21054 | end | ||
21055 | @@ -25603,7 +18697,7 @@ | ||
21056 | FFLAGS="$FFLAGS $ac_verb" | ||
21057 | eval "set x $ac_link" | ||
21058 | shift | ||
21059 | -$as_echo "$as_me:$LINENO: $*" >&5 | ||
21060 | +$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 | ||
21061 | # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, | ||
21062 | # LIBRARY_PATH; skip all such settings. | ||
21063 | ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | | ||
21064 | @@ -25638,9 +18732,9 @@ | ||
21065 | # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". | ||
21066 | *-cmdline\ * | *-ignore\ * | *-def\ *) | ||
21067 | ac_f77_v_output=`echo $ac_f77_v_output | sed "\ | ||
21068 | - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g | ||
21069 | - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g | ||
21070 | - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; | ||
21071 | + s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g | ||
21072 | + s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g | ||
21073 | + s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; | ||
21074 | |||
21075 | # If we are using Cray Fortran then delete quotes. | ||
21076 | *cft90*) | ||
21077 | @@ -25651,39 +18745,35 @@ | ||
21078 | # look for -l* and *.a constructs in the output | ||
21079 | for ac_arg in $ac_f77_v_output; do | ||
21080 | case $ac_arg in | ||
21081 | - [\\/]*.a | ?:[\\/]*.a | -[lLRu]*) | ||
21082 | - ac_cv_prog_f77_v=$ac_verb | ||
21083 | - break 2 ;; | ||
21084 | + [\\/]*.a | ?:[\\/]*.a | -[lLRu]*) | ||
21085 | + ac_cv_prog_f77_v=$ac_verb | ||
21086 | + break 2 ;; | ||
21087 | esac | ||
21088 | done | ||
21089 | done | ||
21090 | if test -z "$ac_cv_prog_f77_v"; then | ||
21091 | - { $as_echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $F77" >&5 | ||
21092 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5 | ||
21093 | $as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} | ||
21094 | fi | ||
21095 | else | ||
21096 | - $as_echo "$as_me: failed program was:" >&5 | ||
21097 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
21098 | - | ||
21099 | - { $as_echo "$as_me:$LINENO: WARNING: compilation failed" >&5 | ||
21100 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5 | ||
21101 | $as_echo "$as_me: WARNING: compilation failed" >&2;} | ||
21102 | fi | ||
21103 | - | ||
21104 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21105 | |||
21106 | fi | ||
21107 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_v" >&5 | ||
21108 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5 | ||
21109 | $as_echo "$ac_cv_prog_f77_v" >&6; } | ||
21110 | -{ $as_echo "$as_me:$LINENO: checking for Fortran 77 libraries of $F77" >&5 | ||
21111 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5 | ||
21112 | $as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; } | ||
21113 | -if test "${ac_cv_f77_libs+set}" = set; then | ||
21114 | +if test "${ac_cv_f77_libs+set}" = set; then : | ||
21115 | $as_echo_n "(cached) " >&6 | ||
21116 | else | ||
21117 | if test "x$FLIBS" != "x"; then | ||
21118 | ac_cv_f77_libs="$FLIBS" # Let the user override the test. | ||
21119 | else | ||
21120 | |||
21121 | -cat >conftest.$ac_ext <<_ACEOF | ||
21122 | +cat > conftest.$ac_ext <<_ACEOF | ||
21123 | program main | ||
21124 | |||
21125 | end | ||
21126 | @@ -25697,7 +18787,7 @@ | ||
21127 | FFLAGS="$FFLAGS $ac_cv_prog_f77_v" | ||
21128 | eval "set x $ac_link" | ||
21129 | shift | ||
21130 | -$as_echo "$as_me:$LINENO: $*" >&5 | ||
21131 | +$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 | ||
21132 | # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, | ||
21133 | # LIBRARY_PATH; skip all such settings. | ||
21134 | ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | | ||
21135 | @@ -25732,9 +18822,9 @@ | ||
21136 | # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". | ||
21137 | *-cmdline\ * | *-ignore\ * | *-def\ *) | ||
21138 | ac_f77_v_output=`echo $ac_f77_v_output | sed "\ | ||
21139 | - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g | ||
21140 | - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g | ||
21141 | - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; | ||
21142 | + s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g | ||
21143 | + s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g | ||
21144 | + s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; | ||
21145 | |||
21146 | # If we are using Cray Fortran then delete quotes. | ||
21147 | *cft90*) | ||
21148 | @@ -25753,8 +18843,8 @@ | ||
21149 | shift | ||
21150 | ac_arg=$1 | ||
21151 | case $ac_arg in | ||
21152 | - [\\/]*.a | ?:[\\/]*.a) | ||
21153 | - ac_exists=false | ||
21154 | + [\\/]*.a | ?:[\\/]*.a) | ||
21155 | + ac_exists=false | ||
21156 | for ac_i in $ac_cv_f77_libs; do | ||
21157 | if test x"$ac_arg" = x"$ac_i"; then | ||
21158 | ac_exists=true | ||
21159 | @@ -25762,15 +18852,14 @@ | ||
21160 | fi | ||
21161 | done | ||
21162 | |||
21163 | - if test x"$ac_exists" = xtrue; then | ||
21164 | - : | ||
21165 | + if test x"$ac_exists" = xtrue; then : | ||
21166 | + | ||
21167 | else | ||
21168 | ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" | ||
21169 | fi | ||
21170 | - | ||
21171 | - ;; | ||
21172 | - -bI:*) | ||
21173 | - ac_exists=false | ||
21174 | + ;; | ||
21175 | + -bI:*) | ||
21176 | + ac_exists=false | ||
21177 | for ac_i in $ac_cv_f77_libs; do | ||
21178 | if test x"$ac_arg" = x"$ac_i"; then | ||
21179 | ac_exists=true | ||
21180 | @@ -25778,8 +18867,8 @@ | ||
21181 | fi | ||
21182 | done | ||
21183 | |||
21184 | - if test x"$ac_exists" = xtrue; then | ||
21185 | - : | ||
21186 | + if test x"$ac_exists" = xtrue; then : | ||
21187 | + | ||
21188 | else | ||
21189 | if test "$ac_compiler_gnu" = yes; then | ||
21190 | for ac_link_opt in $ac_arg; do | ||
21191 | @@ -25789,18 +18878,18 @@ | ||
21192 | ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" | ||
21193 | fi | ||
21194 | fi | ||
21195 | - | ||
21196 | - ;; | ||
21197 | - # Ignore these flags. | ||
21198 | - -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) | ||
21199 | - ;; | ||
21200 | - -lkernel32) | ||
21201 | - test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" | ||
21202 | - ;; | ||
21203 | - -[LRuYz]) | ||
21204 | - # These flags, when seen by themselves, take an argument. | ||
21205 | - # We remove the space between option and argument and re-iterate | ||
21206 | - # unless we find an empty arg or a new option (starting with -) | ||
21207 | + ;; | ||
21208 | + # Ignore these flags. | ||
21209 | + -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ | ||
21210 | + |-LANG:=* | -LIST:* | -LNO:* | -link) | ||
21211 | + ;; | ||
21212 | + -lkernel32) | ||
21213 | + test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" | ||
21214 | + ;; | ||
21215 | + -[LRuYz]) | ||
21216 | + # These flags, when seen by themselves, take an argument. | ||
21217 | + # We remove the space between option and argument and re-iterate | ||
21218 | + # unless we find an empty arg or a new option (starting with -) | ||
21219 | case $2 in | ||
21220 | "" | -*);; | ||
21221 | *) | ||
21222 | @@ -25809,10 +18898,10 @@ | ||
21223 | set X $ac_arg "$@" | ||
21224 | ;; | ||
21225 | esac | ||
21226 | - ;; | ||
21227 | - -YP,*) | ||
21228 | - for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do | ||
21229 | - ac_exists=false | ||
21230 | + ;; | ||
21231 | + -YP,*) | ||
21232 | + for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do | ||
21233 | + ac_exists=false | ||
21234 | for ac_i in $ac_cv_f77_libs; do | ||
21235 | if test x"$ac_j" = x"$ac_i"; then | ||
21236 | ac_exists=true | ||
21237 | @@ -25820,17 +18909,16 @@ | ||
21238 | fi | ||
21239 | done | ||
21240 | |||
21241 | - if test x"$ac_exists" = xtrue; then | ||
21242 | - : | ||
21243 | + if test x"$ac_exists" = xtrue; then : | ||
21244 | + | ||
21245 | else | ||
21246 | ac_arg="$ac_arg $ac_j" | ||
21247 | - ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" | ||
21248 | + ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" | ||
21249 | fi | ||
21250 | - | ||
21251 | - done | ||
21252 | - ;; | ||
21253 | - -[lLR]*) | ||
21254 | - ac_exists=false | ||
21255 | + done | ||
21256 | + ;; | ||
21257 | + -[lLR]*) | ||
21258 | + ac_exists=false | ||
21259 | for ac_i in $ac_cv_f77_libs; do | ||
21260 | if test x"$ac_arg" = x"$ac_i"; then | ||
21261 | ac_exists=true | ||
21262 | @@ -25838,17 +18926,16 @@ | ||
21263 | fi | ||
21264 | done | ||
21265 | |||
21266 | - if test x"$ac_exists" = xtrue; then | ||
21267 | - : | ||
21268 | + if test x"$ac_exists" = xtrue; then : | ||
21269 | + | ||
21270 | else | ||
21271 | ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" | ||
21272 | fi | ||
21273 | - | ||
21274 | - ;; | ||
21275 | + ;; | ||
21276 | -zallextract*| -zdefaultextract) | ||
21277 | ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" | ||
21278 | ;; | ||
21279 | - # Ignore everything else. | ||
21280 | + # Ignore everything else. | ||
21281 | esac | ||
21282 | done | ||
21283 | # restore positional arguments | ||
21284 | @@ -25860,9 +18947,9 @@ | ||
21285 | case `(uname -sr) 2>/dev/null` in | ||
21286 | "SunOS 5"*) | ||
21287 | ac_ld_run_path=`$as_echo "$ac_f77_v_output" | | ||
21288 | - sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` | ||
21289 | + sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` | ||
21290 | test "x$ac_ld_run_path" != x && | ||
21291 | - if test "$ac_compiler_gnu" = yes; then | ||
21292 | + if test "$ac_compiler_gnu" = yes; then | ||
21293 | for ac_link_opt in $ac_ld_run_path; do | ||
21294 | ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" | ||
21295 | done | ||
21296 | @@ -25874,7 +18961,7 @@ | ||
21297 | fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" | ||
21298 | |||
21299 | fi | ||
21300 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_libs" >&5 | ||
21301 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5 | ||
21302 | $as_echo "$ac_cv_f77_libs" >&6; } | ||
21303 | FLIBS="$ac_cv_f77_libs" | ||
21304 | |||
21305 | @@ -25890,9 +18977,9 @@ | ||
21306 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
21307 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | ||
21308 | |||
21309 | -{ $as_echo "$as_me:$LINENO: checking for dummy main to link with Fortran 77 libraries" >&5 | ||
21310 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran 77 libraries" >&5 | ||
21311 | $as_echo_n "checking for dummy main to link with Fortran 77 libraries... " >&6; } | ||
21312 | -if test "${ac_cv_f77_dummy_main+set}" = set; then | ||
21313 | +if test "${ac_cv_f77_dummy_main+set}" = set; then : | ||
21314 | $as_echo_n "(cached) " >&6 | ||
21315 | else | ||
21316 | ac_f77_dm_save_LIBS=$LIBS | ||
21317 | @@ -25905,11 +18992,7 @@ | ||
21318 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
21319 | |||
21320 | # First, try linking without a dummy main: | ||
21321 | - cat >conftest.$ac_ext <<_ACEOF | ||
21322 | -/* confdefs.h. */ | ||
21323 | -_ACEOF | ||
21324 | -cat confdefs.h >>conftest.$ac_ext | ||
21325 | -cat >>conftest.$ac_ext <<_ACEOF | ||
21326 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21327 | /* end confdefs.h. */ | ||
21328 | |||
21329 | #ifdef F77_DUMMY_MAIN | ||
21330 | @@ -25928,46 +19011,17 @@ | ||
21331 | return 0; | ||
21332 | } | ||
21333 | _ACEOF | ||
21334 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
21335 | -if { (ac_try="$ac_link" | ||
21336 | -case "(($ac_try" in | ||
21337 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21338 | - *) ac_try_echo=$ac_try;; | ||
21339 | -esac | ||
21340 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21341 | -$as_echo "$ac_try_echo") >&5 | ||
21342 | - (eval "$ac_link") 2>conftest.er1 | ||
21343 | - ac_status=$? | ||
21344 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21345 | - rm -f conftest.er1 | ||
21346 | - cat conftest.err >&5 | ||
21347 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21348 | - (exit $ac_status); } && { | ||
21349 | - test -z "$ac_c_werror_flag" || | ||
21350 | - test ! -s conftest.err | ||
21351 | - } && test -s conftest$ac_exeext && { | ||
21352 | - test "$cross_compiling" = yes || | ||
21353 | - $as_test_x conftest$ac_exeext | ||
21354 | - }; then | ||
21355 | +if ac_fn_c_try_link "$LINENO"; then : | ||
21356 | ac_cv_fortran_dummy_main=none | ||
21357 | else | ||
21358 | - $as_echo "$as_me: failed program was:" >&5 | ||
21359 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
21360 | - | ||
21361 | - ac_cv_fortran_dummy_main=unknown | ||
21362 | + ac_cv_fortran_dummy_main=unknown | ||
21363 | fi | ||
21364 | - | ||
21365 | -rm -rf conftest.dSYM | ||
21366 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21367 | - conftest$ac_exeext conftest.$ac_ext | ||
21368 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21369 | + conftest$ac_exeext conftest.$ac_ext | ||
21370 | |||
21371 | if test $ac_cv_fortran_dummy_main = unknown; then | ||
21372 | for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do | ||
21373 | - cat >conftest.$ac_ext <<_ACEOF | ||
21374 | -/* confdefs.h. */ | ||
21375 | -_ACEOF | ||
21376 | -cat confdefs.h >>conftest.$ac_ext | ||
21377 | -cat >>conftest.$ac_ext <<_ACEOF | ||
21378 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21379 | /* end confdefs.h. */ | ||
21380 | #define $ac_fortran_dm_var $ac_func | ||
21381 | #ifdef F77_DUMMY_MAIN | ||
21382 | @@ -25986,38 +19040,11 @@ | ||
21383 | return 0; | ||
21384 | } | ||
21385 | _ACEOF | ||
21386 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
21387 | -if { (ac_try="$ac_link" | ||
21388 | -case "(($ac_try" in | ||
21389 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21390 | - *) ac_try_echo=$ac_try;; | ||
21391 | -esac | ||
21392 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21393 | -$as_echo "$ac_try_echo") >&5 | ||
21394 | - (eval "$ac_link") 2>conftest.er1 | ||
21395 | - ac_status=$? | ||
21396 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21397 | - rm -f conftest.er1 | ||
21398 | - cat conftest.err >&5 | ||
21399 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21400 | - (exit $ac_status); } && { | ||
21401 | - test -z "$ac_c_werror_flag" || | ||
21402 | - test ! -s conftest.err | ||
21403 | - } && test -s conftest$ac_exeext && { | ||
21404 | - test "$cross_compiling" = yes || | ||
21405 | - $as_test_x conftest$ac_exeext | ||
21406 | - }; then | ||
21407 | +if ac_fn_c_try_link "$LINENO"; then : | ||
21408 | ac_cv_fortran_dummy_main=$ac_func; break | ||
21409 | -else | ||
21410 | - $as_echo "$as_me: failed program was:" >&5 | ||
21411 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
21412 | - | ||
21413 | - | ||
21414 | fi | ||
21415 | - | ||
21416 | -rm -rf conftest.dSYM | ||
21417 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21418 | - conftest$ac_exeext conftest.$ac_ext | ||
21419 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21420 | + conftest$ac_exeext conftest.$ac_ext | ||
21421 | done | ||
21422 | fi | ||
21423 | ac_ext=f | ||
21424 | @@ -26029,10 +19056,10 @@ | ||
21425 | LIBS=$ac_f77_dm_save_LIBS | ||
21426 | |||
21427 | fi | ||
21428 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_dummy_main" >&5 | ||
21429 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_dummy_main" >&5 | ||
21430 | $as_echo "$ac_cv_f77_dummy_main" >&6; } | ||
21431 | F77_DUMMY_MAIN=$ac_cv_f77_dummy_main | ||
21432 | -if test "$F77_DUMMY_MAIN" != unknown; then | ||
21433 | +if test "$F77_DUMMY_MAIN" != unknown; then : | ||
21434 | if test $F77_DUMMY_MAIN != none; then | ||
21435 | |||
21436 | cat >>confdefs.h <<_ACEOF | ||
21437 | @@ -26041,19 +19068,16 @@ | ||
21438 | |||
21439 | if test "x$ac_cv_fc_dummy_main" = "x$ac_cv_f77_dummy_main"; then | ||
21440 | |||
21441 | -cat >>confdefs.h <<\_ACEOF | ||
21442 | -#define FC_DUMMY_MAIN_EQ_F77 1 | ||
21443 | -_ACEOF | ||
21444 | +$as_echo "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h | ||
21445 | |||
21446 | fi | ||
21447 | fi | ||
21448 | else | ||
21449 | enable_fortran=no | ||
21450 | - { $as_echo "$as_me:$LINENO: WARNING: *** Couldn't figure out how to link C and Fortran; using default Fortran wrappers." >&5 | ||
21451 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Couldn't figure out how to link C and Fortran; using default Fortran wrappers." >&5 | ||
21452 | $as_echo "$as_me: WARNING: *** Couldn't figure out how to link C and Fortran; using default Fortran wrappers." >&2;} | ||
21453 | fi | ||
21454 | |||
21455 | - | ||
21456 | ac_ext=c | ||
21457 | ac_cpp='$CPP $CPPFLAGS' | ||
21458 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
21459 | @@ -26063,9 +19087,7 @@ | ||
21460 | fi | ||
21461 | else | ||
21462 | |||
21463 | -cat >>confdefs.h <<\_ACEOF | ||
21464 | -#define DISABLE_FORTRAN 1 | ||
21465 | -_ACEOF | ||
21466 | +$as_echo "#define DISABLE_FORTRAN 1" >>confdefs.h | ||
21467 | |||
21468 | fi | ||
21469 | |||
21470 | @@ -26074,12 +19096,12 @@ | ||
21471 | ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' | ||
21472 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
21473 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | ||
21474 | -{ $as_echo "$as_me:$LINENO: checking for Fortran 77 name-mangling scheme" >&5 | ||
21475 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 name-mangling scheme" >&5 | ||
21476 | $as_echo_n "checking for Fortran 77 name-mangling scheme... " >&6; } | ||
21477 | -if test "${ac_cv_f77_mangling+set}" = set; then | ||
21478 | +if test "${ac_cv_f77_mangling+set}" = set; then : | ||
21479 | $as_echo_n "(cached) " >&6 | ||
21480 | else | ||
21481 | - cat >conftest.$ac_ext <<_ACEOF | ||
21482 | + cat > conftest.$ac_ext <<_ACEOF | ||
21483 | subroutine foobar() | ||
21484 | return | ||
21485 | end | ||
21486 | @@ -26087,24 +19109,7 @@ | ||
21487 | return | ||
21488 | end | ||
21489 | _ACEOF | ||
21490 | -rm -f conftest.$ac_objext | ||
21491 | -if { (ac_try="$ac_compile" | ||
21492 | -case "(($ac_try" in | ||
21493 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21494 | - *) ac_try_echo=$ac_try;; | ||
21495 | -esac | ||
21496 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21497 | -$as_echo "$ac_try_echo") >&5 | ||
21498 | - (eval "$ac_compile") 2>conftest.er1 | ||
21499 | - ac_status=$? | ||
21500 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21501 | - rm -f conftest.er1 | ||
21502 | - cat conftest.err >&5 | ||
21503 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21504 | - (exit $ac_status); } && { | ||
21505 | - test -z "$ac_f77_werror_flag" || | ||
21506 | - test ! -s conftest.err | ||
21507 | - } && test -s conftest.$ac_objext; then | ||
21508 | +if ac_fn_f77_try_compile "$LINENO"; then : | ||
21509 | mv conftest.$ac_objext cfortran_test.$ac_objext | ||
21510 | |||
21511 | ac_save_LIBS=$LIBS | ||
21512 | @@ -26119,11 +19124,7 @@ | ||
21513 | for ac_foobar in foobar FOOBAR; do | ||
21514 | for ac_underscore in "" "_"; do | ||
21515 | ac_func="$ac_foobar$ac_underscore" | ||
21516 | - cat >conftest.$ac_ext <<_ACEOF | ||
21517 | -/* confdefs.h. */ | ||
21518 | -_ACEOF | ||
21519 | -cat confdefs.h >>conftest.$ac_ext | ||
21520 | -cat >>conftest.$ac_ext <<_ACEOF | ||
21521 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21522 | /* end confdefs.h. */ | ||
21523 | |||
21524 | /* Override any GCC internal prototype to avoid an error. | ||
21525 | @@ -26149,38 +19150,11 @@ | ||
21526 | return 0; | ||
21527 | } | ||
21528 | _ACEOF | ||
21529 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
21530 | -if { (ac_try="$ac_link" | ||
21531 | -case "(($ac_try" in | ||
21532 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21533 | - *) ac_try_echo=$ac_try;; | ||
21534 | -esac | ||
21535 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21536 | -$as_echo "$ac_try_echo") >&5 | ||
21537 | - (eval "$ac_link") 2>conftest.er1 | ||
21538 | - ac_status=$? | ||
21539 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21540 | - rm -f conftest.er1 | ||
21541 | - cat conftest.err >&5 | ||
21542 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21543 | - (exit $ac_status); } && { | ||
21544 | - test -z "$ac_c_werror_flag" || | ||
21545 | - test ! -s conftest.err | ||
21546 | - } && test -s conftest$ac_exeext && { | ||
21547 | - test "$cross_compiling" = yes || | ||
21548 | - $as_test_x conftest$ac_exeext | ||
21549 | - }; then | ||
21550 | +if ac_fn_c_try_link "$LINENO"; then : | ||
21551 | ac_success=yes; break 2 | ||
21552 | -else | ||
21553 | - $as_echo "$as_me: failed program was:" >&5 | ||
21554 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
21555 | - | ||
21556 | - | ||
21557 | fi | ||
21558 | - | ||
21559 | -rm -rf conftest.dSYM | ||
21560 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21561 | - conftest$ac_exeext conftest.$ac_ext | ||
21562 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21563 | + conftest$ac_exeext conftest.$ac_ext | ||
21564 | done | ||
21565 | done | ||
21566 | ac_ext=f | ||
21567 | @@ -26208,11 +19182,7 @@ | ||
21568 | ac_success_extra=no | ||
21569 | for ac_extra in "" "_"; do | ||
21570 | ac_func="$ac_foo_bar$ac_underscore$ac_extra" | ||
21571 | - cat >conftest.$ac_ext <<_ACEOF | ||
21572 | -/* confdefs.h. */ | ||
21573 | -_ACEOF | ||
21574 | -cat confdefs.h >>conftest.$ac_ext | ||
21575 | -cat >>conftest.$ac_ext <<_ACEOF | ||
21576 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21577 | /* end confdefs.h. */ | ||
21578 | |||
21579 | /* Override any GCC internal prototype to avoid an error. | ||
21580 | @@ -26238,38 +19208,11 @@ | ||
21581 | return 0; | ||
21582 | } | ||
21583 | _ACEOF | ||
21584 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
21585 | -if { (ac_try="$ac_link" | ||
21586 | -case "(($ac_try" in | ||
21587 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21588 | - *) ac_try_echo=$ac_try;; | ||
21589 | -esac | ||
21590 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21591 | -$as_echo "$ac_try_echo") >&5 | ||
21592 | - (eval "$ac_link") 2>conftest.er1 | ||
21593 | - ac_status=$? | ||
21594 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21595 | - rm -f conftest.er1 | ||
21596 | - cat conftest.err >&5 | ||
21597 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21598 | - (exit $ac_status); } && { | ||
21599 | - test -z "$ac_c_werror_flag" || | ||
21600 | - test ! -s conftest.err | ||
21601 | - } && test -s conftest$ac_exeext && { | ||
21602 | - test "$cross_compiling" = yes || | ||
21603 | - $as_test_x conftest$ac_exeext | ||
21604 | - }; then | ||
21605 | +if ac_fn_c_try_link "$LINENO"; then : | ||
21606 | ac_success_extra=yes; break | ||
21607 | -else | ||
21608 | - $as_echo "$as_me: failed program was:" >&5 | ||
21609 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
21610 | - | ||
21611 | - | ||
21612 | fi | ||
21613 | - | ||
21614 | -rm -rf conftest.dSYM | ||
21615 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21616 | - conftest$ac_exeext conftest.$ac_ext | ||
21617 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21618 | + conftest$ac_exeext conftest.$ac_ext | ||
21619 | done | ||
21620 | ac_ext=f | ||
21621 | ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' | ||
21622 | @@ -26278,16 +19221,16 @@ | ||
21623 | |||
21624 | if test "$ac_success_extra" = "yes"; then | ||
21625 | ac_cv_f77_mangling="$ac_case case" | ||
21626 | - if test -z "$ac_underscore"; then | ||
21627 | - ac_cv_f77_mangling="$ac_cv_f77_mangling, no underscore" | ||
21628 | + if test -z "$ac_underscore"; then | ||
21629 | + ac_cv_f77_mangling="$ac_cv_f77_mangling, no underscore" | ||
21630 | else | ||
21631 | - ac_cv_f77_mangling="$ac_cv_f77_mangling, underscore" | ||
21632 | - fi | ||
21633 | - if test -z "$ac_extra"; then | ||
21634 | - ac_cv_f77_mangling="$ac_cv_f77_mangling, no extra underscore" | ||
21635 | + ac_cv_f77_mangling="$ac_cv_f77_mangling, underscore" | ||
21636 | + fi | ||
21637 | + if test -z "$ac_extra"; then | ||
21638 | + ac_cv_f77_mangling="$ac_cv_f77_mangling, no extra underscore" | ||
21639 | else | ||
21640 | - ac_cv_f77_mangling="$ac_cv_f77_mangling, extra underscore" | ||
21641 | - fi | ||
21642 | + ac_cv_f77_mangling="$ac_cv_f77_mangling, extra underscore" | ||
21643 | + fi | ||
21644 | else | ||
21645 | ac_cv_f77_mangling="unknown" | ||
21646 | fi | ||
21647 | @@ -26299,22 +19242,15 @@ | ||
21648 | rm -rf conftest* | ||
21649 | rm -f cfortran_test* | ||
21650 | else | ||
21651 | - $as_echo "$as_me: failed program was:" >&5 | ||
21652 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
21653 | - | ||
21654 | - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
21655 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
21656 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
21657 | -{ { $as_echo "$as_me:$LINENO: error: cannot compile a simple Fortran program | ||
21658 | -See \`config.log' for more details." >&5 | ||
21659 | -$as_echo "$as_me: error: cannot compile a simple Fortran program | ||
21660 | -See \`config.log' for more details." >&2;} | ||
21661 | - { (exit 1); exit 1; }; }; } | ||
21662 | +as_fn_error $? "cannot compile a simple Fortran program | ||
21663 | +See \`config.log' for more details" "$LINENO" 5 ; } | ||
21664 | fi | ||
21665 | - | ||
21666 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21667 | |||
21668 | fi | ||
21669 | -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_mangling" >&5 | ||
21670 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_mangling" >&5 | ||
21671 | $as_echo "$ac_cv_f77_mangling" >&6; } | ||
21672 | |||
21673 | ac_ext=c | ||
21674 | @@ -26327,85 +19263,51 @@ | ||
21675 | ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' | ||
21676 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
21677 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | ||
21678 | - | ||
21679 | - | ||
21680 | case $ac_cv_f77_mangling in | ||
21681 | "lower case, no underscore, no extra underscore") | ||
21682 | - cat >>confdefs.h <<\_ACEOF | ||
21683 | -#define F77_FUNC(name,NAME) name | ||
21684 | -_ACEOF | ||
21685 | + $as_echo "#define F77_FUNC(name,NAME) name" >>confdefs.h | ||
21686 | |||
21687 | - cat >>confdefs.h <<\_ACEOF | ||
21688 | -#define F77_FUNC_(name,NAME) name | ||
21689 | -_ACEOF | ||
21690 | + $as_echo "#define F77_FUNC_(name,NAME) name" >>confdefs.h | ||
21691 | ;; | ||
21692 | "lower case, no underscore, extra underscore") | ||
21693 | - cat >>confdefs.h <<\_ACEOF | ||
21694 | -#define F77_FUNC(name,NAME) name | ||
21695 | -_ACEOF | ||
21696 | + $as_echo "#define F77_FUNC(name,NAME) name" >>confdefs.h | ||
21697 | |||
21698 | - cat >>confdefs.h <<\_ACEOF | ||
21699 | -#define F77_FUNC_(name,NAME) name ## _ | ||
21700 | -_ACEOF | ||
21701 | + $as_echo "#define F77_FUNC_(name,NAME) name ## _" >>confdefs.h | ||
21702 | ;; | ||
21703 | "lower case, underscore, no extra underscore") | ||
21704 | - cat >>confdefs.h <<\_ACEOF | ||
21705 | -#define F77_FUNC(name,NAME) name ## _ | ||
21706 | -_ACEOF | ||
21707 | + $as_echo "#define F77_FUNC(name,NAME) name ## _" >>confdefs.h | ||
21708 | |||
21709 | - cat >>confdefs.h <<\_ACEOF | ||
21710 | -#define F77_FUNC_(name,NAME) name ## _ | ||
21711 | -_ACEOF | ||
21712 | + $as_echo "#define F77_FUNC_(name,NAME) name ## _" >>confdefs.h | ||
21713 | ;; | ||
21714 | "lower case, underscore, extra underscore") | ||
21715 | - cat >>confdefs.h <<\_ACEOF | ||
21716 | -#define F77_FUNC(name,NAME) name ## _ | ||
21717 | -_ACEOF | ||
21718 | + $as_echo "#define F77_FUNC(name,NAME) name ## _" >>confdefs.h | ||
21719 | |||
21720 | - cat >>confdefs.h <<\_ACEOF | ||
21721 | -#define F77_FUNC_(name,NAME) name ## __ | ||
21722 | -_ACEOF | ||
21723 | + $as_echo "#define F77_FUNC_(name,NAME) name ## __" >>confdefs.h | ||
21724 | ;; | ||
21725 | "upper case, no underscore, no extra underscore") | ||
21726 | - cat >>confdefs.h <<\_ACEOF | ||
21727 | -#define F77_FUNC(name,NAME) NAME | ||
21728 | -_ACEOF | ||
21729 | + $as_echo "#define F77_FUNC(name,NAME) NAME" >>confdefs.h | ||
21730 | |||
21731 | - cat >>confdefs.h <<\_ACEOF | ||
21732 | -#define F77_FUNC_(name,NAME) NAME | ||
21733 | -_ACEOF | ||
21734 | + $as_echo "#define F77_FUNC_(name,NAME) NAME" >>confdefs.h | ||
21735 | ;; | ||
21736 | "upper case, no underscore, extra underscore") | ||
21737 | - cat >>confdefs.h <<\_ACEOF | ||
21738 | -#define F77_FUNC(name,NAME) NAME | ||
21739 | -_ACEOF | ||
21740 | + $as_echo "#define F77_FUNC(name,NAME) NAME" >>confdefs.h | ||
21741 | |||
21742 | - cat >>confdefs.h <<\_ACEOF | ||
21743 | -#define F77_FUNC_(name,NAME) NAME ## _ | ||
21744 | -_ACEOF | ||
21745 | + $as_echo "#define F77_FUNC_(name,NAME) NAME ## _" >>confdefs.h | ||
21746 | ;; | ||
21747 | "upper case, underscore, no extra underscore") | ||
21748 | - cat >>confdefs.h <<\_ACEOF | ||
21749 | -#define F77_FUNC(name,NAME) NAME ## _ | ||
21750 | -_ACEOF | ||
21751 | + $as_echo "#define F77_FUNC(name,NAME) NAME ## _" >>confdefs.h | ||
21752 | |||
21753 | - cat >>confdefs.h <<\_ACEOF | ||
21754 | -#define F77_FUNC_(name,NAME) NAME ## _ | ||
21755 | -_ACEOF | ||
21756 | + $as_echo "#define F77_FUNC_(name,NAME) NAME ## _" >>confdefs.h | ||
21757 | ;; | ||
21758 | "upper case, underscore, extra underscore") | ||
21759 | - cat >>confdefs.h <<\_ACEOF | ||
21760 | -#define F77_FUNC(name,NAME) NAME ## _ | ||
21761 | -_ACEOF | ||
21762 | + $as_echo "#define F77_FUNC(name,NAME) NAME ## _" >>confdefs.h | ||
21763 | |||
21764 | - cat >>confdefs.h <<\_ACEOF | ||
21765 | -#define F77_FUNC_(name,NAME) NAME ## __ | ||
21766 | -_ACEOF | ||
21767 | + $as_echo "#define F77_FUNC_(name,NAME) NAME ## __" >>confdefs.h | ||
21768 | ;; | ||
21769 | *) | ||
21770 | - { $as_echo "$as_me:$LINENO: WARNING: unknown Fortran name-mangling scheme" >&5 | ||
21771 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5 | ||
21772 | $as_echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;} | ||
21773 | - ;; | ||
21774 | + ;; | ||
21775 | esac | ||
21776 | |||
21777 | ac_ext=c | ||
21778 | @@ -26456,9 +19358,7 @@ | ||
21779 | f77_foo2=`echo $f77foo | sed 's/77/77_/'` | ||
21780 | if test "$f77_foo" = "$f77_foo2"; then | ||
21781 | |||
21782 | -cat >>confdefs.h <<\_ACEOF | ||
21783 | -#define F77_FUNC_EQUIV 1 | ||
21784 | -_ACEOF | ||
21785 | +$as_echo "#define F77_FUNC_EQUIV 1" >>confdefs.h | ||
21786 | |||
21787 | |||
21788 | # Include g77 wrappers by default for GNU systems or gfortran | ||
21789 | @@ -26471,21 +19371,19 @@ | ||
21790 | |||
21791 | |||
21792 | # Check whether --with-g77-wrappers was given. | ||
21793 | -if test "${with_g77_wrappers+set}" = set; then | ||
21794 | +if test "${with_g77_wrappers+set}" = set; then : | ||
21795 | withval=$with_g77_wrappers; with_g77_wrappers=$withval | ||
21796 | fi | ||
21797 | |||
21798 | if test "x$with_g77_wrappers" = "xyes"; then | ||
21799 | |||
21800 | -cat >>confdefs.h <<\_ACEOF | ||
21801 | -#define WITH_G77_WRAPPERS 1 | ||
21802 | -_ACEOF | ||
21803 | +$as_echo "#define WITH_G77_WRAPPERS 1" >>confdefs.h | ||
21804 | |||
21805 | fi | ||
21806 | |||
21807 | have_smp="no" | ||
21808 | # Check whether --enable-openmp was given. | ||
21809 | -if test "${enable_openmp+set}" = set; then | ||
21810 | +if test "${enable_openmp+set}" = set; then : | ||
21811 | enableval=$enable_openmp; enable_openmp=$enableval | ||
21812 | else | ||
21813 | enable_openmp=no | ||
21814 | @@ -26494,15 +19392,13 @@ | ||
21815 | |||
21816 | if test "$enable_openmp" = "yes"; then | ||
21817 | |||
21818 | -cat >>confdefs.h <<\_ACEOF | ||
21819 | -#define HAVE_OPENMP 1 | ||
21820 | -_ACEOF | ||
21821 | +$as_echo "#define HAVE_OPENMP 1" >>confdefs.h | ||
21822 | |||
21823 | have_smp="yes" | ||
21824 | fi | ||
21825 | |||
21826 | # Check whether --enable-threads was given. | ||
21827 | -if test "${enable_threads+set}" = set; then | ||
21828 | +if test "${enable_threads+set}" = set; then : | ||
21829 | enableval=$enable_threads; enable_threads=$enableval | ||
21830 | else | ||
21831 | enable_threads=no | ||
21832 | @@ -26511,32 +19407,24 @@ | ||
21833 | |||
21834 | if test "$enable_threads" = "yes"; then | ||
21835 | |||
21836 | -cat >>confdefs.h <<\_ACEOF | ||
21837 | -#define HAVE_THREADS 1 | ||
21838 | -_ACEOF | ||
21839 | +$as_echo "#define HAVE_THREADS 1" >>confdefs.h | ||
21840 | |||
21841 | if test "$enable_openmp" = "yes"; then | ||
21842 | - { { $as_echo "$as_me:$LINENO: error: --enable-threads/--enable-openmp are mutually exclusive" >&5 | ||
21843 | -$as_echo "$as_me: error: --enable-threads/--enable-openmp are mutually exclusive" >&2;} | ||
21844 | - { (exit 1); exit 1; }; } | ||
21845 | + as_fn_error $? "--enable-threads/--enable-openmp are mutually exclusive" "$LINENO" 5 | ||
21846 | fi | ||
21847 | if test "$have_cell" = "yes"; then | ||
21848 | - { { $as_echo "$as_me:$LINENO: error: --enable-threads/--enable-cell are mutually exclusive" >&5 | ||
21849 | -$as_echo "$as_me: error: --enable-threads/--enable-cell are mutually exclusive" >&2;} | ||
21850 | - { (exit 1); exit 1; }; } | ||
21851 | + as_fn_error $? "--enable-threads/--enable-cell are mutually exclusive" "$LINENO" 5 | ||
21852 | fi | ||
21853 | have_smp="yes" | ||
21854 | fi | ||
21855 | |||
21856 | if test "$enable_openmp"x != "nox" -a "$enable_threads"x != "nox"; then | ||
21857 | - { { $as_echo "$as_me:$LINENO: error: --enable-threads/--enable-openmp are mutually exclusive" >&5 | ||
21858 | -$as_echo "$as_me: error: --enable-threads/--enable-openmp are mutually exclusive" >&2;} | ||
21859 | - { (exit 1); exit 1; }; } | ||
21860 | + as_fn_error $? "--enable-threads/--enable-openmp are mutually exclusive" "$LINENO" 5 | ||
21861 | fi | ||
21862 | |||
21863 | |||
21864 | # Check whether --with-combined-threads was given. | ||
21865 | -if test "${with_combined_threads+set}" = set; then | ||
21866 | +if test "${with_combined_threads+set}" = set; then : | ||
21867 | withval=$with_combined_threads; with_combined_threads=$withval | ||
21868 | else | ||
21869 | with_combined_threads=no | ||
21870 | @@ -26546,9 +19434,9 @@ | ||
21871 | if test "$enable_openmp"x != nox; then | ||
21872 | |||
21873 | |||
21874 | -{ $as_echo "$as_me:$LINENO: checking for OpenMP flag of C compiler" >&5 | ||
21875 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C compiler" >&5 | ||
21876 | $as_echo_n "checking for OpenMP flag of C compiler... " >&6; } | ||
21877 | -if test "${ax_cv_c_openmp+set}" = set; then | ||
21878 | +if test "${ax_cv_c_openmp+set}" = set; then : | ||
21879 | $as_echo_n "(cached) " >&6 | ||
21880 | else | ||
21881 | saveCFLAGS=$CFLAGS | ||
21882 | @@ -26564,11 +19452,7 @@ | ||
21883 | none) CFLAGS=$saveC ;; | ||
21884 | *) CFLAGS="$saveCFLAGS $ax_openmp_flag" ;; | ||
21885 | esac | ||
21886 | - cat >conftest.$ac_ext <<_ACEOF | ||
21887 | -/* confdefs.h. */ | ||
21888 | -_ACEOF | ||
21889 | -cat confdefs.h >>conftest.$ac_ext | ||
21890 | -cat >>conftest.$ac_ext <<_ACEOF | ||
21891 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21892 | /* end confdefs.h. */ | ||
21893 | |||
21894 | /* Override any GCC internal prototype to avoid an error. | ||
21895 | @@ -26594,57 +19478,26 @@ | ||
21896 | return 0; | ||
21897 | } | ||
21898 | _ACEOF | ||
21899 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
21900 | -if { (ac_try="$ac_link" | ||
21901 | -case "(($ac_try" in | ||
21902 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21903 | - *) ac_try_echo=$ac_try;; | ||
21904 | -esac | ||
21905 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21906 | -$as_echo "$ac_try_echo") >&5 | ||
21907 | - (eval "$ac_link") 2>conftest.er1 | ||
21908 | - ac_status=$? | ||
21909 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21910 | - rm -f conftest.er1 | ||
21911 | - cat conftest.err >&5 | ||
21912 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21913 | - (exit $ac_status); } && { | ||
21914 | - test -z "$ac_c_werror_flag" || | ||
21915 | - test ! -s conftest.err | ||
21916 | - } && test -s conftest$ac_exeext && { | ||
21917 | - test "$cross_compiling" = yes || | ||
21918 | - $as_test_x conftest$ac_exeext | ||
21919 | - }; then | ||
21920 | +if ac_fn_c_try_link "$LINENO"; then : | ||
21921 | ax_cv_c_openmp=$ax_openmp_flag; break | ||
21922 | -else | ||
21923 | - $as_echo "$as_me: failed program was:" >&5 | ||
21924 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
21925 | - | ||
21926 | - | ||
21927 | fi | ||
21928 | - | ||
21929 | -rm -rf conftest.dSYM | ||
21930 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21931 | - conftest$ac_exeext conftest.$ac_ext | ||
21932 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21933 | + conftest$ac_exeext conftest.$ac_ext | ||
21934 | done | ||
21935 | CFLAGS=$saveCFLAGS | ||
21936 | |||
21937 | fi | ||
21938 | -{ $as_echo "$as_me:$LINENO: result: $ax_cv_c_openmp" >&5 | ||
21939 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_openmp" >&5 | ||
21940 | $as_echo "$ax_cv_c_openmp" >&6; } | ||
21941 | if test "x$ax_cv_c_openmp" = "xunknown"; then | ||
21942 | - { { $as_echo "$as_me:$LINENO: error: don't know how to enable OpenMP" >&5 | ||
21943 | -$as_echo "$as_me: error: don't know how to enable OpenMP" >&2;} | ||
21944 | - { (exit 1); exit 1; }; } | ||
21945 | + as_fn_error $? "don't know how to enable OpenMP" "$LINENO" 5 | ||
21946 | else | ||
21947 | if test "x$ax_cv_c_openmp" != "xnone"; then | ||
21948 | OPENMP_CFLAGS=$ax_cv_c_openmp | ||
21949 | fi | ||
21950 | THREADLIBS=" " | ||
21951 | |||
21952 | -cat >>confdefs.h <<\_ACEOF | ||
21953 | -#define USING_OPENMP_THREADS 1 | ||
21954 | -_ACEOF | ||
21955 | +$as_echo "#define USING_OPENMP_THREADS 1" >>confdefs.h | ||
21956 | |||
21957 | CFLAGS="$CFLAGS $OPENMP_CFLAGS" | ||
21958 | fi | ||
21959 | @@ -26679,13 +19532,9 @@ | ||
21960 | CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
21961 | save_LIBS="$LIBS" | ||
21962 | LIBS="$PTHREAD_LIBS $LIBS" | ||
21963 | - { $as_echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 | ||
21964 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 | ||
21965 | $as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } | ||
21966 | - cat >conftest.$ac_ext <<_ACEOF | ||
21967 | -/* confdefs.h. */ | ||
21968 | -_ACEOF | ||
21969 | -cat confdefs.h >>conftest.$ac_ext | ||
21970 | -cat >>conftest.$ac_ext <<_ACEOF | ||
21971 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21972 | /* end confdefs.h. */ | ||
21973 | |||
21974 | /* Override any GCC internal prototype to avoid an error. | ||
21975 | @@ -26711,39 +19560,12 @@ | ||
21976 | return 0; | ||
21977 | } | ||
21978 | _ACEOF | ||
21979 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
21980 | -if { (ac_try="$ac_link" | ||
21981 | -case "(($ac_try" in | ||
21982 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21983 | - *) ac_try_echo=$ac_try;; | ||
21984 | -esac | ||
21985 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
21986 | -$as_echo "$ac_try_echo") >&5 | ||
21987 | - (eval "$ac_link") 2>conftest.er1 | ||
21988 | - ac_status=$? | ||
21989 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
21990 | - rm -f conftest.er1 | ||
21991 | - cat conftest.err >&5 | ||
21992 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21993 | - (exit $ac_status); } && { | ||
21994 | - test -z "$ac_c_werror_flag" || | ||
21995 | - test ! -s conftest.err | ||
21996 | - } && test -s conftest$ac_exeext && { | ||
21997 | - test "$cross_compiling" = yes || | ||
21998 | - $as_test_x conftest$ac_exeext | ||
21999 | - }; then | ||
22000 | +if ac_fn_c_try_link "$LINENO"; then : | ||
22001 | acx_pthread_ok=yes | ||
22002 | -else | ||
22003 | - $as_echo "$as_me: failed program was:" >&5 | ||
22004 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
22005 | - | ||
22006 | - | ||
22007 | fi | ||
22008 | - | ||
22009 | -rm -rf conftest.dSYM | ||
22010 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22011 | - conftest$ac_exeext conftest.$ac_ext | ||
22012 | - { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 | ||
22013 | +rm -f core conftest.err conftest.$ac_objext \ | ||
22014 | + conftest$ac_exeext conftest.$ac_ext | ||
22015 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 | ||
22016 | $as_echo "$acx_pthread_ok" >&6; } | ||
22017 | if test x"$acx_pthread_ok" = xno; then | ||
22018 | PTHREAD_LIBS="" | ||
22019 | @@ -26806,12 +19628,12 @@ | ||
22020 | |||
22021 | case $flag in | ||
22022 | none) | ||
22023 | - { $as_echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 | ||
22024 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 | ||
22025 | $as_echo_n "checking whether pthreads work without any flags... " >&6; } | ||
22026 | ;; | ||
22027 | |||
22028 | -*) | ||
22029 | - { $as_echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 | ||
22030 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 | ||
22031 | $as_echo_n "checking whether pthreads work with $flag... " >&6; } | ||
22032 | PTHREAD_CFLAGS="$flag" | ||
22033 | ;; | ||
22034 | @@ -26819,9 +19641,9 @@ | ||
22035 | pthread-config) | ||
22036 | # Extract the first word of "pthread-config", so it can be a program name with args. | ||
22037 | set dummy pthread-config; ac_word=$2 | ||
22038 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
22039 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
22040 | $as_echo_n "checking for $ac_word... " >&6; } | ||
22041 | -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then | ||
22042 | +if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : | ||
22043 | $as_echo_n "(cached) " >&6 | ||
22044 | else | ||
22045 | if test -n "$acx_pthread_config"; then | ||
22046 | @@ -26832,14 +19654,14 @@ | ||
22047 | do | ||
22048 | IFS=$as_save_IFS | ||
22049 | test -z "$as_dir" && as_dir=. | ||
22050 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
22051 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
22052 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
22053 | ac_cv_prog_acx_pthread_config="yes" | ||
22054 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
22055 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
22056 | break 2 | ||
22057 | fi | ||
22058 | done | ||
22059 | -done | ||
22060 | + done | ||
22061 | IFS=$as_save_IFS | ||
22062 | |||
22063 | test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" | ||
22064 | @@ -26847,10 +19669,10 @@ | ||
22065 | fi | ||
22066 | acx_pthread_config=$ac_cv_prog_acx_pthread_config | ||
22067 | if test -n "$acx_pthread_config"; then | ||
22068 | - { $as_echo "$as_me:$LINENO: result: $acx_pthread_config" >&5 | ||
22069 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 | ||
22070 | $as_echo "$acx_pthread_config" >&6; } | ||
22071 | else | ||
22072 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
22073 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22074 | $as_echo "no" >&6; } | ||
22075 | fi | ||
22076 | |||
22077 | @@ -26861,7 +19683,7 @@ | ||
22078 | ;; | ||
22079 | |||
22080 | *) | ||
22081 | - { $as_echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 | ||
22082 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 | ||
22083 | $as_echo_n "checking for the pthreads library -l$flag... " >&6; } | ||
22084 | PTHREAD_LIBS="-l$flag" | ||
22085 | ;; | ||
22086 | @@ -26881,11 +19703,7 @@ | ||
22087 | # pthread_cleanup_push because it is one of the few pthread | ||
22088 | # functions on Solaris that doesn't have a non-functional libc stub. | ||
22089 | # We try pthread_create on general principles. | ||
22090 | - cat >conftest.$ac_ext <<_ACEOF | ||
22091 | -/* confdefs.h. */ | ||
22092 | -_ACEOF | ||
22093 | -cat confdefs.h >>conftest.$ac_ext | ||
22094 | -cat >>conftest.$ac_ext <<_ACEOF | ||
22095 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22096 | /* end confdefs.h. */ | ||
22097 | #include <pthread.h> | ||
22098 | #ifdef F77_DUMMY_MAIN | ||
22099 | @@ -26909,43 +19727,16 @@ | ||
22100 | return 0; | ||
22101 | } | ||
22102 | _ACEOF | ||
22103 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
22104 | -if { (ac_try="$ac_link" | ||
22105 | -case "(($ac_try" in | ||
22106 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22107 | - *) ac_try_echo=$ac_try;; | ||
22108 | -esac | ||
22109 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
22110 | -$as_echo "$ac_try_echo") >&5 | ||
22111 | - (eval "$ac_link") 2>conftest.er1 | ||
22112 | - ac_status=$? | ||
22113 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
22114 | - rm -f conftest.er1 | ||
22115 | - cat conftest.err >&5 | ||
22116 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22117 | - (exit $ac_status); } && { | ||
22118 | - test -z "$ac_c_werror_flag" || | ||
22119 | - test ! -s conftest.err | ||
22120 | - } && test -s conftest$ac_exeext && { | ||
22121 | - test "$cross_compiling" = yes || | ||
22122 | - $as_test_x conftest$ac_exeext | ||
22123 | - }; then | ||
22124 | +if ac_fn_c_try_link "$LINENO"; then : | ||
22125 | acx_pthread_ok=yes | ||
22126 | -else | ||
22127 | - $as_echo "$as_me: failed program was:" >&5 | ||
22128 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
22129 | - | ||
22130 | - | ||
22131 | fi | ||
22132 | - | ||
22133 | -rm -rf conftest.dSYM | ||
22134 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22135 | - conftest$ac_exeext conftest.$ac_ext | ||
22136 | +rm -f core conftest.err conftest.$ac_objext \ | ||
22137 | + conftest$ac_exeext conftest.$ac_ext | ||
22138 | |||
22139 | LIBS="$save_LIBS" | ||
22140 | CFLAGS="$save_CFLAGS" | ||
22141 | |||
22142 | - { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 | ||
22143 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 | ||
22144 | $as_echo "$acx_pthread_ok" >&6; } | ||
22145 | if test "x$acx_pthread_ok" = xyes; then | ||
22146 | break; | ||
22147 | @@ -26964,15 +19755,11 @@ | ||
22148 | CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
22149 | |||
22150 | # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. | ||
22151 | - { $as_echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 | ||
22152 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 | ||
22153 | $as_echo_n "checking for joinable pthread attribute... " >&6; } | ||
22154 | attr_name=unknown | ||
22155 | for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do | ||
22156 | - cat >conftest.$ac_ext <<_ACEOF | ||
22157 | -/* confdefs.h. */ | ||
22158 | -_ACEOF | ||
22159 | -cat confdefs.h >>conftest.$ac_ext | ||
22160 | -cat >>conftest.$ac_ext <<_ACEOF | ||
22161 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22162 | /* end confdefs.h. */ | ||
22163 | #include <pthread.h> | ||
22164 | #ifdef F77_DUMMY_MAIN | ||
22165 | @@ -26991,40 +19778,13 @@ | ||
22166 | return 0; | ||
22167 | } | ||
22168 | _ACEOF | ||
22169 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
22170 | -if { (ac_try="$ac_link" | ||
22171 | -case "(($ac_try" in | ||
22172 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22173 | - *) ac_try_echo=$ac_try;; | ||
22174 | -esac | ||
22175 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
22176 | -$as_echo "$ac_try_echo") >&5 | ||
22177 | - (eval "$ac_link") 2>conftest.er1 | ||
22178 | - ac_status=$? | ||
22179 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
22180 | - rm -f conftest.er1 | ||
22181 | - cat conftest.err >&5 | ||
22182 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22183 | - (exit $ac_status); } && { | ||
22184 | - test -z "$ac_c_werror_flag" || | ||
22185 | - test ! -s conftest.err | ||
22186 | - } && test -s conftest$ac_exeext && { | ||
22187 | - test "$cross_compiling" = yes || | ||
22188 | - $as_test_x conftest$ac_exeext | ||
22189 | - }; then | ||
22190 | +if ac_fn_c_try_link "$LINENO"; then : | ||
22191 | attr_name=$attr; break | ||
22192 | -else | ||
22193 | - $as_echo "$as_me: failed program was:" >&5 | ||
22194 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
22195 | - | ||
22196 | - | ||
22197 | fi | ||
22198 | - | ||
22199 | -rm -rf conftest.dSYM | ||
22200 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22201 | - conftest$ac_exeext conftest.$ac_ext | ||
22202 | +rm -f core conftest.err conftest.$ac_objext \ | ||
22203 | + conftest$ac_exeext conftest.$ac_ext | ||
22204 | done | ||
22205 | - { $as_echo "$as_me:$LINENO: result: $attr_name" >&5 | ||
22206 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 | ||
22207 | $as_echo "$attr_name" >&6; } | ||
22208 | if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then | ||
22209 | |||
22210 | @@ -27034,14 +19794,14 @@ | ||
22211 | |||
22212 | fi | ||
22213 | |||
22214 | - { $as_echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 | ||
22215 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 | ||
22216 | $as_echo_n "checking if more special flags are required for pthreads... " >&6; } | ||
22217 | flag=no | ||
22218 | case "${host_cpu}-${host_os}" in | ||
22219 | *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; | ||
22220 | *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; | ||
22221 | esac | ||
22222 | - { $as_echo "$as_me:$LINENO: result: ${flag}" >&5 | ||
22223 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 | ||
22224 | $as_echo "${flag}" >&6; } | ||
22225 | if test "x$flag" != xno; then | ||
22226 | PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" | ||
22227 | @@ -27056,9 +19816,9 @@ | ||
22228 | do | ||
22229 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
22230 | set dummy $ac_prog; ac_word=$2 | ||
22231 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
22232 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
22233 | $as_echo_n "checking for $ac_word... " >&6; } | ||
22234 | -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then | ||
22235 | +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : | ||
22236 | $as_echo_n "(cached) " >&6 | ||
22237 | else | ||
22238 | if test -n "$PTHREAD_CC"; then | ||
22239 | @@ -27069,24 +19829,24 @@ | ||
22240 | do | ||
22241 | IFS=$as_save_IFS | ||
22242 | test -z "$as_dir" && as_dir=. | ||
22243 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
22244 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
22245 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
22246 | ac_cv_prog_PTHREAD_CC="$ac_prog" | ||
22247 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
22248 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
22249 | break 2 | ||
22250 | fi | ||
22251 | done | ||
22252 | -done | ||
22253 | + done | ||
22254 | IFS=$as_save_IFS | ||
22255 | |||
22256 | fi | ||
22257 | fi | ||
22258 | PTHREAD_CC=$ac_cv_prog_PTHREAD_CC | ||
22259 | if test -n "$PTHREAD_CC"; then | ||
22260 | - { $as_echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 | ||
22261 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 | ||
22262 | $as_echo "$PTHREAD_CC" >&6; } | ||
22263 | else | ||
22264 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
22265 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22266 | $as_echo "no" >&6; } | ||
22267 | fi | ||
22268 | |||
22269 | @@ -27112,9 +19872,7 @@ | ||
22270 | CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
22271 | CC="$PTHREAD_CC" | ||
22272 | |||
22273 | -cat >>confdefs.h <<\_ACEOF | ||
22274 | -#define USING_POSIX_THREADS 1 | ||
22275 | -_ACEOF | ||
22276 | +$as_echo "#define USING_POSIX_THREADS 1" >>confdefs.h | ||
22277 | |||
22278 | : | ||
22279 | else | ||
22280 | @@ -27131,13 +19889,9 @@ | ||
22281 | fi | ||
22282 | |||
22283 | if test -z "$THREADLIBS"; then | ||
22284 | - { $as_echo "$as_me:$LINENO: checking for Win32 threads" >&5 | ||
22285 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Win32 threads" >&5 | ||
22286 | $as_echo_n "checking for Win32 threads... " >&6; } | ||
22287 | - cat >conftest.$ac_ext <<_ACEOF | ||
22288 | -/* confdefs.h. */ | ||
22289 | -_ACEOF | ||
22290 | -cat confdefs.h >>conftest.$ac_ext | ||
22291 | -cat >>conftest.$ac_ext <<_ACEOF | ||
22292 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22293 | /* end confdefs.h. */ | ||
22294 | #include <windows.h> | ||
22295 | #ifdef F77_DUMMY_MAIN | ||
22296 | @@ -27156,51 +19910,22 @@ | ||
22297 | return 0; | ||
22298 | } | ||
22299 | _ACEOF | ||
22300 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
22301 | -if { (ac_try="$ac_link" | ||
22302 | -case "(($ac_try" in | ||
22303 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22304 | - *) ac_try_echo=$ac_try;; | ||
22305 | -esac | ||
22306 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
22307 | -$as_echo "$ac_try_echo") >&5 | ||
22308 | - (eval "$ac_link") 2>conftest.er1 | ||
22309 | - ac_status=$? | ||
22310 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
22311 | - rm -f conftest.er1 | ||
22312 | - cat conftest.err >&5 | ||
22313 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22314 | - (exit $ac_status); } && { | ||
22315 | - test -z "$ac_c_werror_flag" || | ||
22316 | - test ! -s conftest.err | ||
22317 | - } && test -s conftest$ac_exeext && { | ||
22318 | - test "$cross_compiling" = yes || | ||
22319 | - $as_test_x conftest$ac_exeext | ||
22320 | - }; then | ||
22321 | - THREADLIBS=" "; { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
22322 | +if ac_fn_c_try_link "$LINENO"; then : | ||
22323 | + THREADLIBS=" "; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
22324 | $as_echo "yes" >&6; } | ||
22325 | else | ||
22326 | - $as_echo "$as_me: failed program was:" >&5 | ||
22327 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
22328 | - | ||
22329 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
22330 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22331 | $as_echo "no" >&6; } | ||
22332 | fi | ||
22333 | - | ||
22334 | -rm -rf conftest.dSYM | ||
22335 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22336 | - conftest$ac_exeext conftest.$ac_ext | ||
22337 | +rm -f core conftest.err conftest.$ac_objext \ | ||
22338 | + conftest$ac_exeext conftest.$ac_ext | ||
22339 | fi | ||
22340 | |||
22341 | if test -z "$THREADLIBS"; then | ||
22342 | - { { $as_echo "$as_me:$LINENO: error: couldn't find threads library for --enable-threads" >&5 | ||
22343 | -$as_echo "$as_me: error: couldn't find threads library for --enable-threads" >&2;} | ||
22344 | - { (exit 1); exit 1; }; } | ||
22345 | + as_fn_error $? "couldn't find threads library for --enable-threads" "$LINENO" 5 | ||
22346 | fi | ||
22347 | |||
22348 | -cat >>confdefs.h <<\_ACEOF | ||
22349 | -#define HAVE_THREADS 1 | ||
22350 | -_ACEOF | ||
22351 | +$as_echo "#define HAVE_THREADS 1" >>confdefs.h | ||
22352 | |||
22353 | fi | ||
22354 | |||
22355 | @@ -27222,49 +19947,25 @@ | ||
22356 | |||
22357 | |||
22358 | |||
22359 | -{ $as_echo "$as_me:$LINENO: checking whether a cycle counter is available" >&5 | ||
22360 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a cycle counter is available" >&5 | ||
22361 | $as_echo_n "checking whether a cycle counter is available... " >&6; } | ||
22362 | save_CPPFLAGS=$CPPFLAGS | ||
22363 | CPPFLAGS="$CPPFLAGS -I$srcdir/kernel" | ||
22364 | -cat >conftest.$ac_ext <<_ACEOF | ||
22365 | -/* confdefs.h. */ | ||
22366 | -_ACEOF | ||
22367 | -cat confdefs.h >>conftest.$ac_ext | ||
22368 | -cat >>conftest.$ac_ext <<_ACEOF | ||
22369 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22370 | /* end confdefs.h. */ | ||
22371 | #include "cycle.h" | ||
22372 | #ifndef HAVE_TICK_COUNTER | ||
22373 | # error No cycle counter | ||
22374 | #endif | ||
22375 | _ACEOF | ||
22376 | -if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
22377 | -case "(($ac_try" in | ||
22378 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22379 | - *) ac_try_echo=$ac_try;; | ||
22380 | -esac | ||
22381 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | ||
22382 | -$as_echo "$ac_try_echo") >&5 | ||
22383 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
22384 | - ac_status=$? | ||
22385 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
22386 | - rm -f conftest.er1 | ||
22387 | - cat conftest.err >&5 | ||
22388 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22389 | - (exit $ac_status); } >/dev/null && { | ||
22390 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
22391 | - test ! -s conftest.err | ||
22392 | - }; then | ||
22393 | +if ac_fn_c_try_cpp "$LINENO"; then : | ||
22394 | ok=yes | ||
22395 | else | ||
22396 | - $as_echo "$as_me: failed program was:" >&5 | ||
22397 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
22398 | - | ||
22399 | ok=no | ||
22400 | fi | ||
22401 | - | ||
22402 | -rm -f conftest.err conftest.$ac_ext | ||
22403 | +rm -f conftest.err conftest.i conftest.$ac_ext | ||
22404 | CPPFLAGS=$save_CPPFLAGS | ||
22405 | -{ $as_echo "$as_me:$LINENO: result: $ok" >&5 | ||
22406 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ok" >&5 | ||
22407 | $as_echo "$ok" >&6; } | ||
22408 | if test $ok = no && test "x$with_slow_timer" = xno; then | ||
22409 | echo "***************************************************************" | ||
22410 | @@ -27315,13 +20016,13 @@ | ||
22411 | case $ac_val in #( | ||
22412 | *${as_nl}*) | ||
22413 | case $ac_var in #( | ||
22414 | - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 | ||
22415 | + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 | ||
22416 | $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | ||
22417 | esac | ||
22418 | case $ac_var in #( | ||
22419 | _ | IFS | as_nl) ;; #( | ||
22420 | BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( | ||
22421 | - *) $as_unset $ac_var ;; | ||
22422 | + *) { eval $ac_var=; unset $ac_var;} ;; | ||
22423 | esac ;; | ||
22424 | esac | ||
22425 | done | ||
22426 | @@ -27329,8 +20030,8 @@ | ||
22427 | (set) 2>&1 | | ||
22428 | case $as_nl`(ac_space=' '; set) 2>&1` in #( | ||
22429 | *${as_nl}ac_space=\ *) | ||
22430 | - # `set' does not quote correctly, so add quotes (double-quote | ||
22431 | - # substitution turns \\\\ into \\, and sed turns \\ into \). | ||
22432 | + # `set' does not quote correctly, so add quotes: double-quote | ||
22433 | + # substitution turns \\\\ into \\, and sed turns \\ into \. | ||
22434 | sed -n \ | ||
22435 | "s/'/'\\\\''/g; | ||
22436 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
22437 | @@ -27353,11 +20054,11 @@ | ||
22438 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else | ||
22439 | if test -w "$cache_file"; then | ||
22440 | test "x$cache_file" != "x/dev/null" && | ||
22441 | - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 | ||
22442 | + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 | ||
22443 | $as_echo "$as_me: updating cache $cache_file" >&6;} | ||
22444 | cat confcache >$cache_file | ||
22445 | else | ||
22446 | - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 | ||
22447 | + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 | ||
22448 | $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} | ||
22449 | fi | ||
22450 | fi | ||
22451 | @@ -27371,98 +20072,78 @@ | ||
22452 | |||
22453 | ac_libobjs= | ||
22454 | ac_ltlibobjs= | ||
22455 | +U= | ||
22456 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | ||
22457 | # 1. Remove the extension, and $U if already installed. | ||
22458 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | ||
22459 | ac_i=`$as_echo "$ac_i" | sed "$ac_script"` | ||
22460 | # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR | ||
22461 | # will be set to the directory where LIBOBJS objects are built. | ||
22462 | - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" | ||
22463 | - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' | ||
22464 | + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" | ||
22465 | + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' | ||
22466 | done | ||
22467 | LIBOBJS=$ac_libobjs | ||
22468 | |||
22469 | LTLIBOBJS=$ac_ltlibobjs | ||
22470 | |||
22471 | |||
22472 | + if test -n "$EXEEXT"; then | ||
22473 | + am__EXEEXT_TRUE= | ||
22474 | + am__EXEEXT_FALSE='#' | ||
22475 | +else | ||
22476 | + am__EXEEXT_TRUE='#' | ||
22477 | + am__EXEEXT_FALSE= | ||
22478 | +fi | ||
22479 | + | ||
22480 | if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then | ||
22481 | - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. | ||
22482 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22483 | -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. | ||
22484 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22485 | - { (exit 1); exit 1; }; } | ||
22486 | + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. | ||
22487 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22488 | fi | ||
22489 | if test -z "${SINGLE_TRUE}" && test -z "${SINGLE_FALSE}"; then | ||
22490 | - { { $as_echo "$as_me:$LINENO: error: conditional \"SINGLE\" was never defined. | ||
22491 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22492 | -$as_echo "$as_me: error: conditional \"SINGLE\" was never defined. | ||
22493 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22494 | - { (exit 1); exit 1; }; } | ||
22495 | + as_fn_error $? "conditional \"SINGLE\" was never defined. | ||
22496 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22497 | fi | ||
22498 | if test -z "${LDOUBLE_TRUE}" && test -z "${LDOUBLE_FALSE}"; then | ||
22499 | - { { $as_echo "$as_me:$LINENO: error: conditional \"LDOUBLE\" was never defined. | ||
22500 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22501 | -$as_echo "$as_me: error: conditional \"LDOUBLE\" was never defined. | ||
22502 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22503 | - { (exit 1); exit 1; }; } | ||
22504 | + as_fn_error $? "conditional \"LDOUBLE\" was never defined. | ||
22505 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22506 | fi | ||
22507 | if test -z "${HAVE_CELL_TRUE}" && test -z "${HAVE_CELL_FALSE}"; then | ||
22508 | - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CELL\" was never defined. | ||
22509 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22510 | -$as_echo "$as_me: error: conditional \"HAVE_CELL\" was never defined. | ||
22511 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22512 | - { (exit 1); exit 1; }; } | ||
22513 | + as_fn_error $? "conditional \"HAVE_CELL\" was never defined. | ||
22514 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22515 | fi | ||
22516 | if test -z "${HAVE_SIMD_TRUE}" && test -z "${HAVE_SIMD_FALSE}"; then | ||
22517 | - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SIMD\" was never defined. | ||
22518 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22519 | -$as_echo "$as_me: error: conditional \"HAVE_SIMD\" was never defined. | ||
22520 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22521 | - { (exit 1); exit 1; }; } | ||
22522 | + as_fn_error $? "conditional \"HAVE_SIMD\" was never defined. | ||
22523 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22524 | fi | ||
22525 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then | ||
22526 | - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. | ||
22527 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22528 | -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. | ||
22529 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22530 | - { (exit 1); exit 1; }; } | ||
22531 | + as_fn_error $? "conditional \"AMDEP\" was never defined. | ||
22532 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22533 | fi | ||
22534 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then | ||
22535 | - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. | ||
22536 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22537 | -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. | ||
22538 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22539 | - { (exit 1); exit 1; }; } | ||
22540 | + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. | ||
22541 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22542 | fi | ||
22543 | if test -z "${MPI_TRUE}" && test -z "${MPI_FALSE}"; then | ||
22544 | - { { $as_echo "$as_me:$LINENO: error: conditional \"MPI\" was never defined. | ||
22545 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22546 | -$as_echo "$as_me: error: conditional \"MPI\" was never defined. | ||
22547 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22548 | - { (exit 1); exit 1; }; } | ||
22549 | + as_fn_error $? "conditional \"MPI\" was never defined. | ||
22550 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22551 | fi | ||
22552 | if test -z "${SMP_TRUE}" && test -z "${SMP_FALSE}"; then | ||
22553 | - { { $as_echo "$as_me:$LINENO: error: conditional \"SMP\" was never defined. | ||
22554 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22555 | -$as_echo "$as_me: error: conditional \"SMP\" was never defined. | ||
22556 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22557 | - { (exit 1); exit 1; }; } | ||
22558 | + as_fn_error $? "conditional \"SMP\" was never defined. | ||
22559 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22560 | fi | ||
22561 | if test -z "${COMBINED_THREADS_TRUE}" && test -z "${COMBINED_THREADS_FALSE}"; then | ||
22562 | - { { $as_echo "$as_me:$LINENO: error: conditional \"COMBINED_THREADS\" was never defined. | ||
22563 | -Usually this means the macro was only invoked conditionally." >&5 | ||
22564 | -$as_echo "$as_me: error: conditional \"COMBINED_THREADS\" was never defined. | ||
22565 | -Usually this means the macro was only invoked conditionally." >&2;} | ||
22566 | - { (exit 1); exit 1; }; } | ||
22567 | + as_fn_error $? "conditional \"COMBINED_THREADS\" was never defined. | ||
22568 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
22569 | fi | ||
22570 | |||
22571 | : ${CONFIG_STATUS=./config.status} | ||
22572 | ac_write_fail=0 | ||
22573 | ac_clean_files_save=$ac_clean_files | ||
22574 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" | ||
22575 | -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 | ||
22576 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 | ||
22577 | $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} | ||
22578 | -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
22579 | +as_write_fail=0 | ||
22580 | +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 | ||
22581 | #! $SHELL | ||
22582 | # Generated by $as_me. | ||
22583 | # Run this file to recreate the current configuration. | ||
22584 | @@ -27472,17 +20153,18 @@ | ||
22585 | debug=false | ||
22586 | ac_cs_recheck=false | ||
22587 | ac_cs_silent=false | ||
22588 | -SHELL=\${CONFIG_SHELL-$SHELL} | ||
22589 | -_ACEOF | ||
22590 | |||
22591 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
22592 | -## --------------------- ## | ||
22593 | -## M4sh Initialization. ## | ||
22594 | -## --------------------- ## | ||
22595 | +SHELL=\${CONFIG_SHELL-$SHELL} | ||
22596 | +export SHELL | ||
22597 | +_ASEOF | ||
22598 | +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 | ||
22599 | +## -------------------- ## | ||
22600 | +## M4sh Initialization. ## | ||
22601 | +## -------------------- ## | ||
22602 | |||
22603 | # Be more Bourne compatible | ||
22604 | DUALCASE=1; export DUALCASE # for MKS sh | ||
22605 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
22606 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : | ||
22607 | emulate sh | ||
22608 | NULLCMD=: | ||
22609 | # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | ||
22610 | @@ -27490,23 +20172,15 @@ | ||
22611 | alias -g '${1+"$@"}'='"$@"' | ||
22612 | setopt NO_GLOB_SUBST | ||
22613 | else | ||
22614 | - case `(set -o) 2>/dev/null` in | ||
22615 | - *posix*) set -o posix ;; | ||
22616 | + case `(set -o) 2>/dev/null` in #( | ||
22617 | + *posix*) : | ||
22618 | + set -o posix ;; #( | ||
22619 | + *) : | ||
22620 | + ;; | ||
22621 | esac | ||
22622 | - | ||
22623 | fi | ||
22624 | |||
22625 | |||
22626 | - | ||
22627 | - | ||
22628 | -# PATH needs CR | ||
22629 | -# Avoid depending upon Character Ranges. | ||
22630 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
22631 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
22632 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
22633 | -as_cr_digits='0123456789' | ||
22634 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
22635 | - | ||
22636 | as_nl=' | ||
22637 | ' | ||
22638 | export as_nl | ||
22639 | @@ -27514,7 +20188,13 @@ | ||
22640 | as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | ||
22641 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo | ||
22642 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo | ||
22643 | -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
22644 | +# Prefer a ksh shell builtin over an external printf program on Solaris, | ||
22645 | +# but without wasting forks for bash or zsh. | ||
22646 | +if test -z "$BASH_VERSION$ZSH_VERSION" \ | ||
22647 | + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
22648 | + as_echo='print -r --' | ||
22649 | + as_echo_n='print -rn --' | ||
22650 | +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
22651 | as_echo='printf %s\n' | ||
22652 | as_echo_n='printf %s' | ||
22653 | else | ||
22654 | @@ -27525,7 +20205,7 @@ | ||
22655 | as_echo_body='eval expr "X$1" : "X\\(.*\\)"' | ||
22656 | as_echo_n_body='eval | ||
22657 | arg=$1; | ||
22658 | - case $arg in | ||
22659 | + case $arg in #( | ||
22660 | *"$as_nl"*) | ||
22661 | expr "X$arg" : "X\\(.*\\)$as_nl"; | ||
22662 | arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; | ||
22663 | @@ -27548,13 +20228,6 @@ | ||
22664 | } | ||
22665 | fi | ||
22666 | |||
22667 | -# Support unset when possible. | ||
22668 | -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
22669 | - as_unset=unset | ||
22670 | -else | ||
22671 | - as_unset=false | ||
22672 | -fi | ||
22673 | - | ||
22674 | |||
22675 | # IFS | ||
22676 | # We need space, tab and new line, in precisely that order. Quoting is | ||
22677 | @@ -27564,15 +20237,15 @@ | ||
22678 | IFS=" "" $as_nl" | ||
22679 | |||
22680 | # Find who we are. Look in the path if we contain no directory separator. | ||
22681 | -case $0 in | ||
22682 | +case $0 in #(( | ||
22683 | *[\\/]* ) as_myself=$0 ;; | ||
22684 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22685 | for as_dir in $PATH | ||
22686 | do | ||
22687 | IFS=$as_save_IFS | ||
22688 | test -z "$as_dir" && as_dir=. | ||
22689 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
22690 | -done | ||
22691 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
22692 | + done | ||
22693 | IFS=$as_save_IFS | ||
22694 | |||
22695 | ;; | ||
22696 | @@ -27584,12 +20257,16 @@ | ||
22697 | fi | ||
22698 | if test ! -f "$as_myself"; then | ||
22699 | $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
22700 | - { (exit 1); exit 1; } | ||
22701 | + exit 1 | ||
22702 | fi | ||
22703 | |||
22704 | -# Work around bugs in pre-3.0 UWIN ksh. | ||
22705 | -for as_var in ENV MAIL MAILPATH | ||
22706 | -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
22707 | +# Unset variables that we do not need and which cause bugs (e.g. in | ||
22708 | +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" | ||
22709 | +# suppresses any "Segmentation fault" message there. '((' could | ||
22710 | +# trigger a bug in pdksh 5.2.14. | ||
22711 | +for as_var in BASH_ENV ENV MAIL MAILPATH | ||
22712 | +do eval test x\${$as_var+set} = xset \ | ||
22713 | + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : | ||
22714 | done | ||
22715 | PS1='$ ' | ||
22716 | PS2='> ' | ||
22717 | @@ -27601,7 +20278,89 @@ | ||
22718 | LANGUAGE=C | ||
22719 | export LANGUAGE | ||
22720 | |||
22721 | -# Required to use basename. | ||
22722 | +# CDPATH. | ||
22723 | +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
22724 | + | ||
22725 | + | ||
22726 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] | ||
22727 | +# ---------------------------------------- | ||
22728 | +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are | ||
22729 | +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the | ||
22730 | +# script with STATUS, using 1 if that was 0. | ||
22731 | +as_fn_error () | ||
22732 | +{ | ||
22733 | + as_status=$1; test $as_status -eq 0 && as_status=1 | ||
22734 | + if test "$4"; then | ||
22735 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
22736 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 | ||
22737 | + fi | ||
22738 | + $as_echo "$as_me: error: $2" >&2 | ||
22739 | + as_fn_exit $as_status | ||
22740 | +} # as_fn_error | ||
22741 | + | ||
22742 | + | ||
22743 | +# as_fn_set_status STATUS | ||
22744 | +# ----------------------- | ||
22745 | +# Set $? to STATUS, without forking. | ||
22746 | +as_fn_set_status () | ||
22747 | +{ | ||
22748 | + return $1 | ||
22749 | +} # as_fn_set_status | ||
22750 | + | ||
22751 | +# as_fn_exit STATUS | ||
22752 | +# ----------------- | ||
22753 | +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. | ||
22754 | +as_fn_exit () | ||
22755 | +{ | ||
22756 | + set +e | ||
22757 | + as_fn_set_status $1 | ||
22758 | + exit $1 | ||
22759 | +} # as_fn_exit | ||
22760 | + | ||
22761 | +# as_fn_unset VAR | ||
22762 | +# --------------- | ||
22763 | +# Portably unset VAR. | ||
22764 | +as_fn_unset () | ||
22765 | +{ | ||
22766 | + { eval $1=; unset $1;} | ||
22767 | +} | ||
22768 | +as_unset=as_fn_unset | ||
22769 | +# as_fn_append VAR VALUE | ||
22770 | +# ---------------------- | ||
22771 | +# Append the text in VALUE to the end of the definition contained in VAR. Take | ||
22772 | +# advantage of any shell optimizations that allow amortized linear growth over | ||
22773 | +# repeated appends, instead of the typical quadratic growth present in naive | ||
22774 | +# implementations. | ||
22775 | +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : | ||
22776 | + eval 'as_fn_append () | ||
22777 | + { | ||
22778 | + eval $1+=\$2 | ||
22779 | + }' | ||
22780 | +else | ||
22781 | + as_fn_append () | ||
22782 | + { | ||
22783 | + eval $1=\$$1\$2 | ||
22784 | + } | ||
22785 | +fi # as_fn_append | ||
22786 | + | ||
22787 | +# as_fn_arith ARG... | ||
22788 | +# ------------------ | ||
22789 | +# Perform arithmetic evaluation on the ARGs, and store the result in the | ||
22790 | +# global $as_val. Take advantage of shells that can avoid forks. The arguments | ||
22791 | +# must be portable across $(()) and expr. | ||
22792 | +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : | ||
22793 | + eval 'as_fn_arith () | ||
22794 | + { | ||
22795 | + as_val=$(( $* )) | ||
22796 | + }' | ||
22797 | +else | ||
22798 | + as_fn_arith () | ||
22799 | + { | ||
22800 | + as_val=`expr "$@" || test $? -eq 1` | ||
22801 | + } | ||
22802 | +fi # as_fn_arith | ||
22803 | + | ||
22804 | + | ||
22805 | if expr a : '\(a\)' >/dev/null 2>&1 && | ||
22806 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
22807 | as_expr=expr | ||
22808 | @@ -27615,8 +20374,12 @@ | ||
22809 | as_basename=false | ||
22810 | fi | ||
22811 | |||
22812 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
22813 | + as_dirname=dirname | ||
22814 | +else | ||
22815 | + as_dirname=false | ||
22816 | +fi | ||
22817 | |||
22818 | -# Name of the executable. | ||
22819 | as_me=`$as_basename -- "$0" || | ||
22820 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
22821 | X"$0" : 'X\(//\)$' \| \ | ||
22822 | @@ -27636,76 +20399,25 @@ | ||
22823 | } | ||
22824 | s/.*/./; q'` | ||
22825 | |||
22826 | -# CDPATH. | ||
22827 | -$as_unset CDPATH | ||
22828 | - | ||
22829 | - | ||
22830 | - | ||
22831 | - as_lineno_1=$LINENO | ||
22832 | - as_lineno_2=$LINENO | ||
22833 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
22834 | - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | ||
22835 | - | ||
22836 | - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
22837 | - # uniformly replaced by the line number. The first 'sed' inserts a | ||
22838 | - # line-number line after each line using $LINENO; the second 'sed' | ||
22839 | - # does the real work. The second script uses 'N' to pair each | ||
22840 | - # line-number line with the line containing $LINENO, and appends | ||
22841 | - # trailing '-' during substitution so that $LINENO is not a special | ||
22842 | - # case at line end. | ||
22843 | - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
22844 | - # scripts with optimization help from Paolo Bonzini. Blame Lee | ||
22845 | - # E. McMahon (1931-1989) for sed's syntax. :-) | ||
22846 | - sed -n ' | ||
22847 | - p | ||
22848 | - /[$]LINENO/= | ||
22849 | - ' <$as_myself | | ||
22850 | - sed ' | ||
22851 | - s/[$]LINENO.*/&-/ | ||
22852 | - t lineno | ||
22853 | - b | ||
22854 | - :lineno | ||
22855 | - N | ||
22856 | - :loop | ||
22857 | - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | ||
22858 | - t loop | ||
22859 | - s/-\n.*// | ||
22860 | - ' >$as_me.lineno && | ||
22861 | - chmod +x "$as_me.lineno" || | ||
22862 | - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
22863 | - { (exit 1); exit 1; }; } | ||
22864 | - | ||
22865 | - # Don't try to exec as it changes $[0], causing all sort of problems | ||
22866 | - # (the dirname of $[0] is not the place where we might find the | ||
22867 | - # original and so on. Autoconf is especially sensitive to this). | ||
22868 | - . "./$as_me.lineno" | ||
22869 | - # Exit status is that of the last command. | ||
22870 | - exit | ||
22871 | -} | ||
22872 | - | ||
22873 | - | ||
22874 | -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
22875 | - as_dirname=dirname | ||
22876 | -else | ||
22877 | - as_dirname=false | ||
22878 | -fi | ||
22879 | +# Avoid depending upon Character Ranges. | ||
22880 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
22881 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
22882 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
22883 | +as_cr_digits='0123456789' | ||
22884 | +as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
22885 | |||
22886 | ECHO_C= ECHO_N= ECHO_T= | ||
22887 | -case `echo -n x` in | ||
22888 | +case `echo -n x` in #((((( | ||
22889 | -n*) | ||
22890 | - case `echo 'x\c'` in | ||
22891 | + case `echo 'xy\c'` in | ||
22892 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
22893 | - *) ECHO_C='\c';; | ||
22894 | + xy) ECHO_C='\c';; | ||
22895 | + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null | ||
22896 | + ECHO_T=' ';; | ||
22897 | esac;; | ||
22898 | *) | ||
22899 | ECHO_N='-n';; | ||
22900 | esac | ||
22901 | -if expr a : '\(a\)' >/dev/null 2>&1 && | ||
22902 | - test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
22903 | - as_expr=expr | ||
22904 | -else | ||
22905 | - as_expr=false | ||
22906 | -fi | ||
22907 | |||
22908 | rm -f conf$$ conf$$.exe conf$$.file | ||
22909 | if test -d conf$$.dir; then | ||
22910 | @@ -27734,8 +20446,56 @@ | ||
22911 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | ||
22912 | rmdir conf$$.dir 2>/dev/null | ||
22913 | |||
22914 | + | ||
22915 | +# as_fn_mkdir_p | ||
22916 | +# ------------- | ||
22917 | +# Create "$as_dir" as a directory, including parents if necessary. | ||
22918 | +as_fn_mkdir_p () | ||
22919 | +{ | ||
22920 | + | ||
22921 | + case $as_dir in #( | ||
22922 | + -*) as_dir=./$as_dir;; | ||
22923 | + esac | ||
22924 | + test -d "$as_dir" || eval $as_mkdir_p || { | ||
22925 | + as_dirs= | ||
22926 | + while :; do | ||
22927 | + case $as_dir in #( | ||
22928 | + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | ||
22929 | + *) as_qdir=$as_dir;; | ||
22930 | + esac | ||
22931 | + as_dirs="'$as_qdir' $as_dirs" | ||
22932 | + as_dir=`$as_dirname -- "$as_dir" || | ||
22933 | +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22934 | + X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
22935 | + X"$as_dir" : 'X\(//\)$' \| \ | ||
22936 | + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
22937 | +$as_echo X"$as_dir" | | ||
22938 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
22939 | + s//\1/ | ||
22940 | + q | ||
22941 | + } | ||
22942 | + /^X\(\/\/\)[^/].*/{ | ||
22943 | + s//\1/ | ||
22944 | + q | ||
22945 | + } | ||
22946 | + /^X\(\/\/\)$/{ | ||
22947 | + s//\1/ | ||
22948 | + q | ||
22949 | + } | ||
22950 | + /^X\(\/\).*/{ | ||
22951 | + s//\1/ | ||
22952 | + q | ||
22953 | + } | ||
22954 | + s/.*/./; q'` | ||
22955 | + test -d "$as_dir" && break | ||
22956 | + done | ||
22957 | + test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
22958 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" | ||
22959 | + | ||
22960 | + | ||
22961 | +} # as_fn_mkdir_p | ||
22962 | if mkdir -p . 2>/dev/null; then | ||
22963 | - as_mkdir_p=: | ||
22964 | + as_mkdir_p='mkdir -p "$as_dir"' | ||
22965 | else | ||
22966 | test -d ./-p && rmdir ./-p | ||
22967 | as_mkdir_p=false | ||
22968 | @@ -27754,10 +20514,10 @@ | ||
22969 | if test -d "$1"; then | ||
22970 | test -d "$1/."; | ||
22971 | else | ||
22972 | - case $1 in | ||
22973 | + case $1 in #( | ||
22974 | -*)set "./$1";; | ||
22975 | esac; | ||
22976 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | ||
22977 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
22978 | ???[sx]*):;;*)false;;esac;fi | ||
22979 | '\'' sh | ||
22980 | ' | ||
22981 | @@ -27772,13 +20532,19 @@ | ||
22982 | |||
22983 | |||
22984 | exec 6>&1 | ||
22985 | +## ----------------------------------- ## | ||
22986 | +## Main body of $CONFIG_STATUS script. ## | ||
22987 | +## ----------------------------------- ## | ||
22988 | +_ASEOF | ||
22989 | +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 | ||
22990 | |||
22991 | -# Save the log message, to keep $[0] and so on meaningful, and to | ||
22992 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
22993 | +# Save the log message, to keep $0 and so on meaningful, and to | ||
22994 | # report actual input values of CONFIG_FILES etc. instead of their | ||
22995 | # values after options handling. | ||
22996 | ac_log=" | ||
22997 | This file was extended by fftw $as_me 3.2.2, which was | ||
22998 | -generated by GNU Autoconf 2.63. Invocation command line was | ||
22999 | +generated by GNU Autoconf 2.67. Invocation command line was | ||
23000 | |||
23001 | CONFIG_FILES = $CONFIG_FILES | ||
23002 | CONFIG_HEADERS = $CONFIG_HEADERS | ||
23003 | @@ -27810,13 +20576,15 @@ | ||
23004 | |||
23005 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
23006 | ac_cs_usage="\ | ||
23007 | -\`$as_me' instantiates files from templates according to the | ||
23008 | -current configuration. | ||
23009 | +\`$as_me' instantiates files and other configuration actions | ||
23010 | +from templates according to the current configuration. Unless the files | ||
23011 | +and actions are specified as TAGs, all are instantiated by default. | ||
23012 | |||
23013 | -Usage: $0 [OPTION]... [FILE]... | ||
23014 | +Usage: $0 [OPTION]... [TAG]... | ||
23015 | |||
23016 | -h, --help print this help, then exit | ||
23017 | -V, --version print version number and configuration settings, then exit | ||
23018 | + --config print configuration, then exit | ||
23019 | -q, --quiet, --silent | ||
23020 | do not print progress messages | ||
23021 | -d, --debug don't remove temporary files | ||
23022 | @@ -27835,16 +20603,17 @@ | ||
23023 | Configuration commands: | ||
23024 | $config_commands | ||
23025 | |||
23026 | -Report bugs to <bug-autoconf@gnu.org>." | ||
23027 | +Report bugs to <fftw@fftw.org>." | ||
23028 | |||
23029 | _ACEOF | ||
23030 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
23031 | +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | ||
23032 | ac_cs_version="\\ | ||
23033 | fftw config.status 3.2.2 | ||
23034 | -configured by $0, generated by GNU Autoconf 2.63, | ||
23035 | - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | ||
23036 | +configured by $0, generated by GNU Autoconf 2.67, | ||
23037 | + with options \\"\$ac_cs_config\\" | ||
23038 | |||
23039 | -Copyright (C) 2008 Free Software Foundation, Inc. | ||
23040 | +Copyright (C) 2010 Free Software Foundation, Inc. | ||
23041 | This config.status script is free software; the Free Software Foundation | ||
23042 | gives unlimited permission to copy, distribute and modify it." | ||
23043 | |||
23044 | @@ -27862,11 +20631,16 @@ | ||
23045 | while test $# != 0 | ||
23046 | do | ||
23047 | case $1 in | ||
23048 | - --*=*) | ||
23049 | + --*=?*) | ||
23050 | ac_option=`expr "X$1" : 'X\([^=]*\)='` | ||
23051 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` | ||
23052 | ac_shift=: | ||
23053 | ;; | ||
23054 | + --*=) | ||
23055 | + ac_option=`expr "X$1" : 'X\([^=]*\)='` | ||
23056 | + ac_optarg= | ||
23057 | + ac_shift=: | ||
23058 | + ;; | ||
23059 | *) | ||
23060 | ac_option=$1 | ||
23061 | ac_optarg=$2 | ||
23062 | @@ -27880,27 +20654,29 @@ | ||
23063 | ac_cs_recheck=: ;; | ||
23064 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | ||
23065 | $as_echo "$ac_cs_version"; exit ;; | ||
23066 | + --config | --confi | --conf | --con | --co | --c ) | ||
23067 | + $as_echo "$ac_cs_config"; exit ;; | ||
23068 | --debug | --debu | --deb | --de | --d | -d ) | ||
23069 | debug=: ;; | ||
23070 | --file | --fil | --fi | --f ) | ||
23071 | $ac_shift | ||
23072 | case $ac_optarg in | ||
23073 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
23074 | + '') as_fn_error $? "missing file argument" ;; | ||
23075 | esac | ||
23076 | - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" | ||
23077 | + as_fn_append CONFIG_FILES " '$ac_optarg'" | ||
23078 | ac_need_defaults=false;; | ||
23079 | --header | --heade | --head | --hea ) | ||
23080 | $ac_shift | ||
23081 | case $ac_optarg in | ||
23082 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
23083 | esac | ||
23084 | - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" | ||
23085 | + as_fn_append CONFIG_HEADERS " '$ac_optarg'" | ||
23086 | ac_need_defaults=false;; | ||
23087 | --he | --h) | ||
23088 | # Conflict between --help and --header | ||
23089 | - { $as_echo "$as_me: error: ambiguous option: $1 | ||
23090 | -Try \`$0 --help' for more information." >&2 | ||
23091 | - { (exit 1); exit 1; }; };; | ||
23092 | + as_fn_error $? "ambiguous option: \`$1' | ||
23093 | +Try \`$0 --help' for more information.";; | ||
23094 | --help | --hel | -h ) | ||
23095 | $as_echo "$ac_cs_usage"; exit ;; | ||
23096 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
23097 | @@ -27908,11 +20684,10 @@ | ||
23098 | ac_cs_silent=: ;; | ||
23099 | |||
23100 | # This is an error. | ||
23101 | - -*) { $as_echo "$as_me: error: unrecognized option: $1 | ||
23102 | -Try \`$0 --help' for more information." >&2 | ||
23103 | - { (exit 1); exit 1; }; } ;; | ||
23104 | + -*) as_fn_error $? "unrecognized option: \`$1' | ||
23105 | +Try \`$0 --help' for more information." ;; | ||
23106 | |||
23107 | - *) ac_config_targets="$ac_config_targets $1" | ||
23108 | + *) as_fn_append ac_config_targets " $1" | ||
23109 | ac_need_defaults=false ;; | ||
23110 | |||
23111 | esac | ||
23112 | @@ -28327,9 +21102,7 @@ | ||
23113 | "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; | ||
23114 | "fftw.pc") CONFIG_FILES="$CONFIG_FILES fftw.pc" ;; | ||
23115 | |||
23116 | - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | ||
23117 | -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | ||
23118 | - { (exit 1); exit 1; }; };; | ||
23119 | + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; | ||
23120 | esac | ||
23121 | done | ||
23122 | |||
23123 | @@ -28356,7 +21129,7 @@ | ||
23124 | trap 'exit_status=$? | ||
23125 | { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status | ||
23126 | ' 0 | ||
23127 | - trap '{ (exit 1); exit 1; }' 1 2 13 15 | ||
23128 | + trap 'as_fn_exit 1' 1 2 13 15 | ||
23129 | } | ||
23130 | # Create a (secure) tmp directory for tmp files. | ||
23131 | |||
23132 | @@ -28367,11 +21140,7 @@ | ||
23133 | { | ||
23134 | tmp=./conf$$-$RANDOM | ||
23135 | (umask 077 && mkdir "$tmp") | ||
23136 | -} || | ||
23137 | -{ | ||
23138 | - $as_echo "$as_me: cannot create a temporary directory in ." >&2 | ||
23139 | - { (exit 1); exit 1; } | ||
23140 | -} | ||
23141 | +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 | ||
23142 | |||
23143 | # Set up the scripts for CONFIG_FILES section. | ||
23144 | # No need to generate them if there are no CONFIG_FILES. | ||
23145 | @@ -28379,7 +21148,13 @@ | ||
23146 | if test -n "$CONFIG_FILES"; then | ||
23147 | |||
23148 | |||
23149 | -ac_cr=' ' | ||
23150 | +ac_cr=`echo X | tr X '\015'` | ||
23151 | +# On cygwin, bash can eat \r inside `` if the user requested igncr. | ||
23152 | +# But we know of no other shell where ac_cr would be empty at this | ||
23153 | +# point, so we can use a bashism as a fallback. | ||
23154 | +if test "x$ac_cr" = x; then | ||
23155 | + eval ac_cr=\$\'\\r\' | ||
23156 | +fi | ||
23157 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` | ||
23158 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then | ||
23159 | ac_cs_awk_cr='\\r' | ||
23160 | @@ -28396,24 +21171,18 @@ | ||
23161 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && | ||
23162 | echo "_ACEOF" | ||
23163 | } >conf$$subs.sh || | ||
23164 | - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
23165 | -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
23166 | - { (exit 1); exit 1; }; } | ||
23167 | -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` | ||
23168 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 | ||
23169 | +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` | ||
23170 | ac_delim='%!_!# ' | ||
23171 | for ac_last_try in false false false false false :; do | ||
23172 | . ./conf$$subs.sh || | ||
23173 | - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
23174 | -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
23175 | - { (exit 1); exit 1; }; } | ||
23176 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 | ||
23177 | |||
23178 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` | ||
23179 | if test $ac_delim_n = $ac_delim_num; then | ||
23180 | break | ||
23181 | elif $ac_last_try; then | ||
23182 | - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
23183 | -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
23184 | - { (exit 1); exit 1; }; } | ||
23185 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 | ||
23186 | else | ||
23187 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
23188 | fi | ||
23189 | @@ -28435,7 +21204,7 @@ | ||
23190 | t delim | ||
23191 | :nl | ||
23192 | h | ||
23193 | -s/\(.\{148\}\).*/\1/ | ||
23194 | +s/\(.\{148\}\)..*/\1/ | ||
23195 | t more1 | ||
23196 | s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ | ||
23197 | p | ||
23198 | @@ -28449,7 +21218,7 @@ | ||
23199 | t nl | ||
23200 | :delim | ||
23201 | h | ||
23202 | -s/\(.\{148\}\).*/\1/ | ||
23203 | +s/\(.\{148\}\)..*/\1/ | ||
23204 | t more2 | ||
23205 | s/["\\]/\\&/g; s/^/"/; s/$/"/ | ||
23206 | p | ||
23207 | @@ -28502,22 +21271,28 @@ | ||
23208 | else | ||
23209 | cat | ||
23210 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ | ||
23211 | - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 | ||
23212 | -$as_echo "$as_me: error: could not setup config files machinery" >&2;} | ||
23213 | - { (exit 1); exit 1; }; } | ||
23214 | + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 | ||
23215 | _ACEOF | ||
23216 | |||
23217 | -# VPATH may cause trouble with some makes, so we remove $(srcdir), | ||
23218 | -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | ||
23219 | +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), | ||
23220 | +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and | ||
23221 | # trailing colons and then remove the whole line if VPATH becomes empty | ||
23222 | # (actually we leave an empty line to preserve line numbers). | ||
23223 | if test "x$srcdir" = x.; then | ||
23224 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
23225 | -s/:*\$(srcdir):*/:/ | ||
23226 | -s/:*\${srcdir}:*/:/ | ||
23227 | -s/:*@srcdir@:*/:/ | ||
23228 | -s/^\([^=]*=[ ]*\):*/\1/ | ||
23229 | + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ | ||
23230 | +h | ||
23231 | +s/// | ||
23232 | +s/^/:/ | ||
23233 | +s/[ ]*$/:/ | ||
23234 | +s/:\$(srcdir):/:/g | ||
23235 | +s/:\${srcdir}:/:/g | ||
23236 | +s/:@srcdir@:/:/g | ||
23237 | +s/^:*// | ||
23238 | s/:*$// | ||
23239 | +x | ||
23240 | +s/\(=[ ]*\).*/\1/ | ||
23241 | +G | ||
23242 | +s/\n// | ||
23243 | s/^[^=]*=[ ]*$// | ||
23244 | }' | ||
23245 | fi | ||
23246 | @@ -28545,9 +21320,7 @@ | ||
23247 | if test -z "$ac_t"; then | ||
23248 | break | ||
23249 | elif $ac_last_try; then | ||
23250 | - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 | ||
23251 | -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} | ||
23252 | - { (exit 1); exit 1; }; } | ||
23253 | + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 | ||
23254 | else | ||
23255 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
23256 | fi | ||
23257 | @@ -28632,9 +21405,7 @@ | ||
23258 | _ACAWK | ||
23259 | _ACEOF | ||
23260 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
23261 | - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 | ||
23262 | -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} | ||
23263 | - { (exit 1); exit 1; }; } | ||
23264 | + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 | ||
23265 | fi # test -n "$CONFIG_HEADERS" | ||
23266 | |||
23267 | |||
23268 | @@ -28647,9 +21418,7 @@ | ||
23269 | esac | ||
23270 | case $ac_mode$ac_tag in | ||
23271 | :[FHL]*:*);; | ||
23272 | - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 | ||
23273 | -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} | ||
23274 | - { (exit 1); exit 1; }; };; | ||
23275 | + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; | ||
23276 | :[FH]-) ac_tag=-:-;; | ||
23277 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | ||
23278 | esac | ||
23279 | @@ -28677,12 +21446,10 @@ | ||
23280 | [\\/$]*) false;; | ||
23281 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | ||
23282 | esac || | ||
23283 | - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 | ||
23284 | -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} | ||
23285 | - { (exit 1); exit 1; }; };; | ||
23286 | + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; | ||
23287 | esac | ||
23288 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac | ||
23289 | - ac_file_inputs="$ac_file_inputs '$ac_f'" | ||
23290 | + as_fn_append ac_file_inputs " '$ac_f'" | ||
23291 | done | ||
23292 | |||
23293 | # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
23294 | @@ -28693,7 +21460,7 @@ | ||
23295 | `' by configure.' | ||
23296 | if test x"$ac_file" != x-; then | ||
23297 | configure_input="$ac_file. $configure_input" | ||
23298 | - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
23299 | + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 | ||
23300 | $as_echo "$as_me: creating $ac_file" >&6;} | ||
23301 | fi | ||
23302 | # Neutralize special characters interpreted by sed in replacement strings. | ||
23303 | @@ -28706,9 +21473,7 @@ | ||
23304 | |||
23305 | case $ac_tag in | ||
23306 | *:-:* | *:-) cat >"$tmp/stdin" \ | ||
23307 | - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | ||
23308 | -$as_echo "$as_me: error: could not create $ac_file" >&2;} | ||
23309 | - { (exit 1); exit 1; }; } ;; | ||
23310 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; | ||
23311 | esac | ||
23312 | ;; | ||
23313 | esac | ||
23314 | @@ -28736,47 +21501,7 @@ | ||
23315 | q | ||
23316 | } | ||
23317 | s/.*/./; q'` | ||
23318 | - { as_dir="$ac_dir" | ||
23319 | - case $as_dir in #( | ||
23320 | - -*) as_dir=./$as_dir;; | ||
23321 | - esac | ||
23322 | - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
23323 | - as_dirs= | ||
23324 | - while :; do | ||
23325 | - case $as_dir in #( | ||
23326 | - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | ||
23327 | - *) as_qdir=$as_dir;; | ||
23328 | - esac | ||
23329 | - as_dirs="'$as_qdir' $as_dirs" | ||
23330 | - as_dir=`$as_dirname -- "$as_dir" || | ||
23331 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23332 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
23333 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
23334 | - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
23335 | -$as_echo X"$as_dir" | | ||
23336 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
23337 | - s//\1/ | ||
23338 | - q | ||
23339 | - } | ||
23340 | - /^X\(\/\/\)[^/].*/{ | ||
23341 | - s//\1/ | ||
23342 | - q | ||
23343 | - } | ||
23344 | - /^X\(\/\/\)$/{ | ||
23345 | - s//\1/ | ||
23346 | - q | ||
23347 | - } | ||
23348 | - /^X\(\/\).*/{ | ||
23349 | - s//\1/ | ||
23350 | - q | ||
23351 | - } | ||
23352 | - s/.*/./; q'` | ||
23353 | - test -d "$as_dir" && break | ||
23354 | - done | ||
23355 | - test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
23356 | - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | ||
23357 | -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} | ||
23358 | - { (exit 1); exit 1; }; }; } | ||
23359 | + as_dir="$ac_dir"; as_fn_mkdir_p | ||
23360 | ac_builddir=. | ||
23361 | |||
23362 | case "$ac_dir" in | ||
23363 | @@ -28833,7 +21558,6 @@ | ||
23364 | # If the template does not know about datarootdir, expand it. | ||
23365 | # FIXME: This hack should be removed a few years after 2.60. | ||
23366 | ac_datarootdir_hack=; ac_datarootdir_seen= | ||
23367 | - | ||
23368 | ac_sed_dataroot=' | ||
23369 | /datarootdir/ { | ||
23370 | p | ||
23371 | @@ -28843,12 +21567,11 @@ | ||
23372 | /@docdir@/p | ||
23373 | /@infodir@/p | ||
23374 | /@localedir@/p | ||
23375 | -/@mandir@/p | ||
23376 | -' | ||
23377 | +/@mandir@/p' | ||
23378 | case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in | ||
23379 | *datarootdir*) ac_datarootdir_seen=yes;; | ||
23380 | *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) | ||
23381 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | ||
23382 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | ||
23383 | $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | ||
23384 | _ACEOF | ||
23385 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
23386 | @@ -28858,7 +21581,7 @@ | ||
23387 | s&@infodir@&$infodir&g | ||
23388 | s&@localedir@&$localedir&g | ||
23389 | s&@mandir@&$mandir&g | ||
23390 | - s&\\\${datarootdir}&$datarootdir&g' ;; | ||
23391 | + s&\\\${datarootdir}&$datarootdir&g' ;; | ||
23392 | esac | ||
23393 | _ACEOF | ||
23394 | |||
23395 | @@ -28887,26 +21610,22 @@ | ||
23396 | $ac_datarootdir_hack | ||
23397 | " | ||
23398 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ | ||
23399 | - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | ||
23400 | -$as_echo "$as_me: error: could not create $ac_file" >&2;} | ||
23401 | - { (exit 1); exit 1; }; } | ||
23402 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
23403 | |||
23404 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | ||
23405 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | ||
23406 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | ||
23407 | - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
23408 | -which seems to be undefined. Please make sure it is defined." >&5 | ||
23409 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
23410 | +which seems to be undefined. Please make sure it is defined" >&5 | ||
23411 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
23412 | -which seems to be undefined. Please make sure it is defined." >&2;} | ||
23413 | +which seems to be undefined. Please make sure it is defined" >&2;} | ||
23414 | |||
23415 | rm -f "$tmp/stdin" | ||
23416 | case $ac_file in | ||
23417 | -) cat "$tmp/out" && rm -f "$tmp/out";; | ||
23418 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; | ||
23419 | esac \ | ||
23420 | - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | ||
23421 | -$as_echo "$as_me: error: could not create $ac_file" >&2;} | ||
23422 | - { (exit 1); exit 1; }; } | ||
23423 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
23424 | ;; | ||
23425 | :H) | ||
23426 | # | ||
23427 | @@ -28917,25 +21636,19 @@ | ||
23428 | $as_echo "/* $configure_input */" \ | ||
23429 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" | ||
23430 | } >"$tmp/config.h" \ | ||
23431 | - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | ||
23432 | -$as_echo "$as_me: error: could not create $ac_file" >&2;} | ||
23433 | - { (exit 1); exit 1; }; } | ||
23434 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
23435 | if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then | ||
23436 | - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 | ||
23437 | + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 | ||
23438 | $as_echo "$as_me: $ac_file is unchanged" >&6;} | ||
23439 | else | ||
23440 | rm -f "$ac_file" | ||
23441 | mv "$tmp/config.h" "$ac_file" \ | ||
23442 | - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | ||
23443 | -$as_echo "$as_me: error: could not create $ac_file" >&2;} | ||
23444 | - { (exit 1); exit 1; }; } | ||
23445 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
23446 | fi | ||
23447 | else | ||
23448 | $as_echo "/* $configure_input */" \ | ||
23449 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ | ||
23450 | - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 | ||
23451 | -$as_echo "$as_me: error: could not create -" >&2;} | ||
23452 | - { (exit 1); exit 1; }; } | ||
23453 | + || as_fn_error $? "could not create -" "$LINENO" 5 | ||
23454 | fi | ||
23455 | # Compute "$ac_file"'s index in $config_headers. | ||
23456 | _am_arg="$ac_file" | ||
23457 | @@ -28973,34 +21686,35 @@ | ||
23458 | s/.*/./; q'`/stamp-h$_am_stamp_count | ||
23459 | ;; | ||
23460 | |||
23461 | - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 | ||
23462 | + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 | ||
23463 | $as_echo "$as_me: executing $ac_file commands" >&6;} | ||
23464 | ;; | ||
23465 | esac | ||
23466 | |||
23467 | |||
23468 | case $ac_file$ac_mode in | ||
23469 | - "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
23470 | -# are listed without --file. Let's play safe and only enable the eval | ||
23471 | -# if we detect the quoting. | ||
23472 | -case $CONFIG_FILES in | ||
23473 | -*\'*) eval set x "$CONFIG_FILES" ;; | ||
23474 | -*) set x $CONFIG_FILES ;; | ||
23475 | -esac | ||
23476 | -shift | ||
23477 | -for mf | ||
23478 | -do | ||
23479 | - # Strip MF so we end up with the name of the file. | ||
23480 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
23481 | - # Check whether this is an Automake generated Makefile or not. | ||
23482 | - # We used to match only the files named `Makefile.in', but | ||
23483 | - # some people rename them; so instead we look at the file content. | ||
23484 | - # Grep'ing the first line is not enough: some people post-process | ||
23485 | - # each Makefile.in and add a new line on top of each file to say so. | ||
23486 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
23487 | - # limit of 2048, but all sed's we know have understand at least 4000. | ||
23488 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
23489 | - dirpart=`$as_dirname -- "$mf" || | ||
23490 | + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { | ||
23491 | + # Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
23492 | + # are listed without --file. Let's play safe and only enable the eval | ||
23493 | + # if we detect the quoting. | ||
23494 | + case $CONFIG_FILES in | ||
23495 | + *\'*) eval set x "$CONFIG_FILES" ;; | ||
23496 | + *) set x $CONFIG_FILES ;; | ||
23497 | + esac | ||
23498 | + shift | ||
23499 | + for mf | ||
23500 | + do | ||
23501 | + # Strip MF so we end up with the name of the file. | ||
23502 | + mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
23503 | + # Check whether this is an Automake generated Makefile or not. | ||
23504 | + # We used to match only the files named `Makefile.in', but | ||
23505 | + # some people rename them; so instead we look at the file content. | ||
23506 | + # Grep'ing the first line is not enough: some people post-process | ||
23507 | + # each Makefile.in and add a new line on top of each file to say so. | ||
23508 | + # Grep'ing the whole file is not good either: AIX grep has a line | ||
23509 | + # limit of 2048, but all sed's we know have understand at least 4000. | ||
23510 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
23511 | + dirpart=`$as_dirname -- "$mf" || | ||
23512 | $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23513 | X"$mf" : 'X\(//\)[^/]' \| \ | ||
23514 | X"$mf" : 'X\(//\)$' \| \ | ||
23515 | @@ -29023,28 +21737,28 @@ | ||
23516 | q | ||
23517 | } | ||
23518 | s/.*/./; q'` | ||
23519 | - else | ||
23520 | - continue | ||
23521 | - fi | ||
23522 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
23523 | - # from the Makefile without running `make'. | ||
23524 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
23525 | - test -z "$DEPDIR" && continue | ||
23526 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
23527 | - test -z "am__include" && continue | ||
23528 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
23529 | - # When using ansi2knr, U may be empty or an underscore; expand it | ||
23530 | - U=`sed -n 's/^U = //p' < "$mf"` | ||
23531 | - # Find all dependency output files, they are included files with | ||
23532 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
23533 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
23534 | - # expansion. | ||
23535 | - for file in `sed -n " | ||
23536 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
23537 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
23538 | - # Make sure the directory exists. | ||
23539 | - test -f "$dirpart/$file" && continue | ||
23540 | - fdir=`$as_dirname -- "$file" || | ||
23541 | + else | ||
23542 | + continue | ||
23543 | + fi | ||
23544 | + # Extract the definition of DEPDIR, am__include, and am__quote | ||
23545 | + # from the Makefile without running `make'. | ||
23546 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
23547 | + test -z "$DEPDIR" && continue | ||
23548 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
23549 | + test -z "am__include" && continue | ||
23550 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
23551 | + # When using ansi2knr, U may be empty or an underscore; expand it | ||
23552 | + U=`sed -n 's/^U = //p' < "$mf"` | ||
23553 | + # Find all dependency output files, they are included files with | ||
23554 | + # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
23555 | + # simplest approach to changing $(DEPDIR) to its actual value in the | ||
23556 | + # expansion. | ||
23557 | + for file in `sed -n " | ||
23558 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
23559 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
23560 | + # Make sure the directory exists. | ||
23561 | + test -f "$dirpart/$file" && continue | ||
23562 | + fdir=`$as_dirname -- "$file" || | ||
23563 | $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23564 | X"$file" : 'X\(//\)[^/]' \| \ | ||
23565 | X"$file" : 'X\(//\)$' \| \ | ||
23566 | @@ -29067,51 +21781,12 @@ | ||
23567 | q | ||
23568 | } | ||
23569 | s/.*/./; q'` | ||
23570 | - { as_dir=$dirpart/$fdir | ||
23571 | - case $as_dir in #( | ||
23572 | - -*) as_dir=./$as_dir;; | ||
23573 | - esac | ||
23574 | - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
23575 | - as_dirs= | ||
23576 | - while :; do | ||
23577 | - case $as_dir in #( | ||
23578 | - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | ||
23579 | - *) as_qdir=$as_dir;; | ||
23580 | - esac | ||
23581 | - as_dirs="'$as_qdir' $as_dirs" | ||
23582 | - as_dir=`$as_dirname -- "$as_dir" || | ||
23583 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23584 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
23585 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
23586 | - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
23587 | -$as_echo X"$as_dir" | | ||
23588 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
23589 | - s//\1/ | ||
23590 | - q | ||
23591 | - } | ||
23592 | - /^X\(\/\/\)[^/].*/{ | ||
23593 | - s//\1/ | ||
23594 | - q | ||
23595 | - } | ||
23596 | - /^X\(\/\/\)$/{ | ||
23597 | - s//\1/ | ||
23598 | - q | ||
23599 | - } | ||
23600 | - /^X\(\/\).*/{ | ||
23601 | - s//\1/ | ||
23602 | - q | ||
23603 | - } | ||
23604 | - s/.*/./; q'` | ||
23605 | - test -d "$as_dir" && break | ||
23606 | + as_dir=$dirpart/$fdir; as_fn_mkdir_p | ||
23607 | + # echo "creating $dirpart/$file" | ||
23608 | + echo '# dummy' > "$dirpart/$file" | ||
23609 | done | ||
23610 | - test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
23611 | - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | ||
23612 | -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} | ||
23613 | - { (exit 1); exit 1; }; }; } | ||
23614 | - # echo "creating $dirpart/$file" | ||
23615 | - echo '# dummy' > "$dirpart/$file" | ||
23616 | done | ||
23617 | -done | ||
23618 | +} | ||
23619 | ;; | ||
23620 | "libtool":C) | ||
23621 | |||
23622 | @@ -29898,15 +22573,12 @@ | ||
23623 | done # for ac_tag | ||
23624 | |||
23625 | |||
23626 | -{ (exit 0); exit 0; } | ||
23627 | +as_fn_exit 0 | ||
23628 | _ACEOF | ||
23629 | -chmod +x $CONFIG_STATUS | ||
23630 | ac_clean_files=$ac_clean_files_save | ||
23631 | |||
23632 | test $ac_write_fail = 0 || | ||
23633 | - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 | ||
23634 | -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} | ||
23635 | - { (exit 1); exit 1; }; } | ||
23636 | + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 | ||
23637 | |||
23638 | |||
23639 | # configure is writing to config.log, and then calls config.status. | ||
23640 | @@ -29927,10 +22599,10 @@ | ||
23641 | exec 5>>config.log | ||
23642 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which | ||
23643 | # would make configure fail if this is the last instruction. | ||
23644 | - $ac_cs_success || { (exit 1); exit 1; } | ||
23645 | + $ac_cs_success || as_fn_exit 1 | ||
23646 | fi | ||
23647 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | ||
23648 | - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | ||
23649 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | ||
23650 | $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} | ||
23651 | fi | ||
23652 | |||
23653 | diff -Nurd fftw-3.2.2/configure.ac fftw-3.2.2-arm-beta1/configure.ac | ||
23654 | --- fftw-3.2.2/configure.ac 2009-07-12 12:35:49.000000000 +0200 | ||
23655 | +++ fftw-3.2.2-arm-beta1/configure.ac 2011-03-26 22:32:35.000000000 +0100 | ||
23656 | @@ -97,6 +97,12 @@ | ||
23657 | have_simd="yes" | ||
23658 | fi | ||
23659 | |||
23660 | +AC_ARG_ENABLE(neon, [AC_HELP_STRING([--enable-neon],[enable NEON optimizations])], have_neon=$enableval, have_neon=no) | ||
23661 | +if test "$have_neon" = "yes"; then | ||
23662 | + AC_DEFINE(HAVE_NEON,1,[Define to enable NEON optimizations.]) | ||
23663 | + have_simd="yes" | ||
23664 | +fi | ||
23665 | + | ||
23666 | AC_ARG_ENABLE(mips-ps, [AC_HELP_STRING([--enable-mips-ps],[enable MIPS pair-single optimizations])], have_mips_ps=$enableval, have_mips_ps=no) | ||
23667 | if test "$have_mips_ps" = "yes"; then | ||
23668 | AC_DEFINE(HAVE_MIPS_PS,1,[Define to enable MIPS paired-single optimizations.]) | ||
23669 | @@ -128,6 +134,16 @@ | ||
23670 | AC_DEFINE(HAVE_MIPS_ZBUS_TIMER,1,[Define to enable use of MIPS ZBus cycle-counter.]) | ||
23671 | fi | ||
23672 | |||
23673 | +AC_ARG_ENABLE(armv7a-cycle-counter, [AC_HELP_STRING([--enable-armv7a-cycle-counter],[use ARM cycle counter])], have_arm_cycle_counter=$enableval, have_arm_cycle_counter=no) | ||
23674 | +if test "$have_arm_cycle_counter" = "yes"; then | ||
23675 | + AC_DEFINE(HAVE_ARM_CYCLE_COUNTER,1,[Define to enable use of the ARM v7a cycle counter.]) | ||
23676 | +fi | ||
23677 | + | ||
23678 | +AC_ARG_ENABLE(perf-events, [AC_HELP_STRING([--enable-perf-events],[use the Linux perf events system for cycle counting])], have_perf_events=$enableval, have_perf_events=no) | ||
23679 | +if test "$have_perf_events" = "yes"; then | ||
23680 | + AC_DEFINE(HAVE_PERF_EVENTS,1,[Define to enable use of the Linux perf events system for cycle counting.]) | ||
23681 | +fi | ||
23682 | + | ||
23683 | AC_ARG_WITH(our-malloc16, [AC_HELP_STRING([--with-our-malloc16],[use our 16-byte aligned malloc (helpful for Win32)])], with_our_malloc16=$withval, with_our_malloc16=no) | ||
23684 | if test "$with_our_malloc16" = "yes"; then | ||
23685 | AC_DEFINE(WITH_OUR_MALLOC16,1,[Use our own 16-byte aligned malloc routine; mainly helpful for Windows systems lacking aligned allocation system-library routines.]) | ||
23686 | @@ -185,6 +201,29 @@ | ||
23687 | |||
23688 | # some additional FFTW-specific tweaks to the flags | ||
23689 | if test "$ac_test_CFLAGS" != "set"; then # if user didn't override CFLAGS | ||
23690 | + | ||
23691 | + if test "$have_neon" = "yes"; then | ||
23692 | + | ||
23693 | + case "${ax_cv_c_compiler_vendor}" in | ||
23694 | + gnu) | ||
23695 | + if test "x$ARM_CPU_TYPE" = x; then | ||
23696 | + AX_CHECK_COMPILER_FLAGS(-march=armv7 -mfpu=neon, [CFLAGS="$CFLAGS -march=armv7 -mfpu=neon"], | ||
23697 | + [AC_MSG_ERROR([Need a compiler with support for -march=armv7 -mfpu=neon])]) | ||
23698 | + else | ||
23699 | + AX_CHECK_COMPILER_FLAGS(-mcpu=$ARM_CPU_TYPE -mfpu=neon, | ||
23700 | + [CFLAGS="$CFLAGS -mcpu=$ARM_CPU_TYPE -mfpu=neon"], | ||
23701 | + [AC_MSG_ERROR([Need a compiler with support for -mcpu=$ARM_CPU_TYPE -mfpu=neon])]) | ||
23702 | + fi | ||
23703 | + if test "x$ARM_FLOAT_ABI" != x; then | ||
23704 | + AX_CHECK_COMPILER_FLAGS(-mfloat-abi=$ARM_FLOAT_ABI, | ||
23705 | + [CFLAGS="$CFLAGS -mfloat-abi=$ARM_FLOAT_ABI"], | ||
23706 | + [AC_MSG_ERROR([Need a compiler with support for -mfloat-abi=$ARM_FLOAT_ABI])]) | ||
23707 | + fi | ||
23708 | + ;; | ||
23709 | + esac | ||
23710 | + | ||
23711 | + fi | ||
23712 | + | ||
23713 | if test "x$CODELET_OPTIM" = x; then | ||
23714 | |||
23715 | case "${ax_cv_c_compiler_vendor}" in | ||
23716 | @@ -277,21 +316,27 @@ | ||
23717 | |||
23718 | dnl Checks for header files. | ||
23719 | AC_HEADER_STDC | ||
23720 | -AC_CHECK_HEADERS([libintl.h malloc.h stddef.h stdlib.h string.h strings.h sys/time.h unistd.h limits.h c_asm.h intrinsics.h stdint.h mach/mach_time.h sys/sysctl.h xmmintrin.h]) | ||
23721 | +AC_CHECK_HEADERS([libintl.h malloc.h stddef.h stdlib.h string.h strings.h sys/time.h unistd.h limits.h c_asm.h intrinsics.h stdint.h mach/mach_time.h sys/sysctl.h xmmintrin.h sys/syscall.h linux/perf_event.h]) | ||
23722 | dnl c_asm.h: Header file for enabling asm() on Digital Unix | ||
23723 | dnl intrinsics.h: cray unicos | ||
23724 | dnl sys/sysctl.h: MacOS X altivec detection | ||
23725 | |||
23726 | -dnl altivec.h requires the simd cflags | ||
23727 | +dnl altivec.h and arm_neon.h require the simd cflags | ||
23728 | save_CFLAGS="$CFLAGS" | ||
23729 | save_CPPFLAGS="$CPPFLAGS" | ||
23730 | CFLAGS="$CFLAGS $SIMD_CFLAGS" | ||
23731 | CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS" | ||
23732 | AC_CHECK_HEADERS([altivec.h]) | ||
23733 | +AC_CHECK_HEADERS([arm_neon.h]) | ||
23734 | CFLAGS="$save_CFLAGS" | ||
23735 | CPPFLAGS="$save_CPPFLAGS" | ||
23736 | |||
23737 | |||
23738 | +if test "$have_neon" = "yes"; then | ||
23739 | + AC_C_BIGENDIAN(AC_MSG_ERROR([this NEON implementation does not support big-endian (ARMEB/ARMv7b) systems.]),, | ||
23740 | + AC_MSG_WARN([cannot determine endianness -- NEON support requires little-endian.]), | ||
23741 | + AC_MSG_WARN([detected universal endianness -- NEON support requires little-endian.])) | ||
23742 | +fi | ||
23743 | |||
23744 | dnl Checks for typedefs, structures, and compiler characteristics. | ||
23745 | AC_C_CONST | ||
23746 | diff -Nurd fftw-3.2.2/dft/Makefile.in fftw-3.2.2-arm-beta1/dft/Makefile.in | ||
23747 | --- fftw-3.2.2/dft/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
23748 | +++ fftw-3.2.2-arm-beta1/dft/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
23749 | @@ -1,8 +1,9 @@ | ||
23750 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
23751 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
23752 | # @configure_input@ | ||
23753 | |||
23754 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
23755 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
23756 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
23757 | +# Inc. | ||
23758 | # This Makefile.in is free software; the Free Software Foundation | ||
23759 | # gives unlimited permission to copy and/or distribute it, | ||
23760 | # with or without modifications, as long as this notice is preserved. | ||
23761 | @@ -16,8 +17,9 @@ | ||
23762 | |||
23763 | VPATH = @srcdir@ | ||
23764 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
23765 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
23766 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
23767 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
23768 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
23769 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
23770 | install_sh_DATA = $(install_sh) -c -m 644 | ||
23771 | install_sh_PROGRAM = $(install_sh) -c | ||
23772 | @@ -53,6 +55,7 @@ | ||
23773 | mkinstalldirs = $(install_sh) -d | ||
23774 | CONFIG_HEADER = $(top_builddir)/config.h | ||
23775 | CONFIG_CLEAN_FILES = | ||
23776 | +CONFIG_CLEAN_VPATH_FILES = | ||
23777 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
23778 | libdft_la_LIBADD = | ||
23779 | am_libdft_la_OBJECTS = bluestein.lo buffered.lo conf.lo ct.lo \ | ||
23780 | @@ -65,6 +68,7 @@ | ||
23781 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
23782 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
23783 | am__depfiles_maybe = depfiles | ||
23784 | +am__mv = mv -f | ||
23785 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
23786 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
23787 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
23788 | @@ -85,10 +89,38 @@ | ||
23789 | ps-recursive uninstall-recursive | ||
23790 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
23791 | distclean-recursive maintainer-clean-recursive | ||
23792 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
23793 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
23794 | + distdir | ||
23795 | ETAGS = etags | ||
23796 | CTAGS = ctags | ||
23797 | DIST_SUBDIRS = $(SUBDIRS) | ||
23798 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
23799 | +am__relativize = \ | ||
23800 | + dir0=`pwd`; \ | ||
23801 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
23802 | + sed_rest='s,^[^/]*/*,,'; \ | ||
23803 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
23804 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
23805 | + while test -n "$$dir1"; do \ | ||
23806 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
23807 | + if test "$$first" != "."; then \ | ||
23808 | + if test "$$first" = ".."; then \ | ||
23809 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
23810 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
23811 | + else \ | ||
23812 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
23813 | + if test "$$first2" = "$$first"; then \ | ||
23814 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
23815 | + else \ | ||
23816 | + dir2="../$$dir2"; \ | ||
23817 | + fi; \ | ||
23818 | + dir0="$$dir0"/"$$first"; \ | ||
23819 | + fi; \ | ||
23820 | + fi; \ | ||
23821 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
23822 | + done; \ | ||
23823 | + reldir="$$dir2" | ||
23824 | ACLOCAL = @ACLOCAL@ | ||
23825 | ALLOCA = @ALLOCA@ | ||
23826 | AMTAR = @AMTAR@ | ||
23827 | @@ -159,6 +191,7 @@ | ||
23828 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
23829 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
23830 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
23831 | +PACKAGE_URL = @PACKAGE_URL@ | ||
23832 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
23833 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
23834 | POW_LIB = @POW_LIB@ | ||
23835 | @@ -259,9 +292,9 @@ | ||
23836 | exit 1;; \ | ||
23837 | esac; \ | ||
23838 | done; \ | ||
23839 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/Makefile'; \ | ||
23840 | - cd $(top_srcdir) && \ | ||
23841 | - $(AUTOMAKE) --gnu dft/Makefile | ||
23842 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/Makefile'; \ | ||
23843 | + $(am__cd) $(top_srcdir) && \ | ||
23844 | + $(AUTOMAKE) --gnu dft/Makefile | ||
23845 | .PRECIOUS: Makefile | ||
23846 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
23847 | @case '$?' in \ | ||
23848 | @@ -279,6 +312,7 @@ | ||
23849 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
23850 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
23851 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
23852 | +$(am__aclocal_m4_deps): | ||
23853 | |||
23854 | clean-noinstLTLIBRARIES: | ||
23855 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
23856 | @@ -324,21 +358,21 @@ | ||
23857 | |||
23858 | .c.o: | ||
23859 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
23860 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
23861 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
23862 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
23863 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
23864 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
23865 | |||
23866 | .c.obj: | ||
23867 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
23868 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
23869 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
23870 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
23871 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
23872 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
23873 | |||
23874 | .c.lo: | ||
23875 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
23876 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
23877 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
23878 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
23879 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
23880 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
23881 | @@ -356,7 +390,7 @@ | ||
23882 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
23883 | # (2) otherwise, pass the desired values on the `make' command line. | ||
23884 | $(RECURSIVE_TARGETS): | ||
23885 | - @failcom='exit 1'; \ | ||
23886 | + @fail= failcom='exit 1'; \ | ||
23887 | for f in x $$MAKEFLAGS; do \ | ||
23888 | case $$f in \ | ||
23889 | *=* | --[!k]*);; \ | ||
23890 | @@ -373,7 +407,7 @@ | ||
23891 | else \ | ||
23892 | local_target="$$target"; \ | ||
23893 | fi; \ | ||
23894 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
23895 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
23896 | || eval $$failcom; \ | ||
23897 | done; \ | ||
23898 | if test "$$dot_seen" = "no"; then \ | ||
23899 | @@ -381,7 +415,7 @@ | ||
23900 | fi; test -z "$$fail" | ||
23901 | |||
23902 | $(RECURSIVE_CLEAN_TARGETS): | ||
23903 | - @failcom='exit 1'; \ | ||
23904 | + @fail= failcom='exit 1'; \ | ||
23905 | for f in x $$MAKEFLAGS; do \ | ||
23906 | case $$f in \ | ||
23907 | *=* | --[!k]*);; \ | ||
23908 | @@ -407,16 +441,16 @@ | ||
23909 | else \ | ||
23910 | local_target="$$target"; \ | ||
23911 | fi; \ | ||
23912 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
23913 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
23914 | || eval $$failcom; \ | ||
23915 | done && test -z "$$fail" | ||
23916 | tags-recursive: | ||
23917 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
23918 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
23919 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
23920 | done | ||
23921 | ctags-recursive: | ||
23922 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
23923 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
23924 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
23925 | done | ||
23926 | |||
23927 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
23928 | @@ -431,7 +465,7 @@ | ||
23929 | |||
23930 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
23931 | $(TAGS_FILES) $(LISP) | ||
23932 | - tags=; \ | ||
23933 | + set x; \ | ||
23934 | here=`pwd`; \ | ||
23935 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
23936 | include_option=--etags-include; \ | ||
23937 | @@ -443,7 +477,7 @@ | ||
23938 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
23939 | if test "$$subdir" = .; then :; else \ | ||
23940 | test ! -f $$subdir/TAGS || \ | ||
23941 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
23942 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
23943 | fi; \ | ||
23944 | done; \ | ||
23945 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
23946 | @@ -452,29 +486,34 @@ | ||
23947 | done | \ | ||
23948 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
23949 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
23950 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
23951 | + shift; \ | ||
23952 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
23953 | test -n "$$unique" || unique=$$empty_fix; \ | ||
23954 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
23955 | - $$tags $$unique; \ | ||
23956 | + if test $$# -gt 0; then \ | ||
23957 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
23958 | + "$$@" $$unique; \ | ||
23959 | + else \ | ||
23960 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
23961 | + $$unique; \ | ||
23962 | + fi; \ | ||
23963 | fi | ||
23964 | ctags: CTAGS | ||
23965 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
23966 | $(TAGS_FILES) $(LISP) | ||
23967 | - tags=; \ | ||
23968 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
23969 | unique=`for i in $$list; do \ | ||
23970 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
23971 | done | \ | ||
23972 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
23973 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
23974 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
23975 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
23976 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
23977 | - $$tags $$unique | ||
23978 | + $$unique | ||
23979 | |||
23980 | GTAGS: | ||
23981 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
23982 | - && cd $(top_srcdir) \ | ||
23983 | - && gtags -i $(GTAGS_ARGS) $$here | ||
23984 | + && $(am__cd) $(top_srcdir) \ | ||
23985 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
23986 | |||
23987 | distclean-tags: | ||
23988 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
23989 | @@ -495,29 +534,44 @@ | ||
23990 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
23991 | if test -d $$d/$$file; then \ | ||
23992 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
23993 | + if test -d "$(distdir)/$$file"; then \ | ||
23994 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
23995 | + fi; \ | ||
23996 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
23997 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
23998 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
23999 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
24000 | fi; \ | ||
24001 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
24002 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
24003 | else \ | ||
24004 | - test -f $(distdir)/$$file \ | ||
24005 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
24006 | + test -f "$(distdir)/$$file" \ | ||
24007 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
24008 | || exit 1; \ | ||
24009 | fi; \ | ||
24010 | done | ||
24011 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
24012 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
24013 | if test "$$subdir" = .; then :; else \ | ||
24014 | test -d "$(distdir)/$$subdir" \ | ||
24015 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
24016 | || exit 1; \ | ||
24017 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
24018 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
24019 | - (cd $$subdir && \ | ||
24020 | + fi; \ | ||
24021 | + done | ||
24022 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
24023 | + if test "$$subdir" = .; then :; else \ | ||
24024 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
24025 | + $(am__relativize); \ | ||
24026 | + new_distdir=$$reldir; \ | ||
24027 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
24028 | + $(am__relativize); \ | ||
24029 | + new_top_distdir=$$reldir; \ | ||
24030 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
24031 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
24032 | + ($(am__cd) $$subdir && \ | ||
24033 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
24034 | - top_distdir="$$top_distdir" \ | ||
24035 | - distdir="$$distdir/$$subdir" \ | ||
24036 | + top_distdir="$$new_top_distdir" \ | ||
24037 | + distdir="$$new_distdir" \ | ||
24038 | am__remove_distdir=: \ | ||
24039 | am__skip_length_check=: \ | ||
24040 | + am__skip_mode_fix=: \ | ||
24041 | distdir) \ | ||
24042 | || exit 1; \ | ||
24043 | fi; \ | ||
24044 | @@ -547,6 +601,7 @@ | ||
24045 | |||
24046 | distclean-generic: | ||
24047 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
24048 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
24049 | |||
24050 | maintainer-clean-generic: | ||
24051 | @echo "This command is intended for maintainers to use" | ||
24052 | @@ -568,6 +623,8 @@ | ||
24053 | |||
24054 | html: html-recursive | ||
24055 | |||
24056 | +html-am: | ||
24057 | + | ||
24058 | info: info-recursive | ||
24059 | |||
24060 | info-am: | ||
24061 | @@ -576,18 +633,28 @@ | ||
24062 | |||
24063 | install-dvi: install-dvi-recursive | ||
24064 | |||
24065 | +install-dvi-am: | ||
24066 | + | ||
24067 | install-exec-am: | ||
24068 | |||
24069 | install-html: install-html-recursive | ||
24070 | |||
24071 | +install-html-am: | ||
24072 | + | ||
24073 | install-info: install-info-recursive | ||
24074 | |||
24075 | +install-info-am: | ||
24076 | + | ||
24077 | install-man: | ||
24078 | |||
24079 | install-pdf: install-pdf-recursive | ||
24080 | |||
24081 | +install-pdf-am: | ||
24082 | + | ||
24083 | install-ps: install-ps-recursive | ||
24084 | |||
24085 | +install-ps-am: | ||
24086 | + | ||
24087 | installcheck-am: | ||
24088 | |||
24089 | maintainer-clean: maintainer-clean-recursive | ||
24090 | @@ -610,8 +677,8 @@ | ||
24091 | |||
24092 | uninstall-am: | ||
24093 | |||
24094 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
24095 | - install-strip | ||
24096 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
24097 | + install-am install-strip tags-recursive | ||
24098 | |||
24099 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
24100 | all all-am check check-am clean clean-generic clean-libtool \ | ||
24101 | @@ -628,6 +695,7 @@ | ||
24102 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | ||
24103 | uninstall uninstall-am | ||
24104 | |||
24105 | + | ||
24106 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
24107 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
24108 | .NOEXPORT: | ||
24109 | diff -Nurd fftw-3.2.2/dft/scalar/codelets/Makefile.in fftw-3.2.2-arm-beta1/dft/scalar/codelets/Makefile.in | ||
24110 | --- fftw-3.2.2/dft/scalar/codelets/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
24111 | +++ fftw-3.2.2-arm-beta1/dft/scalar/codelets/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
24112 | @@ -1,8 +1,9 @@ | ||
24113 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
24114 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
24115 | # @configure_input@ | ||
24116 | |||
24117 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
24118 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
24119 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
24120 | +# Inc. | ||
24121 | # This Makefile.in is free software; the Free Software Foundation | ||
24122 | # gives unlimited permission to copy and/or distribute it, | ||
24123 | # with or without modifications, as long as this notice is preserved. | ||
24124 | @@ -32,8 +33,9 @@ | ||
24125 | |||
24126 | VPATH = @srcdir@ | ||
24127 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
24128 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
24129 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
24130 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
24131 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
24132 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
24133 | install_sh_DATA = $(install_sh) -c -m 644 | ||
24134 | install_sh_PROGRAM = $(install_sh) -c | ||
24135 | @@ -70,6 +72,7 @@ | ||
24136 | mkinstalldirs = $(install_sh) -d | ||
24137 | CONFIG_HEADER = $(top_builddir)/config.h | ||
24138 | CONFIG_CLEAN_FILES = | ||
24139 | +CONFIG_CLEAN_VPATH_FILES = | ||
24140 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
24141 | libdft_scalar_codelets_la_LIBADD = | ||
24142 | am__objects_1 = n1_2.lo n1_3.lo n1_4.lo n1_5.lo n1_6.lo n1_7.lo \ | ||
24143 | @@ -92,6 +95,7 @@ | ||
24144 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
24145 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
24146 | am__depfiles_maybe = depfiles | ||
24147 | +am__mv = mv -f | ||
24148 | CCLD = $(CC) | ||
24149 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
24150 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
24151 | @@ -171,6 +175,7 @@ | ||
24152 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
24153 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
24154 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
24155 | +PACKAGE_URL = @PACKAGE_URL@ | ||
24156 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
24157 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
24158 | POW_LIB = @POW_LIB@ | ||
24159 | @@ -356,9 +361,9 @@ | ||
24160 | exit 1;; \ | ||
24161 | esac; \ | ||
24162 | done; \ | ||
24163 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/scalar/codelets/Makefile'; \ | ||
24164 | - cd $(top_srcdir) && \ | ||
24165 | - $(AUTOMAKE) --gnu dft/scalar/codelets/Makefile | ||
24166 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/scalar/codelets/Makefile'; \ | ||
24167 | + $(am__cd) $(top_srcdir) && \ | ||
24168 | + $(AUTOMAKE) --gnu dft/scalar/codelets/Makefile | ||
24169 | .PRECIOUS: Makefile | ||
24170 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
24171 | @case '$?' in \ | ||
24172 | @@ -376,6 +381,7 @@ | ||
24173 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
24174 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
24175 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
24176 | +$(am__aclocal_m4_deps): | ||
24177 | |||
24178 | clean-noinstLTLIBRARIES: | ||
24179 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
24180 | @@ -448,21 +454,21 @@ | ||
24181 | |||
24182 | .c.o: | ||
24183 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
24184 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24185 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24186 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
24187 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24188 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
24189 | |||
24190 | .c.obj: | ||
24191 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
24192 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24193 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24194 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
24195 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24196 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
24197 | |||
24198 | .c.lo: | ||
24199 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
24200 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
24201 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
24202 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
24203 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24204 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
24205 | @@ -485,7 +491,7 @@ | ||
24206 | |||
24207 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
24208 | $(TAGS_FILES) $(LISP) | ||
24209 | - tags=; \ | ||
24210 | + set x; \ | ||
24211 | here=`pwd`; \ | ||
24212 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
24213 | unique=`for i in $$list; do \ | ||
24214 | @@ -493,29 +499,34 @@ | ||
24215 | done | \ | ||
24216 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
24217 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
24218 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
24219 | + shift; \ | ||
24220 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
24221 | test -n "$$unique" || unique=$$empty_fix; \ | ||
24222 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24223 | - $$tags $$unique; \ | ||
24224 | + if test $$# -gt 0; then \ | ||
24225 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24226 | + "$$@" $$unique; \ | ||
24227 | + else \ | ||
24228 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24229 | + $$unique; \ | ||
24230 | + fi; \ | ||
24231 | fi | ||
24232 | ctags: CTAGS | ||
24233 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
24234 | $(TAGS_FILES) $(LISP) | ||
24235 | - tags=; \ | ||
24236 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
24237 | unique=`for i in $$list; do \ | ||
24238 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
24239 | done | \ | ||
24240 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
24241 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
24242 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
24243 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
24244 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
24245 | - $$tags $$unique | ||
24246 | + $$unique | ||
24247 | |||
24248 | GTAGS: | ||
24249 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
24250 | - && cd $(top_srcdir) \ | ||
24251 | - && gtags -i $(GTAGS_ARGS) $$here | ||
24252 | + && $(am__cd) $(top_srcdir) \ | ||
24253 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
24254 | |||
24255 | distclean-tags: | ||
24256 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
24257 | @@ -536,13 +547,17 @@ | ||
24258 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
24259 | if test -d $$d/$$file; then \ | ||
24260 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
24261 | + if test -d "$(distdir)/$$file"; then \ | ||
24262 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
24263 | + fi; \ | ||
24264 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
24265 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
24266 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
24267 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
24268 | fi; \ | ||
24269 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
24270 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
24271 | else \ | ||
24272 | - test -f $(distdir)/$$file \ | ||
24273 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
24274 | + test -f "$(distdir)/$$file" \ | ||
24275 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
24276 | || exit 1; \ | ||
24277 | fi; \ | ||
24278 | done | ||
24279 | @@ -572,6 +587,7 @@ | ||
24280 | |||
24281 | distclean-generic: | ||
24282 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
24283 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
24284 | |||
24285 | maintainer-clean-generic: | ||
24286 | @echo "This command is intended for maintainers to use" | ||
24287 | @@ -594,6 +610,8 @@ | ||
24288 | |||
24289 | html: html-am | ||
24290 | |||
24291 | +html-am: | ||
24292 | + | ||
24293 | info: info-am | ||
24294 | |||
24295 | info-am: | ||
24296 | @@ -602,18 +620,28 @@ | ||
24297 | |||
24298 | install-dvi: install-dvi-am | ||
24299 | |||
24300 | +install-dvi-am: | ||
24301 | + | ||
24302 | install-exec-am: | ||
24303 | |||
24304 | install-html: install-html-am | ||
24305 | |||
24306 | +install-html-am: | ||
24307 | + | ||
24308 | install-info: install-info-am | ||
24309 | |||
24310 | +install-info-am: | ||
24311 | + | ||
24312 | install-man: | ||
24313 | |||
24314 | install-pdf: install-pdf-am | ||
24315 | |||
24316 | +install-pdf-am: | ||
24317 | + | ||
24318 | install-ps: install-ps-am | ||
24319 | |||
24320 | +install-ps-am: | ||
24321 | + | ||
24322 | installcheck-am: | ||
24323 | |||
24324 | maintainer-clean: maintainer-clean-am | ||
24325 | @@ -637,7 +665,7 @@ | ||
24326 | |||
24327 | uninstall-am: | ||
24328 | |||
24329 | -.MAKE: install-am install-strip | ||
24330 | +.MAKE: all check install install-am install-strip | ||
24331 | |||
24332 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
24333 | clean-libtool clean-noinstLTLIBRARIES ctags distclean \ | ||
24334 | @@ -710,6 +738,7 @@ | ||
24335 | |||
24336 | @MAINTAINER_MODE_TRUE@q2_%.c: $(CODELET_DEPS) $(GEN_TWIDSQ) | ||
24337 | @MAINTAINER_MODE_TRUE@ ($(PRELUDE_COMMANDS_DFT); $(TWOVERS) $(GEN_TWIDSQ) $(FLAGS_Q2) -dif -n $* -name q2_$* -include "q.h") | $(ADD_DATE) | $(INDENT) >$@ | ||
24338 | + | ||
24339 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
24340 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
24341 | .NOEXPORT: | ||
24342 | diff -Nurd fftw-3.2.2/dft/scalar/Makefile.in fftw-3.2.2-arm-beta1/dft/scalar/Makefile.in | ||
24343 | --- fftw-3.2.2/dft/scalar/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
24344 | +++ fftw-3.2.2-arm-beta1/dft/scalar/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
24345 | @@ -1,8 +1,9 @@ | ||
24346 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
24347 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
24348 | # @configure_input@ | ||
24349 | |||
24350 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
24351 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
24352 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
24353 | +# Inc. | ||
24354 | # This Makefile.in is free software; the Free Software Foundation | ||
24355 | # gives unlimited permission to copy and/or distribute it, | ||
24356 | # with or without modifications, as long as this notice is preserved. | ||
24357 | @@ -16,8 +17,9 @@ | ||
24358 | |||
24359 | VPATH = @srcdir@ | ||
24360 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
24361 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
24362 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
24363 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
24364 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
24365 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
24366 | install_sh_DATA = $(install_sh) -c -m 644 | ||
24367 | install_sh_PROGRAM = $(install_sh) -c | ||
24368 | @@ -53,6 +55,7 @@ | ||
24369 | mkinstalldirs = $(install_sh) -d | ||
24370 | CONFIG_HEADER = $(top_builddir)/config.h | ||
24371 | CONFIG_CLEAN_FILES = | ||
24372 | +CONFIG_CLEAN_VPATH_FILES = | ||
24373 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
24374 | libdft_scalar_la_LIBADD = | ||
24375 | am_libdft_scalar_la_OBJECTS = n.lo t.lo | ||
24376 | @@ -60,6 +63,7 @@ | ||
24377 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
24378 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
24379 | am__depfiles_maybe = depfiles | ||
24380 | +am__mv = mv -f | ||
24381 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
24382 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
24383 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
24384 | @@ -80,10 +84,38 @@ | ||
24385 | ps-recursive uninstall-recursive | ||
24386 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
24387 | distclean-recursive maintainer-clean-recursive | ||
24388 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
24389 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
24390 | + distdir | ||
24391 | ETAGS = etags | ||
24392 | CTAGS = ctags | ||
24393 | DIST_SUBDIRS = $(SUBDIRS) | ||
24394 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
24395 | +am__relativize = \ | ||
24396 | + dir0=`pwd`; \ | ||
24397 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
24398 | + sed_rest='s,^[^/]*/*,,'; \ | ||
24399 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
24400 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
24401 | + while test -n "$$dir1"; do \ | ||
24402 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
24403 | + if test "$$first" != "."; then \ | ||
24404 | + if test "$$first" = ".."; then \ | ||
24405 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
24406 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
24407 | + else \ | ||
24408 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
24409 | + if test "$$first2" = "$$first"; then \ | ||
24410 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
24411 | + else \ | ||
24412 | + dir2="../$$dir2"; \ | ||
24413 | + fi; \ | ||
24414 | + dir0="$$dir0"/"$$first"; \ | ||
24415 | + fi; \ | ||
24416 | + fi; \ | ||
24417 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
24418 | + done; \ | ||
24419 | + reldir="$$dir2" | ||
24420 | ACLOCAL = @ACLOCAL@ | ||
24421 | ALLOCA = @ALLOCA@ | ||
24422 | AMTAR = @AMTAR@ | ||
24423 | @@ -154,6 +186,7 @@ | ||
24424 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
24425 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
24426 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
24427 | +PACKAGE_URL = @PACKAGE_URL@ | ||
24428 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
24429 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
24430 | POW_LIB = @POW_LIB@ | ||
24431 | @@ -246,9 +279,9 @@ | ||
24432 | exit 1;; \ | ||
24433 | esac; \ | ||
24434 | done; \ | ||
24435 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/scalar/Makefile'; \ | ||
24436 | - cd $(top_srcdir) && \ | ||
24437 | - $(AUTOMAKE) --gnu dft/scalar/Makefile | ||
24438 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/scalar/Makefile'; \ | ||
24439 | + $(am__cd) $(top_srcdir) && \ | ||
24440 | + $(AUTOMAKE) --gnu dft/scalar/Makefile | ||
24441 | .PRECIOUS: Makefile | ||
24442 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
24443 | @case '$?' in \ | ||
24444 | @@ -266,6 +299,7 @@ | ||
24445 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
24446 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
24447 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
24448 | +$(am__aclocal_m4_deps): | ||
24449 | |||
24450 | clean-noinstLTLIBRARIES: | ||
24451 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
24452 | @@ -289,21 +323,21 @@ | ||
24453 | |||
24454 | .c.o: | ||
24455 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
24456 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24457 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24458 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
24459 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24460 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
24461 | |||
24462 | .c.obj: | ||
24463 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
24464 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24465 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24466 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
24467 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24468 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
24469 | |||
24470 | .c.lo: | ||
24471 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
24472 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
24473 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
24474 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
24475 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24476 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
24477 | @@ -321,7 +355,7 @@ | ||
24478 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
24479 | # (2) otherwise, pass the desired values on the `make' command line. | ||
24480 | $(RECURSIVE_TARGETS): | ||
24481 | - @failcom='exit 1'; \ | ||
24482 | + @fail= failcom='exit 1'; \ | ||
24483 | for f in x $$MAKEFLAGS; do \ | ||
24484 | case $$f in \ | ||
24485 | *=* | --[!k]*);; \ | ||
24486 | @@ -338,7 +372,7 @@ | ||
24487 | else \ | ||
24488 | local_target="$$target"; \ | ||
24489 | fi; \ | ||
24490 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
24491 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
24492 | || eval $$failcom; \ | ||
24493 | done; \ | ||
24494 | if test "$$dot_seen" = "no"; then \ | ||
24495 | @@ -346,7 +380,7 @@ | ||
24496 | fi; test -z "$$fail" | ||
24497 | |||
24498 | $(RECURSIVE_CLEAN_TARGETS): | ||
24499 | - @failcom='exit 1'; \ | ||
24500 | + @fail= failcom='exit 1'; \ | ||
24501 | for f in x $$MAKEFLAGS; do \ | ||
24502 | case $$f in \ | ||
24503 | *=* | --[!k]*);; \ | ||
24504 | @@ -372,16 +406,16 @@ | ||
24505 | else \ | ||
24506 | local_target="$$target"; \ | ||
24507 | fi; \ | ||
24508 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
24509 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
24510 | || eval $$failcom; \ | ||
24511 | done && test -z "$$fail" | ||
24512 | tags-recursive: | ||
24513 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
24514 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
24515 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
24516 | done | ||
24517 | ctags-recursive: | ||
24518 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
24519 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
24520 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
24521 | done | ||
24522 | |||
24523 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
24524 | @@ -396,7 +430,7 @@ | ||
24525 | |||
24526 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
24527 | $(TAGS_FILES) $(LISP) | ||
24528 | - tags=; \ | ||
24529 | + set x; \ | ||
24530 | here=`pwd`; \ | ||
24531 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
24532 | include_option=--etags-include; \ | ||
24533 | @@ -408,7 +442,7 @@ | ||
24534 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
24535 | if test "$$subdir" = .; then :; else \ | ||
24536 | test ! -f $$subdir/TAGS || \ | ||
24537 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
24538 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
24539 | fi; \ | ||
24540 | done; \ | ||
24541 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
24542 | @@ -417,29 +451,34 @@ | ||
24543 | done | \ | ||
24544 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
24545 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
24546 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
24547 | + shift; \ | ||
24548 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
24549 | test -n "$$unique" || unique=$$empty_fix; \ | ||
24550 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24551 | - $$tags $$unique; \ | ||
24552 | + if test $$# -gt 0; then \ | ||
24553 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24554 | + "$$@" $$unique; \ | ||
24555 | + else \ | ||
24556 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24557 | + $$unique; \ | ||
24558 | + fi; \ | ||
24559 | fi | ||
24560 | ctags: CTAGS | ||
24561 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
24562 | $(TAGS_FILES) $(LISP) | ||
24563 | - tags=; \ | ||
24564 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
24565 | unique=`for i in $$list; do \ | ||
24566 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
24567 | done | \ | ||
24568 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
24569 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
24570 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
24571 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
24572 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
24573 | - $$tags $$unique | ||
24574 | + $$unique | ||
24575 | |||
24576 | GTAGS: | ||
24577 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
24578 | - && cd $(top_srcdir) \ | ||
24579 | - && gtags -i $(GTAGS_ARGS) $$here | ||
24580 | + && $(am__cd) $(top_srcdir) \ | ||
24581 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
24582 | |||
24583 | distclean-tags: | ||
24584 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
24585 | @@ -460,29 +499,44 @@ | ||
24586 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
24587 | if test -d $$d/$$file; then \ | ||
24588 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
24589 | + if test -d "$(distdir)/$$file"; then \ | ||
24590 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
24591 | + fi; \ | ||
24592 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
24593 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
24594 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
24595 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
24596 | fi; \ | ||
24597 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
24598 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
24599 | else \ | ||
24600 | - test -f $(distdir)/$$file \ | ||
24601 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
24602 | + test -f "$(distdir)/$$file" \ | ||
24603 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
24604 | || exit 1; \ | ||
24605 | fi; \ | ||
24606 | done | ||
24607 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
24608 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
24609 | if test "$$subdir" = .; then :; else \ | ||
24610 | test -d "$(distdir)/$$subdir" \ | ||
24611 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
24612 | || exit 1; \ | ||
24613 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
24614 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
24615 | - (cd $$subdir && \ | ||
24616 | + fi; \ | ||
24617 | + done | ||
24618 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
24619 | + if test "$$subdir" = .; then :; else \ | ||
24620 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
24621 | + $(am__relativize); \ | ||
24622 | + new_distdir=$$reldir; \ | ||
24623 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
24624 | + $(am__relativize); \ | ||
24625 | + new_top_distdir=$$reldir; \ | ||
24626 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
24627 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
24628 | + ($(am__cd) $$subdir && \ | ||
24629 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
24630 | - top_distdir="$$top_distdir" \ | ||
24631 | - distdir="$$distdir/$$subdir" \ | ||
24632 | + top_distdir="$$new_top_distdir" \ | ||
24633 | + distdir="$$new_distdir" \ | ||
24634 | am__remove_distdir=: \ | ||
24635 | am__skip_length_check=: \ | ||
24636 | + am__skip_mode_fix=: \ | ||
24637 | distdir) \ | ||
24638 | || exit 1; \ | ||
24639 | fi; \ | ||
24640 | @@ -512,6 +566,7 @@ | ||
24641 | |||
24642 | distclean-generic: | ||
24643 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
24644 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
24645 | |||
24646 | maintainer-clean-generic: | ||
24647 | @echo "This command is intended for maintainers to use" | ||
24648 | @@ -533,6 +588,8 @@ | ||
24649 | |||
24650 | html: html-recursive | ||
24651 | |||
24652 | +html-am: | ||
24653 | + | ||
24654 | info: info-recursive | ||
24655 | |||
24656 | info-am: | ||
24657 | @@ -541,18 +598,28 @@ | ||
24658 | |||
24659 | install-dvi: install-dvi-recursive | ||
24660 | |||
24661 | +install-dvi-am: | ||
24662 | + | ||
24663 | install-exec-am: | ||
24664 | |||
24665 | install-html: install-html-recursive | ||
24666 | |||
24667 | +install-html-am: | ||
24668 | + | ||
24669 | install-info: install-info-recursive | ||
24670 | |||
24671 | +install-info-am: | ||
24672 | + | ||
24673 | install-man: | ||
24674 | |||
24675 | install-pdf: install-pdf-recursive | ||
24676 | |||
24677 | +install-pdf-am: | ||
24678 | + | ||
24679 | install-ps: install-ps-recursive | ||
24680 | |||
24681 | +install-ps-am: | ||
24682 | + | ||
24683 | installcheck-am: | ||
24684 | |||
24685 | maintainer-clean: maintainer-clean-recursive | ||
24686 | @@ -575,8 +642,8 @@ | ||
24687 | |||
24688 | uninstall-am: | ||
24689 | |||
24690 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
24691 | - install-strip | ||
24692 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
24693 | + install-am install-strip tags-recursive | ||
24694 | |||
24695 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
24696 | all all-am check check-am clean clean-generic clean-libtool \ | ||
24697 | @@ -593,6 +660,7 @@ | ||
24698 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | ||
24699 | uninstall uninstall-am | ||
24700 | |||
24701 | + | ||
24702 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
24703 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
24704 | .NOEXPORT: | ||
24705 | diff -Nurd fftw-3.2.2/dft/simd/codelets/Makefile.in fftw-3.2.2-arm-beta1/dft/simd/codelets/Makefile.in | ||
24706 | --- fftw-3.2.2/dft/simd/codelets/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
24707 | +++ fftw-3.2.2-arm-beta1/dft/simd/codelets/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
24708 | @@ -1,8 +1,9 @@ | ||
24709 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
24710 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
24711 | # @configure_input@ | ||
24712 | |||
24713 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
24714 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
24715 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
24716 | +# Inc. | ||
24717 | # This Makefile.in is free software; the Free Software Foundation | ||
24718 | # gives unlimited permission to copy and/or distribute it, | ||
24719 | # with or without modifications, as long as this notice is preserved. | ||
24720 | @@ -32,8 +33,9 @@ | ||
24721 | |||
24722 | VPATH = @srcdir@ | ||
24723 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
24724 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
24725 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
24726 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
24727 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
24728 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
24729 | install_sh_DATA = $(install_sh) -c -m 644 | ||
24730 | install_sh_PROGRAM = $(install_sh) -c | ||
24731 | @@ -70,6 +72,7 @@ | ||
24732 | mkinstalldirs = $(install_sh) -d | ||
24733 | CONFIG_HEADER = $(top_builddir)/config.h | ||
24734 | CONFIG_CLEAN_FILES = | ||
24735 | +CONFIG_CLEAN_VPATH_FILES = | ||
24736 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
24737 | libdft_simd_codelets_la_LIBADD = | ||
24738 | am__libdft_simd_codelets_la_SOURCES_DIST = n1fv_2.c n1fv_3.c n1fv_4.c \ | ||
24739 | @@ -153,6 +156,7 @@ | ||
24740 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
24741 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
24742 | am__depfiles_maybe = depfiles | ||
24743 | +am__mv = mv -f | ||
24744 | CCLD = $(CC) | ||
24745 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
24746 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
24747 | @@ -232,6 +236,7 @@ | ||
24748 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
24749 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
24750 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
24751 | +PACKAGE_URL = @PACKAGE_URL@ | ||
24752 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
24753 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
24754 | POW_LIB = @POW_LIB@ | ||
24755 | @@ -458,9 +463,9 @@ | ||
24756 | exit 1;; \ | ||
24757 | esac; \ | ||
24758 | done; \ | ||
24759 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/simd/codelets/Makefile'; \ | ||
24760 | - cd $(top_srcdir) && \ | ||
24761 | - $(AUTOMAKE) --gnu dft/simd/codelets/Makefile | ||
24762 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/simd/codelets/Makefile'; \ | ||
24763 | + $(am__cd) $(top_srcdir) && \ | ||
24764 | + $(AUTOMAKE) --gnu dft/simd/codelets/Makefile | ||
24765 | .PRECIOUS: Makefile | ||
24766 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
24767 | @case '$?' in \ | ||
24768 | @@ -478,6 +483,7 @@ | ||
24769 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
24770 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
24771 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
24772 | +$(am__aclocal_m4_deps): | ||
24773 | |||
24774 | clean-noinstLTLIBRARIES: | ||
24775 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
24776 | @@ -670,21 +676,21 @@ | ||
24777 | |||
24778 | .c.o: | ||
24779 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
24780 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24781 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24782 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
24783 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24784 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
24785 | |||
24786 | .c.obj: | ||
24787 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
24788 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24789 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
24790 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
24791 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24792 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
24793 | |||
24794 | .c.lo: | ||
24795 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
24796 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
24797 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
24798 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
24799 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
24800 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
24801 | @@ -707,7 +713,7 @@ | ||
24802 | |||
24803 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
24804 | $(TAGS_FILES) $(LISP) | ||
24805 | - tags=; \ | ||
24806 | + set x; \ | ||
24807 | here=`pwd`; \ | ||
24808 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
24809 | unique=`for i in $$list; do \ | ||
24810 | @@ -715,29 +721,34 @@ | ||
24811 | done | \ | ||
24812 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
24813 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
24814 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
24815 | + shift; \ | ||
24816 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
24817 | test -n "$$unique" || unique=$$empty_fix; \ | ||
24818 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24819 | - $$tags $$unique; \ | ||
24820 | + if test $$# -gt 0; then \ | ||
24821 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24822 | + "$$@" $$unique; \ | ||
24823 | + else \ | ||
24824 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
24825 | + $$unique; \ | ||
24826 | + fi; \ | ||
24827 | fi | ||
24828 | ctags: CTAGS | ||
24829 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
24830 | $(TAGS_FILES) $(LISP) | ||
24831 | - tags=; \ | ||
24832 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
24833 | unique=`for i in $$list; do \ | ||
24834 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
24835 | done | \ | ||
24836 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
24837 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
24838 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
24839 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
24840 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
24841 | - $$tags $$unique | ||
24842 | + $$unique | ||
24843 | |||
24844 | GTAGS: | ||
24845 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
24846 | - && cd $(top_srcdir) \ | ||
24847 | - && gtags -i $(GTAGS_ARGS) $$here | ||
24848 | + && $(am__cd) $(top_srcdir) \ | ||
24849 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
24850 | |||
24851 | distclean-tags: | ||
24852 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
24853 | @@ -758,13 +769,17 @@ | ||
24854 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
24855 | if test -d $$d/$$file; then \ | ||
24856 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
24857 | + if test -d "$(distdir)/$$file"; then \ | ||
24858 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
24859 | + fi; \ | ||
24860 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
24861 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
24862 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
24863 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
24864 | fi; \ | ||
24865 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
24866 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
24867 | else \ | ||
24868 | - test -f $(distdir)/$$file \ | ||
24869 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
24870 | + test -f "$(distdir)/$$file" \ | ||
24871 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
24872 | || exit 1; \ | ||
24873 | fi; \ | ||
24874 | done | ||
24875 | @@ -794,6 +809,7 @@ | ||
24876 | |||
24877 | distclean-generic: | ||
24878 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
24879 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
24880 | |||
24881 | maintainer-clean-generic: | ||
24882 | @echo "This command is intended for maintainers to use" | ||
24883 | @@ -816,6 +832,8 @@ | ||
24884 | |||
24885 | html: html-am | ||
24886 | |||
24887 | +html-am: | ||
24888 | + | ||
24889 | info: info-am | ||
24890 | |||
24891 | info-am: | ||
24892 | @@ -824,18 +842,28 @@ | ||
24893 | |||
24894 | install-dvi: install-dvi-am | ||
24895 | |||
24896 | +install-dvi-am: | ||
24897 | + | ||
24898 | install-exec-am: | ||
24899 | |||
24900 | install-html: install-html-am | ||
24901 | |||
24902 | +install-html-am: | ||
24903 | + | ||
24904 | install-info: install-info-am | ||
24905 | |||
24906 | +install-info-am: | ||
24907 | + | ||
24908 | install-man: | ||
24909 | |||
24910 | install-pdf: install-pdf-am | ||
24911 | |||
24912 | +install-pdf-am: | ||
24913 | + | ||
24914 | install-ps: install-ps-am | ||
24915 | |||
24916 | +install-ps-am: | ||
24917 | + | ||
24918 | installcheck-am: | ||
24919 | |||
24920 | maintainer-clean: maintainer-clean-am | ||
24921 | @@ -859,7 +887,7 @@ | ||
24922 | |||
24923 | uninstall-am: | ||
24924 | |||
24925 | -.MAKE: install-am install-strip | ||
24926 | +.MAKE: all check install install-am install-strip | ||
24927 | |||
24928 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
24929 | clean-libtool clean-noinstLTLIBRARIES ctags distclean \ | ||
24930 | @@ -962,6 +990,7 @@ | ||
24931 | |||
24932 | @MAINTAINER_MODE_TRUE@q1bv_%.c: $(CODELET_DEPS) $(GEN_TWIDSQ_C) | ||
24933 | @MAINTAINER_MODE_TRUE@ ($(PRELUDE_COMMANDS_DFT); $(TWOVERS) $(GEN_TWIDSQ_C) $(GFLAGS) -n $* -dif -name q1bv_$* -include "q1b.h" -sign 1) | $(ADD_DATE) | $(INDENT) >$@ | ||
24934 | + | ||
24935 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
24936 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
24937 | .NOEXPORT: | ||
24938 | diff -Nurd fftw-3.2.2/dft/simd/Makefile.in fftw-3.2.2-arm-beta1/dft/simd/Makefile.in | ||
24939 | --- fftw-3.2.2/dft/simd/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
24940 | +++ fftw-3.2.2-arm-beta1/dft/simd/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
24941 | @@ -1,8 +1,9 @@ | ||
24942 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
24943 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
24944 | # @configure_input@ | ||
24945 | |||
24946 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
24947 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
24948 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
24949 | +# Inc. | ||
24950 | # This Makefile.in is free software; the Free Software Foundation | ||
24951 | # gives unlimited permission to copy and/or distribute it, | ||
24952 | # with or without modifications, as long as this notice is preserved. | ||
24953 | @@ -16,8 +17,9 @@ | ||
24954 | |||
24955 | VPATH = @srcdir@ | ||
24956 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
24957 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
24958 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
24959 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
24960 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
24961 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
24962 | install_sh_DATA = $(install_sh) -c -m 644 | ||
24963 | install_sh_PROGRAM = $(install_sh) -c | ||
24964 | @@ -53,6 +55,7 @@ | ||
24965 | mkinstalldirs = $(install_sh) -d | ||
24966 | CONFIG_HEADER = $(top_builddir)/config.h | ||
24967 | CONFIG_CLEAN_FILES = | ||
24968 | +CONFIG_CLEAN_VPATH_FILES = | ||
24969 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
24970 | libdft_simd_la_LIBADD = | ||
24971 | am_libdft_simd_la_OBJECTS = n1b.lo n1f.lo n2b.lo n2f.lo n2s.lo q1b.lo \ | ||
24972 | @@ -61,6 +64,7 @@ | ||
24973 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
24974 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
24975 | am__depfiles_maybe = depfiles | ||
24976 | +am__mv = mv -f | ||
24977 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
24978 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
24979 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
24980 | @@ -81,10 +85,38 @@ | ||
24981 | ps-recursive uninstall-recursive | ||
24982 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
24983 | distclean-recursive maintainer-clean-recursive | ||
24984 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
24985 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
24986 | + distdir | ||
24987 | ETAGS = etags | ||
24988 | CTAGS = ctags | ||
24989 | DIST_SUBDIRS = $(SUBDIRS) | ||
24990 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
24991 | +am__relativize = \ | ||
24992 | + dir0=`pwd`; \ | ||
24993 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
24994 | + sed_rest='s,^[^/]*/*,,'; \ | ||
24995 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
24996 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
24997 | + while test -n "$$dir1"; do \ | ||
24998 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
24999 | + if test "$$first" != "."; then \ | ||
25000 | + if test "$$first" = ".."; then \ | ||
25001 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
25002 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
25003 | + else \ | ||
25004 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
25005 | + if test "$$first2" = "$$first"; then \ | ||
25006 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
25007 | + else \ | ||
25008 | + dir2="../$$dir2"; \ | ||
25009 | + fi; \ | ||
25010 | + dir0="$$dir0"/"$$first"; \ | ||
25011 | + fi; \ | ||
25012 | + fi; \ | ||
25013 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
25014 | + done; \ | ||
25015 | + reldir="$$dir2" | ||
25016 | ACLOCAL = @ACLOCAL@ | ||
25017 | ALLOCA = @ALLOCA@ | ||
25018 | AMTAR = @AMTAR@ | ||
25019 | @@ -155,6 +187,7 @@ | ||
25020 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
25021 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
25022 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
25023 | +PACKAGE_URL = @PACKAGE_URL@ | ||
25024 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
25025 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
25026 | POW_LIB = @POW_LIB@ | ||
25027 | @@ -250,9 +283,9 @@ | ||
25028 | exit 1;; \ | ||
25029 | esac; \ | ||
25030 | done; \ | ||
25031 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/simd/Makefile'; \ | ||
25032 | - cd $(top_srcdir) && \ | ||
25033 | - $(AUTOMAKE) --gnu dft/simd/Makefile | ||
25034 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dft/simd/Makefile'; \ | ||
25035 | + $(am__cd) $(top_srcdir) && \ | ||
25036 | + $(AUTOMAKE) --gnu dft/simd/Makefile | ||
25037 | .PRECIOUS: Makefile | ||
25038 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
25039 | @case '$?' in \ | ||
25040 | @@ -270,6 +303,7 @@ | ||
25041 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
25042 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
25043 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
25044 | +$(am__aclocal_m4_deps): | ||
25045 | |||
25046 | clean-noinstLTLIBRARIES: | ||
25047 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
25048 | @@ -300,21 +334,21 @@ | ||
25049 | |||
25050 | .c.o: | ||
25051 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
25052 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
25053 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
25054 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
25055 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25056 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
25057 | |||
25058 | .c.obj: | ||
25059 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
25060 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
25061 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
25062 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
25063 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25064 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
25065 | |||
25066 | .c.lo: | ||
25067 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
25068 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
25069 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
25070 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
25071 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
25072 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
25073 | @@ -332,7 +366,7 @@ | ||
25074 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
25075 | # (2) otherwise, pass the desired values on the `make' command line. | ||
25076 | $(RECURSIVE_TARGETS): | ||
25077 | - @failcom='exit 1'; \ | ||
25078 | + @fail= failcom='exit 1'; \ | ||
25079 | for f in x $$MAKEFLAGS; do \ | ||
25080 | case $$f in \ | ||
25081 | *=* | --[!k]*);; \ | ||
25082 | @@ -349,7 +383,7 @@ | ||
25083 | else \ | ||
25084 | local_target="$$target"; \ | ||
25085 | fi; \ | ||
25086 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25087 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25088 | || eval $$failcom; \ | ||
25089 | done; \ | ||
25090 | if test "$$dot_seen" = "no"; then \ | ||
25091 | @@ -357,7 +391,7 @@ | ||
25092 | fi; test -z "$$fail" | ||
25093 | |||
25094 | $(RECURSIVE_CLEAN_TARGETS): | ||
25095 | - @failcom='exit 1'; \ | ||
25096 | + @fail= failcom='exit 1'; \ | ||
25097 | for f in x $$MAKEFLAGS; do \ | ||
25098 | case $$f in \ | ||
25099 | *=* | --[!k]*);; \ | ||
25100 | @@ -383,16 +417,16 @@ | ||
25101 | else \ | ||
25102 | local_target="$$target"; \ | ||
25103 | fi; \ | ||
25104 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25105 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25106 | || eval $$failcom; \ | ||
25107 | done && test -z "$$fail" | ||
25108 | tags-recursive: | ||
25109 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
25110 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
25111 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
25112 | done | ||
25113 | ctags-recursive: | ||
25114 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
25115 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
25116 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
25117 | done | ||
25118 | |||
25119 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
25120 | @@ -407,7 +441,7 @@ | ||
25121 | |||
25122 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
25123 | $(TAGS_FILES) $(LISP) | ||
25124 | - tags=; \ | ||
25125 | + set x; \ | ||
25126 | here=`pwd`; \ | ||
25127 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
25128 | include_option=--etags-include; \ | ||
25129 | @@ -419,7 +453,7 @@ | ||
25130 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
25131 | if test "$$subdir" = .; then :; else \ | ||
25132 | test ! -f $$subdir/TAGS || \ | ||
25133 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
25134 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
25135 | fi; \ | ||
25136 | done; \ | ||
25137 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
25138 | @@ -428,29 +462,34 @@ | ||
25139 | done | \ | ||
25140 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
25141 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
25142 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
25143 | + shift; \ | ||
25144 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
25145 | test -n "$$unique" || unique=$$empty_fix; \ | ||
25146 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
25147 | - $$tags $$unique; \ | ||
25148 | + if test $$# -gt 0; then \ | ||
25149 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
25150 | + "$$@" $$unique; \ | ||
25151 | + else \ | ||
25152 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
25153 | + $$unique; \ | ||
25154 | + fi; \ | ||
25155 | fi | ||
25156 | ctags: CTAGS | ||
25157 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
25158 | $(TAGS_FILES) $(LISP) | ||
25159 | - tags=; \ | ||
25160 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
25161 | unique=`for i in $$list; do \ | ||
25162 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
25163 | done | \ | ||
25164 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
25165 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
25166 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
25167 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
25168 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
25169 | - $$tags $$unique | ||
25170 | + $$unique | ||
25171 | |||
25172 | GTAGS: | ||
25173 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
25174 | - && cd $(top_srcdir) \ | ||
25175 | - && gtags -i $(GTAGS_ARGS) $$here | ||
25176 | + && $(am__cd) $(top_srcdir) \ | ||
25177 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
25178 | |||
25179 | distclean-tags: | ||
25180 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
25181 | @@ -471,29 +510,44 @@ | ||
25182 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
25183 | if test -d $$d/$$file; then \ | ||
25184 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
25185 | + if test -d "$(distdir)/$$file"; then \ | ||
25186 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
25187 | + fi; \ | ||
25188 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
25189 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
25190 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
25191 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
25192 | fi; \ | ||
25193 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
25194 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
25195 | else \ | ||
25196 | - test -f $(distdir)/$$file \ | ||
25197 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
25198 | + test -f "$(distdir)/$$file" \ | ||
25199 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
25200 | || exit 1; \ | ||
25201 | fi; \ | ||
25202 | done | ||
25203 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
25204 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
25205 | if test "$$subdir" = .; then :; else \ | ||
25206 | test -d "$(distdir)/$$subdir" \ | ||
25207 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
25208 | || exit 1; \ | ||
25209 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
25210 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
25211 | - (cd $$subdir && \ | ||
25212 | + fi; \ | ||
25213 | + done | ||
25214 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
25215 | + if test "$$subdir" = .; then :; else \ | ||
25216 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
25217 | + $(am__relativize); \ | ||
25218 | + new_distdir=$$reldir; \ | ||
25219 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
25220 | + $(am__relativize); \ | ||
25221 | + new_top_distdir=$$reldir; \ | ||
25222 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
25223 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
25224 | + ($(am__cd) $$subdir && \ | ||
25225 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
25226 | - top_distdir="$$top_distdir" \ | ||
25227 | - distdir="$$distdir/$$subdir" \ | ||
25228 | + top_distdir="$$new_top_distdir" \ | ||
25229 | + distdir="$$new_distdir" \ | ||
25230 | am__remove_distdir=: \ | ||
25231 | am__skip_length_check=: \ | ||
25232 | + am__skip_mode_fix=: \ | ||
25233 | distdir) \ | ||
25234 | || exit 1; \ | ||
25235 | fi; \ | ||
25236 | @@ -523,6 +577,7 @@ | ||
25237 | |||
25238 | distclean-generic: | ||
25239 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
25240 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
25241 | |||
25242 | maintainer-clean-generic: | ||
25243 | @echo "This command is intended for maintainers to use" | ||
25244 | @@ -544,6 +599,8 @@ | ||
25245 | |||
25246 | html: html-recursive | ||
25247 | |||
25248 | +html-am: | ||
25249 | + | ||
25250 | info: info-recursive | ||
25251 | |||
25252 | info-am: | ||
25253 | @@ -552,18 +609,28 @@ | ||
25254 | |||
25255 | install-dvi: install-dvi-recursive | ||
25256 | |||
25257 | +install-dvi-am: | ||
25258 | + | ||
25259 | install-exec-am: | ||
25260 | |||
25261 | install-html: install-html-recursive | ||
25262 | |||
25263 | +install-html-am: | ||
25264 | + | ||
25265 | install-info: install-info-recursive | ||
25266 | |||
25267 | +install-info-am: | ||
25268 | + | ||
25269 | install-man: | ||
25270 | |||
25271 | install-pdf: install-pdf-recursive | ||
25272 | |||
25273 | +install-pdf-am: | ||
25274 | + | ||
25275 | install-ps: install-ps-recursive | ||
25276 | |||
25277 | +install-ps-am: | ||
25278 | + | ||
25279 | installcheck-am: | ||
25280 | |||
25281 | maintainer-clean: maintainer-clean-recursive | ||
25282 | @@ -586,8 +653,8 @@ | ||
25283 | |||
25284 | uninstall-am: | ||
25285 | |||
25286 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
25287 | - install-strip | ||
25288 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
25289 | + install-am install-strip tags-recursive | ||
25290 | |||
25291 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
25292 | all all-am check check-am clean clean-generic clean-libtool \ | ||
25293 | @@ -604,6 +671,7 @@ | ||
25294 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | ||
25295 | uninstall uninstall-am | ||
25296 | |||
25297 | + | ||
25298 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
25299 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
25300 | .NOEXPORT: | ||
25301 | diff -Nurd fftw-3.2.2/doc/FAQ/Makefile.in fftw-3.2.2-arm-beta1/doc/FAQ/Makefile.in | ||
25302 | --- fftw-3.2.2/doc/FAQ/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
25303 | +++ fftw-3.2.2-arm-beta1/doc/FAQ/Makefile.in 2011-03-26 22:34:05.000000000 +0100 | ||
25304 | @@ -1,8 +1,9 @@ | ||
25305 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
25306 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
25307 | # @configure_input@ | ||
25308 | |||
25309 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
25310 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
25311 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
25312 | +# Inc. | ||
25313 | # This Makefile.in is free software; the Free Software Foundation | ||
25314 | # gives unlimited permission to copy and/or distribute it, | ||
25315 | # with or without modifications, as long as this notice is preserved. | ||
25316 | @@ -15,8 +16,9 @@ | ||
25317 | @SET_MAKE@ | ||
25318 | VPATH = @srcdir@ | ||
25319 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
25320 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
25321 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
25322 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
25323 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
25324 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
25325 | install_sh_DATA = $(install_sh) -c -m 644 | ||
25326 | install_sh_PROGRAM = $(install_sh) -c | ||
25327 | @@ -52,6 +54,7 @@ | ||
25328 | mkinstalldirs = $(install_sh) -d | ||
25329 | CONFIG_HEADER = $(top_builddir)/config.h | ||
25330 | CONFIG_CLEAN_FILES = | ||
25331 | +CONFIG_CLEAN_VPATH_FILES = | ||
25332 | SOURCES = | ||
25333 | DIST_SOURCES = | ||
25334 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
25335 | @@ -125,6 +128,7 @@ | ||
25336 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
25337 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
25338 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
25339 | +PACKAGE_URL = @PACKAGE_URL@ | ||
25340 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
25341 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
25342 | POW_LIB = @POW_LIB@ | ||
25343 | @@ -215,9 +219,9 @@ | ||
25344 | exit 1;; \ | ||
25345 | esac; \ | ||
25346 | done; \ | ||
25347 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/FAQ/Makefile'; \ | ||
25348 | - cd $(top_srcdir) && \ | ||
25349 | - $(AUTOMAKE) --gnu doc/FAQ/Makefile | ||
25350 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/FAQ/Makefile'; \ | ||
25351 | + $(am__cd) $(top_srcdir) && \ | ||
25352 | + $(AUTOMAKE) --gnu doc/FAQ/Makefile | ||
25353 | .PRECIOUS: Makefile | ||
25354 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
25355 | @case '$?' in \ | ||
25356 | @@ -235,6 +239,7 @@ | ||
25357 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
25358 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
25359 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
25360 | +$(am__aclocal_m4_deps): | ||
25361 | |||
25362 | mostlyclean-libtool: | ||
25363 | -rm -f *.lo | ||
25364 | @@ -264,13 +269,17 @@ | ||
25365 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
25366 | if test -d $$d/$$file; then \ | ||
25367 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
25368 | + if test -d "$(distdir)/$$file"; then \ | ||
25369 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
25370 | + fi; \ | ||
25371 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
25372 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
25373 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
25374 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
25375 | fi; \ | ||
25376 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
25377 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
25378 | else \ | ||
25379 | - test -f $(distdir)/$$file \ | ||
25380 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
25381 | + test -f "$(distdir)/$$file" \ | ||
25382 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
25383 | || exit 1; \ | ||
25384 | fi; \ | ||
25385 | done | ||
25386 | @@ -298,6 +307,7 @@ | ||
25387 | |||
25388 | distclean-generic: | ||
25389 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
25390 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
25391 | |||
25392 | maintainer-clean-generic: | ||
25393 | @echo "This command is intended for maintainers to use" | ||
25394 | @@ -316,6 +326,8 @@ | ||
25395 | |||
25396 | html: html-am | ||
25397 | |||
25398 | +html-am: | ||
25399 | + | ||
25400 | info: info-am | ||
25401 | |||
25402 | info-am: | ||
25403 | @@ -324,18 +336,28 @@ | ||
25404 | |||
25405 | install-dvi: install-dvi-am | ||
25406 | |||
25407 | +install-dvi-am: | ||
25408 | + | ||
25409 | install-exec-am: | ||
25410 | |||
25411 | install-html: install-html-am | ||
25412 | |||
25413 | +install-html-am: | ||
25414 | + | ||
25415 | install-info: install-info-am | ||
25416 | |||
25417 | +install-info-am: | ||
25418 | + | ||
25419 | install-man: | ||
25420 | |||
25421 | install-pdf: install-pdf-am | ||
25422 | |||
25423 | +install-pdf-am: | ||
25424 | + | ||
25425 | install-ps: install-ps-am | ||
25426 | |||
25427 | +install-ps-am: | ||
25428 | + | ||
25429 | installcheck-am: | ||
25430 | |||
25431 | maintainer-clean: maintainer-clean-am | ||
25432 | @@ -385,6 +407,7 @@ | ||
25433 | clean-local: | ||
25434 | rm -f *~ core a.out *.lout *.ps *.info *.ascii *.xrefdb *.post | ||
25435 | rm -rf *.html html.refs2 | ||
25436 | + | ||
25437 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
25438 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
25439 | .NOEXPORT: | ||
25440 | diff -Nurd fftw-3.2.2/doc/Makefile.in fftw-3.2.2-arm-beta1/doc/Makefile.in | ||
25441 | --- fftw-3.2.2/doc/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
25442 | +++ fftw-3.2.2-arm-beta1/doc/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
25443 | @@ -1,8 +1,9 @@ | ||
25444 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
25445 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
25446 | # @configure_input@ | ||
25447 | |||
25448 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
25449 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
25450 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
25451 | +# Inc. | ||
25452 | # This Makefile.in is free software; the Free Software Foundation | ||
25453 | # gives unlimited permission to copy and/or distribute it, | ||
25454 | # with or without modifications, as long as this notice is preserved. | ||
25455 | @@ -15,8 +16,9 @@ | ||
25456 | @SET_MAKE@ | ||
25457 | VPATH = @srcdir@ | ||
25458 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
25459 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
25460 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
25461 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
25462 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
25463 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
25464 | install_sh_DATA = $(install_sh) -c -m 644 | ||
25465 | install_sh_PROGRAM = $(install_sh) -c | ||
25466 | @@ -54,6 +56,7 @@ | ||
25467 | mkinstalldirs = $(install_sh) -d | ||
25468 | CONFIG_HEADER = $(top_builddir)/config.h | ||
25469 | CONFIG_CLEAN_FILES = | ||
25470 | +CONFIG_CLEAN_VPATH_FILES = | ||
25471 | SOURCES = | ||
25472 | DIST_SOURCES = | ||
25473 | INFO_DEPS = $(srcdir)/fftw3.info | ||
25474 | @@ -80,13 +83,56 @@ | ||
25475 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
25476 | *) f=$$p;; \ | ||
25477 | esac; | ||
25478 | -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
25479 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
25480 | +am__install_max = 40 | ||
25481 | +am__nobase_strip_setup = \ | ||
25482 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
25483 | +am__nobase_strip = \ | ||
25484 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
25485 | +am__nobase_list = $(am__nobase_strip_setup); \ | ||
25486 | + for p in $$list; do echo "$$p $$p"; done | \ | ||
25487 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
25488 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
25489 | + if (++n[$$2] == $(am__install_max)) \ | ||
25490 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
25491 | + END { for (dir in files) print dir, files[dir] }' | ||
25492 | +am__base_list = \ | ||
25493 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
25494 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
25495 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
25496 | distclean-recursive maintainer-clean-recursive | ||
25497 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
25498 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
25499 | + distdir | ||
25500 | ETAGS = etags | ||
25501 | CTAGS = ctags | ||
25502 | DIST_SUBDIRS = $(SUBDIRS) | ||
25503 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
25504 | +am__relativize = \ | ||
25505 | + dir0=`pwd`; \ | ||
25506 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
25507 | + sed_rest='s,^[^/]*/*,,'; \ | ||
25508 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
25509 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
25510 | + while test -n "$$dir1"; do \ | ||
25511 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
25512 | + if test "$$first" != "."; then \ | ||
25513 | + if test "$$first" = ".."; then \ | ||
25514 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
25515 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
25516 | + else \ | ||
25517 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
25518 | + if test "$$first2" = "$$first"; then \ | ||
25519 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
25520 | + else \ | ||
25521 | + dir2="../$$dir2"; \ | ||
25522 | + fi; \ | ||
25523 | + dir0="$$dir0"/"$$first"; \ | ||
25524 | + fi; \ | ||
25525 | + fi; \ | ||
25526 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
25527 | + done; \ | ||
25528 | + reldir="$$dir2" | ||
25529 | ACLOCAL = @ACLOCAL@ | ||
25530 | ALLOCA = @ALLOCA@ | ||
25531 | AMTAR = @AMTAR@ | ||
25532 | @@ -157,6 +203,7 @@ | ||
25533 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
25534 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
25535 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
25536 | +PACKAGE_URL = @PACKAGE_URL@ | ||
25537 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
25538 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
25539 | POW_LIB = @POW_LIB@ | ||
25540 | @@ -255,9 +302,9 @@ | ||
25541 | exit 1;; \ | ||
25542 | esac; \ | ||
25543 | done; \ | ||
25544 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ | ||
25545 | - cd $(top_srcdir) && \ | ||
25546 | - $(AUTOMAKE) --gnu doc/Makefile | ||
25547 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ | ||
25548 | + $(am__cd) $(top_srcdir) && \ | ||
25549 | + $(AUTOMAKE) --gnu doc/Makefile | ||
25550 | .PRECIOUS: Makefile | ||
25551 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
25552 | @case '$?' in \ | ||
25553 | @@ -275,6 +322,7 @@ | ||
25554 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
25555 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
25556 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
25557 | +$(am__aclocal_m4_deps): | ||
25558 | |||
25559 | mostlyclean-libtool: | ||
25560 | -rm -f *.lo | ||
25561 | @@ -284,7 +332,7 @@ | ||
25562 | |||
25563 | .texi.info: | ||
25564 | restore=: && backupdir="$(am__leading_dot)am$$$$" && \ | ||
25565 | - am__cwd=`pwd` && cd $(srcdir) && \ | ||
25566 | + am__cwd=`pwd` && $(am__cd) $(srcdir) && \ | ||
25567 | rm -rf $$backupdir && mkdir $$backupdir && \ | ||
25568 | if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ | ||
25569 | for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ | ||
25570 | @@ -296,10 +344,10 @@ | ||
25571 | -o $@ $<; \ | ||
25572 | then \ | ||
25573 | rc=0; \ | ||
25574 | - cd $(srcdir); \ | ||
25575 | + $(am__cd) $(srcdir); \ | ||
25576 | else \ | ||
25577 | rc=$$?; \ | ||
25578 | - cd $(srcdir) && \ | ||
25579 | + $(am__cd) $(srcdir) && \ | ||
25580 | $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ | ||
25581 | fi; \ | ||
25582 | rm -rf $$backupdir; exit $$rc | ||
25583 | @@ -354,16 +402,18 @@ | ||
25584 | |||
25585 | uninstall-dvi-am: | ||
25586 | @$(NORMAL_UNINSTALL) | ||
25587 | - @list='$(DVIS)'; for p in $$list; do \ | ||
25588 | - f=$(am__strip_dir) \ | ||
25589 | + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ | ||
25590 | + for p in $$list; do \ | ||
25591 | + $(am__strip_dir) \ | ||
25592 | echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ | ||
25593 | rm -f "$(DESTDIR)$(dvidir)/$$f"; \ | ||
25594 | done | ||
25595 | |||
25596 | uninstall-html-am: | ||
25597 | @$(NORMAL_UNINSTALL) | ||
25598 | - @list='$(HTMLS)'; for p in $$list; do \ | ||
25599 | - f=$(am__strip_dir) \ | ||
25600 | + @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \ | ||
25601 | + for p in $$list; do \ | ||
25602 | + $(am__strip_dir) \ | ||
25603 | echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ | ||
25604 | rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ | ||
25605 | done | ||
25606 | @@ -377,7 +427,8 @@ | ||
25607 | for file in $$list; do \ | ||
25608 | relfile=`echo "$$file" | sed 's|^.*/||'`; \ | ||
25609 | echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ | ||
25610 | - install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ | ||
25611 | + if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ | ||
25612 | + then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \ | ||
25613 | done; \ | ||
25614 | else :; fi | ||
25615 | @$(NORMAL_UNINSTALL) | ||
25616 | @@ -393,16 +444,18 @@ | ||
25617 | |||
25618 | uninstall-pdf-am: | ||
25619 | @$(NORMAL_UNINSTALL) | ||
25620 | - @list='$(PDFS)'; for p in $$list; do \ | ||
25621 | - f=$(am__strip_dir) \ | ||
25622 | + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ | ||
25623 | + for p in $$list; do \ | ||
25624 | + $(am__strip_dir) \ | ||
25625 | echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ | ||
25626 | rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ | ||
25627 | done | ||
25628 | |||
25629 | uninstall-ps-am: | ||
25630 | @$(NORMAL_UNINSTALL) | ||
25631 | - @list='$(PSS)'; for p in $$list; do \ | ||
25632 | - f=$(am__strip_dir) \ | ||
25633 | + @list='$(PSS)'; test -n "$(psdir)" || list=; \ | ||
25634 | + for p in $$list; do \ | ||
25635 | + $(am__strip_dir) \ | ||
25636 | echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ | ||
25637 | rm -f "$(DESTDIR)$(psdir)/$$f"; \ | ||
25638 | done | ||
25639 | @@ -419,8 +472,8 @@ | ||
25640 | for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ | ||
25641 | if test -f $$file; then \ | ||
25642 | relfile=`expr "$$file" : "$$d/\(.*\)"`; \ | ||
25643 | - test -f $(distdir)/$$relfile || \ | ||
25644 | - cp -p $$file $(distdir)/$$relfile; \ | ||
25645 | + test -f "$(distdir)/$$relfile" || \ | ||
25646 | + cp -p $$file "$(distdir)/$$relfile"; \ | ||
25647 | else :; fi; \ | ||
25648 | done; \ | ||
25649 | done | ||
25650 | @@ -428,8 +481,11 @@ | ||
25651 | mostlyclean-aminfo: | ||
25652 | -rm -rf fftw3.aux fftw3.cp fftw3.cps fftw3.ct fftw3.fc fftw3.ff fftw3.fn \ | ||
25653 | fftw3.fns fftw3.fp fftw3.ky fftw3.kys fftw3.log fftw3.pg \ | ||
25654 | - fftw3.tmp fftw3.toc fftw3.tp fftw3.vr fftw3.dvi fftw3.pdf \ | ||
25655 | - fftw3.ps fftw3.html | ||
25656 | + fftw3.tmp fftw3.toc fftw3.tp fftw3.vr | ||
25657 | + | ||
25658 | +clean-aminfo: | ||
25659 | + -test -z "fftw3.dvi fftw3.pdf fftw3.ps fftw3.html" \ | ||
25660 | + || rm -rf fftw3.dvi fftw3.pdf fftw3.ps fftw3.html | ||
25661 | |||
25662 | maintainer-clean-aminfo: | ||
25663 | @list='$(INFO_DEPS)'; for i in $$list; do \ | ||
25664 | @@ -445,7 +501,7 @@ | ||
25665 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
25666 | # (2) otherwise, pass the desired values on the `make' command line. | ||
25667 | $(RECURSIVE_TARGETS): | ||
25668 | - @failcom='exit 1'; \ | ||
25669 | + @fail= failcom='exit 1'; \ | ||
25670 | for f in x $$MAKEFLAGS; do \ | ||
25671 | case $$f in \ | ||
25672 | *=* | --[!k]*);; \ | ||
25673 | @@ -462,7 +518,7 @@ | ||
25674 | else \ | ||
25675 | local_target="$$target"; \ | ||
25676 | fi; \ | ||
25677 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25678 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25679 | || eval $$failcom; \ | ||
25680 | done; \ | ||
25681 | if test "$$dot_seen" = "no"; then \ | ||
25682 | @@ -470,7 +526,7 @@ | ||
25683 | fi; test -z "$$fail" | ||
25684 | |||
25685 | $(RECURSIVE_CLEAN_TARGETS): | ||
25686 | - @failcom='exit 1'; \ | ||
25687 | + @fail= failcom='exit 1'; \ | ||
25688 | for f in x $$MAKEFLAGS; do \ | ||
25689 | case $$f in \ | ||
25690 | *=* | --[!k]*);; \ | ||
25691 | @@ -496,16 +552,16 @@ | ||
25692 | else \ | ||
25693 | local_target="$$target"; \ | ||
25694 | fi; \ | ||
25695 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25696 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
25697 | || eval $$failcom; \ | ||
25698 | done && test -z "$$fail" | ||
25699 | tags-recursive: | ||
25700 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
25701 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
25702 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
25703 | done | ||
25704 | ctags-recursive: | ||
25705 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
25706 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
25707 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
25708 | done | ||
25709 | |||
25710 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
25711 | @@ -520,7 +576,7 @@ | ||
25712 | |||
25713 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
25714 | $(TAGS_FILES) $(LISP) | ||
25715 | - tags=; \ | ||
25716 | + set x; \ | ||
25717 | here=`pwd`; \ | ||
25718 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
25719 | include_option=--etags-include; \ | ||
25720 | @@ -532,7 +588,7 @@ | ||
25721 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
25722 | if test "$$subdir" = .; then :; else \ | ||
25723 | test ! -f $$subdir/TAGS || \ | ||
25724 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
25725 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
25726 | fi; \ | ||
25727 | done; \ | ||
25728 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
25729 | @@ -541,29 +597,34 @@ | ||
25730 | done | \ | ||
25731 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
25732 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
25733 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
25734 | + shift; \ | ||
25735 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
25736 | test -n "$$unique" || unique=$$empty_fix; \ | ||
25737 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
25738 | - $$tags $$unique; \ | ||
25739 | + if test $$# -gt 0; then \ | ||
25740 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
25741 | + "$$@" $$unique; \ | ||
25742 | + else \ | ||
25743 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
25744 | + $$unique; \ | ||
25745 | + fi; \ | ||
25746 | fi | ||
25747 | ctags: CTAGS | ||
25748 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
25749 | $(TAGS_FILES) $(LISP) | ||
25750 | - tags=; \ | ||
25751 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
25752 | unique=`for i in $$list; do \ | ||
25753 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
25754 | done | \ | ||
25755 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
25756 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
25757 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
25758 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
25759 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
25760 | - $$tags $$unique | ||
25761 | + $$unique | ||
25762 | |||
25763 | GTAGS: | ||
25764 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
25765 | - && cd $(top_srcdir) \ | ||
25766 | - && gtags -i $(GTAGS_ARGS) $$here | ||
25767 | + && $(am__cd) $(top_srcdir) \ | ||
25768 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
25769 | |||
25770 | distclean-tags: | ||
25771 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
25772 | @@ -584,29 +645,44 @@ | ||
25773 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
25774 | if test -d $$d/$$file; then \ | ||
25775 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
25776 | + if test -d "$(distdir)/$$file"; then \ | ||
25777 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
25778 | + fi; \ | ||
25779 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
25780 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
25781 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
25782 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
25783 | fi; \ | ||
25784 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
25785 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
25786 | else \ | ||
25787 | - test -f $(distdir)/$$file \ | ||
25788 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
25789 | + test -f "$(distdir)/$$file" \ | ||
25790 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
25791 | || exit 1; \ | ||
25792 | fi; \ | ||
25793 | done | ||
25794 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
25795 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
25796 | if test "$$subdir" = .; then :; else \ | ||
25797 | test -d "$(distdir)/$$subdir" \ | ||
25798 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
25799 | || exit 1; \ | ||
25800 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
25801 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
25802 | - (cd $$subdir && \ | ||
25803 | + fi; \ | ||
25804 | + done | ||
25805 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
25806 | + if test "$$subdir" = .; then :; else \ | ||
25807 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
25808 | + $(am__relativize); \ | ||
25809 | + new_distdir=$$reldir; \ | ||
25810 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
25811 | + $(am__relativize); \ | ||
25812 | + new_top_distdir=$$reldir; \ | ||
25813 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
25814 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
25815 | + ($(am__cd) $$subdir && \ | ||
25816 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
25817 | - top_distdir="$$top_distdir" \ | ||
25818 | - distdir="$$distdir/$$subdir" \ | ||
25819 | + top_distdir="$$new_top_distdir" \ | ||
25820 | + distdir="$$new_distdir" \ | ||
25821 | am__remove_distdir=: \ | ||
25822 | am__skip_length_check=: \ | ||
25823 | + am__skip_mode_fix=: \ | ||
25824 | distdir) \ | ||
25825 | || exit 1; \ | ||
25826 | fi; \ | ||
25827 | @@ -642,13 +718,15 @@ | ||
25828 | |||
25829 | distclean-generic: | ||
25830 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
25831 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
25832 | |||
25833 | maintainer-clean-generic: | ||
25834 | @echo "This command is intended for maintainers to use" | ||
25835 | @echo "it deletes files that may require special tools to rebuild." | ||
25836 | clean: clean-recursive | ||
25837 | |||
25838 | -clean-am: clean-generic clean-libtool clean-local mostlyclean-am | ||
25839 | +clean-am: clean-aminfo clean-generic clean-libtool clean-local \ | ||
25840 | + mostlyclean-am | ||
25841 | |||
25842 | distclean: distclean-recursive | ||
25843 | -rm -f Makefile | ||
25844 | @@ -671,11 +749,14 @@ | ||
25845 | install-dvi-am: $(DVIS) | ||
25846 | @$(NORMAL_INSTALL) | ||
25847 | test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" | ||
25848 | - @list='$(DVIS)'; for p in $$list; do \ | ||
25849 | + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ | ||
25850 | + for p in $$list; do \ | ||
25851 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
25852 | - f=$(am__strip_dir) \ | ||
25853 | - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \ | ||
25854 | - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \ | ||
25855 | + echo "$$d$$p"; \ | ||
25856 | + done | $(am__base_list) | \ | ||
25857 | + while read files; do \ | ||
25858 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ | ||
25859 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ | ||
25860 | done | ||
25861 | install-exec-am: | ||
25862 | |||
25863 | @@ -684,26 +765,31 @@ | ||
25864 | install-html-am: $(HTMLS) | ||
25865 | @$(NORMAL_INSTALL) | ||
25866 | test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" | ||
25867 | - @list='$(HTMLS)'; for p in $$list; do \ | ||
25868 | + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ | ||
25869 | + for p in $$list; do \ | ||
25870 | if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
25871 | - f=$(am__strip_dir) \ | ||
25872 | + $(am__strip_dir) \ | ||
25873 | if test -d "$$d$$p"; then \ | ||
25874 | echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ | ||
25875 | $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ | ||
25876 | echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ | ||
25877 | - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ | ||
25878 | + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ | ||
25879 | else \ | ||
25880 | - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ | ||
25881 | - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ | ||
25882 | + list2="$$list2 $$d$$p"; \ | ||
25883 | fi; \ | ||
25884 | - done | ||
25885 | + done; \ | ||
25886 | + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ | ||
25887 | + while read files; do \ | ||
25888 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ | ||
25889 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ | ||
25890 | + done; } | ||
25891 | install-info: install-info-recursive | ||
25892 | |||
25893 | install-info-am: $(INFO_DEPS) | ||
25894 | @$(NORMAL_INSTALL) | ||
25895 | test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" | ||
25896 | @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | ||
25897 | - list='$(INFO_DEPS)'; \ | ||
25898 | + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ | ||
25899 | for file in $$list; do \ | ||
25900 | case $$file in \ | ||
25901 | $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | ||
25902 | @@ -711,18 +797,19 @@ | ||
25903 | if test -f $$file; then d=.; else d=$(srcdir); fi; \ | ||
25904 | file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ | ||
25905 | for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ | ||
25906 | - $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ | ||
25907 | + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ | ||
25908 | if test -f $$ifile; then \ | ||
25909 | - relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ | ||
25910 | - echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \ | ||
25911 | - $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \ | ||
25912 | + echo "$$ifile"; \ | ||
25913 | else : ; fi; \ | ||
25914 | done; \ | ||
25915 | - done | ||
25916 | + done | $(am__base_list) | \ | ||
25917 | + while read files; do \ | ||
25918 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ | ||
25919 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done | ||
25920 | @$(POST_INSTALL) | ||
25921 | @if (install-info --version && \ | ||
25922 | install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ | ||
25923 | - list='$(INFO_DEPS)'; \ | ||
25924 | + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ | ||
25925 | for file in $$list; do \ | ||
25926 | relfile=`echo "$$file" | sed 's|^.*/||'`; \ | ||
25927 | echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ | ||
25928 | @@ -736,23 +823,27 @@ | ||
25929 | install-pdf-am: $(PDFS) | ||
25930 | @$(NORMAL_INSTALL) | ||
25931 | test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" | ||
25932 | - @list='$(PDFS)'; for p in $$list; do \ | ||
25933 | + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ | ||
25934 | + for p in $$list; do \ | ||
25935 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
25936 | - f=$(am__strip_dir) \ | ||
25937 | - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ | ||
25938 | - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ | ||
25939 | - done | ||
25940 | + echo "$$d$$p"; \ | ||
25941 | + done | $(am__base_list) | \ | ||
25942 | + while read files; do \ | ||
25943 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ | ||
25944 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done | ||
25945 | install-ps: install-ps-recursive | ||
25946 | |||
25947 | install-ps-am: $(PSS) | ||
25948 | @$(NORMAL_INSTALL) | ||
25949 | test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" | ||
25950 | - @list='$(PSS)'; for p in $$list; do \ | ||
25951 | + @list='$(PSS)'; test -n "$(psdir)" || list=; \ | ||
25952 | + for p in $$list; do \ | ||
25953 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
25954 | - f=$(am__strip_dir) \ | ||
25955 | - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \ | ||
25956 | - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \ | ||
25957 | - done | ||
25958 | + echo "$$d$$p"; \ | ||
25959 | + done | $(am__base_list) | \ | ||
25960 | + while read files; do \ | ||
25961 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ | ||
25962 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done | ||
25963 | installcheck-am: | ||
25964 | |||
25965 | maintainer-clean: maintainer-clean-recursive | ||
25966 | @@ -776,20 +867,20 @@ | ||
25967 | uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ | ||
25968 | uninstall-pdf-am uninstall-ps-am | ||
25969 | |||
25970 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
25971 | - install-strip | ||
25972 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
25973 | + install-am install-strip tags-recursive | ||
25974 | |||
25975 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
25976 | - all all-am check check-am clean clean-generic clean-libtool \ | ||
25977 | - clean-local ctags ctags-recursive dist-info distclean \ | ||
25978 | - distclean-generic distclean-libtool distclean-tags distdir dvi \ | ||
25979 | - dvi-am html html-am info info-am install install-am \ | ||
25980 | - install-data install-data-am install-dvi install-dvi-am \ | ||
25981 | - install-exec install-exec-am install-html install-html-am \ | ||
25982 | - install-info install-info-am install-man install-pdf \ | ||
25983 | - install-pdf-am install-ps install-ps-am install-strip \ | ||
25984 | - installcheck installcheck-am installdirs installdirs-am \ | ||
25985 | - maintainer-clean maintainer-clean-aminfo \ | ||
25986 | + all all-am check check-am clean clean-aminfo clean-generic \ | ||
25987 | + clean-libtool clean-local ctags ctags-recursive dist-info \ | ||
25988 | + distclean distclean-generic distclean-libtool distclean-tags \ | ||
25989 | + distdir dvi dvi-am html html-am info info-am install \ | ||
25990 | + install-am install-data install-data-am install-dvi \ | ||
25991 | + install-dvi-am install-exec install-exec-am install-html \ | ||
25992 | + install-html-am install-info install-info-am install-man \ | ||
25993 | + install-pdf install-pdf-am install-ps install-ps-am \ | ||
25994 | + install-strip installcheck installcheck-am installdirs \ | ||
25995 | + installdirs-am maintainer-clean maintainer-clean-aminfo \ | ||
25996 | maintainer-clean-generic maintainer-clean-vti mostlyclean \ | ||
25997 | mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool \ | ||
25998 | mostlyclean-vti pdf pdf-am ps ps-am tags tags-recursive \ | ||
25999 | @@ -817,6 +908,7 @@ | ||
26000 | |||
26001 | clean-local: | ||
26002 | rm -f *.html | ||
26003 | + | ||
26004 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
26005 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
26006 | .NOEXPORT: | ||
26007 | diff -Nurd fftw-3.2.2/genfft/Makefile.in fftw-3.2.2-arm-beta1/genfft/Makefile.in | ||
26008 | --- fftw-3.2.2/genfft/Makefile.in 2009-07-12 12:37:06.000000000 +0200 | ||
26009 | +++ fftw-3.2.2-arm-beta1/genfft/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
26010 | @@ -1,8 +1,9 @@ | ||
26011 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
26012 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
26013 | # @configure_input@ | ||
26014 | |||
26015 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
26016 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
26017 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
26018 | +# Inc. | ||
26019 | # This Makefile.in is free software; the Free Software Foundation | ||
26020 | # gives unlimited permission to copy and/or distribute it, | ||
26021 | # with or without modifications, as long as this notice is preserved. | ||
26022 | @@ -18,8 +19,9 @@ | ||
26023 | |||
26024 | VPATH = @srcdir@ | ||
26025 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
26026 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
26027 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
26028 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
26029 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
26030 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
26031 | install_sh_DATA = $(install_sh) -c -m 644 | ||
26032 | install_sh_PROGRAM = $(install_sh) -c | ||
26033 | @@ -56,6 +58,7 @@ | ||
26034 | mkinstalldirs = $(install_sh) -d | ||
26035 | CONFIG_HEADER = $(top_builddir)/config.h | ||
26036 | CONFIG_CLEAN_FILES = | ||
26037 | +CONFIG_CLEAN_VPATH_FILES = | ||
26038 | SCRIPTS = $(noinst_SCRIPTS) | ||
26039 | SOURCES = | ||
26040 | DIST_SOURCES = | ||
26041 | @@ -130,6 +133,7 @@ | ||
26042 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
26043 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
26044 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
26045 | +PACKAGE_URL = @PACKAGE_URL@ | ||
26046 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
26047 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
26048 | POW_LIB = @POW_LIB@ | ||
26049 | @@ -262,9 +266,9 @@ | ||
26050 | exit 1;; \ | ||
26051 | esac; \ | ||
26052 | done; \ | ||
26053 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu genfft/Makefile'; \ | ||
26054 | - cd $(top_srcdir) && \ | ||
26055 | - $(AUTOMAKE) --gnu genfft/Makefile | ||
26056 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu genfft/Makefile'; \ | ||
26057 | + $(am__cd) $(top_srcdir) && \ | ||
26058 | + $(AUTOMAKE) --gnu genfft/Makefile | ||
26059 | .PRECIOUS: Makefile | ||
26060 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
26061 | @case '$?' in \ | ||
26062 | @@ -282,6 +286,7 @@ | ||
26063 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26064 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
26065 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26066 | +$(am__aclocal_m4_deps): | ||
26067 | |||
26068 | mostlyclean-libtool: | ||
26069 | -rm -f *.lo | ||
26070 | @@ -311,13 +316,17 @@ | ||
26071 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
26072 | if test -d $$d/$$file; then \ | ||
26073 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
26074 | + if test -d "$(distdir)/$$file"; then \ | ||
26075 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26076 | + fi; \ | ||
26077 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
26078 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
26079 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
26080 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26081 | fi; \ | ||
26082 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
26083 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
26084 | else \ | ||
26085 | - test -f $(distdir)/$$file \ | ||
26086 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
26087 | + test -f "$(distdir)/$$file" \ | ||
26088 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
26089 | || exit 1; \ | ||
26090 | fi; \ | ||
26091 | done | ||
26092 | @@ -345,6 +354,7 @@ | ||
26093 | |||
26094 | distclean-generic: | ||
26095 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
26096 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
26097 | |||
26098 | maintainer-clean-generic: | ||
26099 | @echo "This command is intended for maintainers to use" | ||
26100 | @@ -363,6 +373,8 @@ | ||
26101 | |||
26102 | html: html-am | ||
26103 | |||
26104 | +html-am: | ||
26105 | + | ||
26106 | info: info-am | ||
26107 | |||
26108 | info-am: | ||
26109 | @@ -371,18 +383,28 @@ | ||
26110 | |||
26111 | install-dvi: install-dvi-am | ||
26112 | |||
26113 | +install-dvi-am: | ||
26114 | + | ||
26115 | install-exec-am: | ||
26116 | |||
26117 | install-html: install-html-am | ||
26118 | |||
26119 | +install-html-am: | ||
26120 | + | ||
26121 | install-info: install-info-am | ||
26122 | |||
26123 | +install-info-am: | ||
26124 | + | ||
26125 | install-man: | ||
26126 | |||
26127 | install-pdf: install-pdf-am | ||
26128 | |||
26129 | +install-pdf-am: | ||
26130 | + | ||
26131 | install-ps: install-ps-am | ||
26132 | |||
26133 | +install-ps-am: | ||
26134 | + | ||
26135 | installcheck-am: | ||
26136 | |||
26137 | maintainer-clean: maintainer-clean-am | ||
26138 | @@ -642,6 +664,7 @@ | ||
26139 | util.cmx: magic.cmx util.cmi | ||
26140 | variable.cmo: unique.cmi magic.cmo variable.cmi | ||
26141 | variable.cmx: unique.cmx magic.cmx variable.cmi | ||
26142 | + | ||
26143 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
26144 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
26145 | .NOEXPORT: | ||
26146 | diff -Nurd fftw-3.2.2/kernel/cycle.h fftw-3.2.2-arm-beta1/kernel/cycle.h | ||
26147 | --- fftw-3.2.2/kernel/cycle.h 2009-07-12 12:35:49.000000000 +0200 | ||
26148 | +++ fftw-3.2.2-arm-beta1/kernel/cycle.h 2011-04-05 15:00:33.000000000 +0200 | ||
26149 | @@ -400,7 +400,67 @@ | ||
26150 | |||
26151 | #define HAVE_TICK_COUNTER | ||
26152 | #endif | ||
26153 | +/*----------------------------------------------------------------*/ | ||
26154 | +#if defined(__GNUC__) && defined(__arm__) && defined(HAVE_ARM_CYCLE_COUNTER) && !defined(HAVE_TICK_COUNTER) | ||
26155 | +/* | ||
26156 | + * ARM cycle counter; WARNING: many Linux distributions do not reliably enable user-mode access | ||
26157 | + */ | ||
26158 | +typedef unsigned int ticks; | ||
26159 | + | ||
26160 | +static __inline__ ticks getticks(void) | ||
26161 | +{ | ||
26162 | + unsigned cc; | ||
26163 | + static int init = 0; | ||
26164 | + if(!init) { | ||
26165 | + __asm__ __volatile__ ("mcr p15, 0, %0, c9, c12, 2" :: "r"(1<<31)); /* stop the cc */ | ||
26166 | + __asm__ __volatile__ ("mcr p15, 0, %0, c9, c12, 0" :: "r"(5)); /* initialize */ | ||
26167 | + __asm__ __volatile__ ("mcr p15, 0, %0, c9, c12, 1" :: "r"(1<<31)); /* start the cc */ | ||
26168 | + init = 1; | ||
26169 | + } | ||
26170 | + __asm__ __volatile__ ("mrc p15, 0, %0, c9, c13, 0" : "=r"(cc)); | ||
26171 | + return cc; | ||
26172 | +} | ||
26173 | + | ||
26174 | +INLINE_ELAPSED(__inline__) | ||
26175 | + | ||
26176 | +#define HAVE_TICK_COUNTER | ||
26177 | +#endif | ||
26178 | +/*----------------------------------------------------------------*/ | ||
26179 | +#if defined(HAVE_PERF_EVENTS) | ||
26180 | +#if defined(__linux__) && defined(HAVE_SYS_SYSCALL_H) && defined(HAVE_LINUX_PERF_EVENT_H) && !defined(HAVE_TICK_COUNTER) | ||
26181 | +/* | ||
26182 | + * Linux perf events subsystem; present on multiple architectures since 2.6.31 | ||
26183 | + * (requires a kernel compiled with perf events enabled) | ||
26184 | + */ | ||
26185 | +#include <assert.h> | ||
26186 | +#include <sys/syscall.h> | ||
26187 | +#include <linux/perf_event.h> | ||
26188 | + | ||
26189 | +typedef unsigned long long ticks; | ||
26190 | + | ||
26191 | +static __inline__ ticks getticks(void) | ||
26192 | +{ | ||
26193 | + static int fd,init = 0; | ||
26194 | + static struct perf_event_attr attr; | ||
26195 | + static unsigned long long buffer; | ||
26196 | + | ||
26197 | + if(!init) { | ||
26198 | + attr.type = PERF_TYPE_HARDWARE; | ||
26199 | + attr.config = PERF_COUNT_HW_CPU_CYCLES; | ||
26200 | + fd = syscall(__NR_perf_event_open, &attr, 0, -1, -1, 0); | ||
26201 | + assert(fd >= 0); | ||
26202 | + init = 1; | ||
26203 | + } | ||
26204 | |||
26205 | + read(fd,&buffer,sizeof(unsigned long long)); | ||
26206 | + return buffer; | ||
26207 | +} | ||
26208 | + | ||
26209 | +INLINE_ELAPSED(__inline__) | ||
26210 | + | ||
26211 | +#define HAVE_TICK_COUNTER | ||
26212 | +#endif | ||
26213 | +#endif /* HAVE_PERF_EVENTS */ | ||
26214 | /*----------------------------------------------------------------*/ | ||
26215 | #if defined(__GNUC__) && defined(__sparc_v9__) && !defined(HAVE_TICK_COUNTER) | ||
26216 | typedef unsigned long ticks; | ||
26217 | diff -Nurd fftw-3.2.2/kernel/ifftw.h fftw-3.2.2-arm-beta1/kernel/ifftw.h | ||
26218 | --- fftw-3.2.2/kernel/ifftw.h 2009-07-12 12:35:49.000000000 +0200 | ||
26219 | +++ fftw-3.2.2-arm-beta1/kernel/ifftw.h 2011-03-26 20:20:11.000000000 +0100 | ||
26220 | @@ -87,7 +87,7 @@ | ||
26221 | #define STRINGIZE(x) STRINGIZEx(x) | ||
26222 | |||
26223 | #if defined(HAVE_SSE) || defined(HAVE_SSE2) || defined(HAVE_ALTIVEC) || \ | ||
26224 | - defined(HAVE_MIPS_PS) | ||
26225 | + defined(HAVE_MIPS_PS) || defined(HAVE_NEON) | ||
26226 | #define HAVE_SIMD 1 | ||
26227 | #else | ||
26228 | #define HAVE_SIMD 0 | ||
26229 | diff -Nurd fftw-3.2.2/kernel/Makefile.in fftw-3.2.2-arm-beta1/kernel/Makefile.in | ||
26230 | --- fftw-3.2.2/kernel/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
26231 | +++ fftw-3.2.2-arm-beta1/kernel/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
26232 | @@ -1,8 +1,9 @@ | ||
26233 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
26234 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
26235 | # @configure_input@ | ||
26236 | |||
26237 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
26238 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
26239 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
26240 | +# Inc. | ||
26241 | # This Makefile.in is free software; the Free Software Foundation | ||
26242 | # gives unlimited permission to copy and/or distribute it, | ||
26243 | # with or without modifications, as long as this notice is preserved. | ||
26244 | @@ -16,8 +17,9 @@ | ||
26245 | |||
26246 | VPATH = @srcdir@ | ||
26247 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
26248 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
26249 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
26250 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
26251 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
26252 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
26253 | install_sh_DATA = $(install_sh) -c -m 644 | ||
26254 | install_sh_PROGRAM = $(install_sh) -c | ||
26255 | @@ -53,6 +55,7 @@ | ||
26256 | mkinstalldirs = $(install_sh) -d | ||
26257 | CONFIG_HEADER = $(top_builddir)/config.h | ||
26258 | CONFIG_CLEAN_FILES = | ||
26259 | +CONFIG_CLEAN_VPATH_FILES = | ||
26260 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
26261 | libkernel_la_LIBADD = | ||
26262 | am_libkernel_la_OBJECTS = align.lo alloc.lo assert.lo awake.lo \ | ||
26263 | @@ -67,6 +70,7 @@ | ||
26264 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
26265 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
26266 | am__depfiles_maybe = depfiles | ||
26267 | +am__mv = mv -f | ||
26268 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
26269 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
26270 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
26271 | @@ -151,6 +155,7 @@ | ||
26272 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
26273 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
26274 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
26275 | +PACKAGE_URL = @PACKAGE_URL@ | ||
26276 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
26277 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
26278 | POW_LIB = @POW_LIB@ | ||
26279 | @@ -252,9 +257,9 @@ | ||
26280 | exit 1;; \ | ||
26281 | esac; \ | ||
26282 | done; \ | ||
26283 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kernel/Makefile'; \ | ||
26284 | - cd $(top_srcdir) && \ | ||
26285 | - $(AUTOMAKE) --gnu kernel/Makefile | ||
26286 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kernel/Makefile'; \ | ||
26287 | + $(am__cd) $(top_srcdir) && \ | ||
26288 | + $(AUTOMAKE) --gnu kernel/Makefile | ||
26289 | .PRECIOUS: Makefile | ||
26290 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
26291 | @case '$?' in \ | ||
26292 | @@ -272,6 +277,7 @@ | ||
26293 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26294 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
26295 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26296 | +$(am__aclocal_m4_deps): | ||
26297 | |||
26298 | clean-noinstLTLIBRARIES: | ||
26299 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
26300 | @@ -336,21 +342,21 @@ | ||
26301 | |||
26302 | .c.o: | ||
26303 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
26304 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26305 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26306 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
26307 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
26308 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
26309 | |||
26310 | .c.obj: | ||
26311 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
26312 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26313 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26314 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
26315 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
26316 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
26317 | |||
26318 | .c.lo: | ||
26319 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
26320 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
26321 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
26322 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
26323 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
26324 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
26325 | @@ -373,7 +379,7 @@ | ||
26326 | |||
26327 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
26328 | $(TAGS_FILES) $(LISP) | ||
26329 | - tags=; \ | ||
26330 | + set x; \ | ||
26331 | here=`pwd`; \ | ||
26332 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
26333 | unique=`for i in $$list; do \ | ||
26334 | @@ -381,29 +387,34 @@ | ||
26335 | done | \ | ||
26336 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
26337 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
26338 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
26339 | + shift; \ | ||
26340 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
26341 | test -n "$$unique" || unique=$$empty_fix; \ | ||
26342 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
26343 | - $$tags $$unique; \ | ||
26344 | + if test $$# -gt 0; then \ | ||
26345 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
26346 | + "$$@" $$unique; \ | ||
26347 | + else \ | ||
26348 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
26349 | + $$unique; \ | ||
26350 | + fi; \ | ||
26351 | fi | ||
26352 | ctags: CTAGS | ||
26353 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
26354 | $(TAGS_FILES) $(LISP) | ||
26355 | - tags=; \ | ||
26356 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
26357 | unique=`for i in $$list; do \ | ||
26358 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
26359 | done | \ | ||
26360 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
26361 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
26362 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
26363 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
26364 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
26365 | - $$tags $$unique | ||
26366 | + $$unique | ||
26367 | |||
26368 | GTAGS: | ||
26369 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
26370 | - && cd $(top_srcdir) \ | ||
26371 | - && gtags -i $(GTAGS_ARGS) $$here | ||
26372 | + && $(am__cd) $(top_srcdir) \ | ||
26373 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
26374 | |||
26375 | distclean-tags: | ||
26376 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
26377 | @@ -424,13 +435,17 @@ | ||
26378 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
26379 | if test -d $$d/$$file; then \ | ||
26380 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
26381 | + if test -d "$(distdir)/$$file"; then \ | ||
26382 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26383 | + fi; \ | ||
26384 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
26385 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
26386 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
26387 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26388 | fi; \ | ||
26389 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
26390 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
26391 | else \ | ||
26392 | - test -f $(distdir)/$$file \ | ||
26393 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
26394 | + test -f "$(distdir)/$$file" \ | ||
26395 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
26396 | || exit 1; \ | ||
26397 | fi; \ | ||
26398 | done | ||
26399 | @@ -458,6 +473,7 @@ | ||
26400 | |||
26401 | distclean-generic: | ||
26402 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
26403 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
26404 | |||
26405 | maintainer-clean-generic: | ||
26406 | @echo "This command is intended for maintainers to use" | ||
26407 | @@ -479,6 +495,8 @@ | ||
26408 | |||
26409 | html: html-am | ||
26410 | |||
26411 | +html-am: | ||
26412 | + | ||
26413 | info: info-am | ||
26414 | |||
26415 | info-am: | ||
26416 | @@ -487,18 +505,28 @@ | ||
26417 | |||
26418 | install-dvi: install-dvi-am | ||
26419 | |||
26420 | +install-dvi-am: | ||
26421 | + | ||
26422 | install-exec-am: | ||
26423 | |||
26424 | install-html: install-html-am | ||
26425 | |||
26426 | +install-html-am: | ||
26427 | + | ||
26428 | install-info: install-info-am | ||
26429 | |||
26430 | +install-info-am: | ||
26431 | + | ||
26432 | install-man: | ||
26433 | |||
26434 | install-pdf: install-pdf-am | ||
26435 | |||
26436 | +install-pdf-am: | ||
26437 | + | ||
26438 | install-ps: install-ps-am | ||
26439 | |||
26440 | +install-ps-am: | ||
26441 | + | ||
26442 | installcheck-am: | ||
26443 | |||
26444 | maintainer-clean: maintainer-clean-am | ||
26445 | @@ -536,6 +564,7 @@ | ||
26446 | mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | ||
26447 | pdf pdf-am ps ps-am tags uninstall uninstall-am | ||
26448 | |||
26449 | + | ||
26450 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
26451 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
26452 | .NOEXPORT: | ||
26453 | diff -Nurd fftw-3.2.2/libbench2/Makefile.in fftw-3.2.2-arm-beta1/libbench2/Makefile.in | ||
26454 | --- fftw-3.2.2/libbench2/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
26455 | +++ fftw-3.2.2-arm-beta1/libbench2/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
26456 | @@ -1,8 +1,9 @@ | ||
26457 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
26458 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
26459 | # @configure_input@ | ||
26460 | |||
26461 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
26462 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
26463 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
26464 | +# Inc. | ||
26465 | # This Makefile.in is free software; the Free Software Foundation | ||
26466 | # gives unlimited permission to copy and/or distribute it, | ||
26467 | # with or without modifications, as long as this notice is preserved. | ||
26468 | @@ -16,8 +17,9 @@ | ||
26469 | |||
26470 | VPATH = @srcdir@ | ||
26471 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
26472 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
26473 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
26474 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
26475 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
26476 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
26477 | install_sh_DATA = $(install_sh) -c -m 644 | ||
26478 | install_sh_PROGRAM = $(install_sh) -c | ||
26479 | @@ -53,6 +55,7 @@ | ||
26480 | mkinstalldirs = $(install_sh) -d | ||
26481 | CONFIG_HEADER = $(top_builddir)/config.h | ||
26482 | CONFIG_CLEAN_FILES = | ||
26483 | +CONFIG_CLEAN_VPATH_FILES = | ||
26484 | LIBRARIES = $(noinst_LIBRARIES) | ||
26485 | ARFLAGS = cru | ||
26486 | libbench2_a_AR = $(AR) $(ARFLAGS) | ||
26487 | @@ -75,6 +78,7 @@ | ||
26488 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
26489 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
26490 | am__depfiles_maybe = depfiles | ||
26491 | +am__mv = mv -f | ||
26492 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
26493 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
26494 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
26495 | @@ -159,6 +163,7 @@ | ||
26496 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
26497 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
26498 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
26499 | +PACKAGE_URL = @PACKAGE_URL@ | ||
26500 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
26501 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
26502 | POW_LIB = @POW_LIB@ | ||
26503 | @@ -257,9 +262,9 @@ | ||
26504 | exit 1;; \ | ||
26505 | esac; \ | ||
26506 | done; \ | ||
26507 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libbench2/Makefile'; \ | ||
26508 | - cd $(top_srcdir) && \ | ||
26509 | - $(AUTOMAKE) --gnu libbench2/Makefile | ||
26510 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libbench2/Makefile'; \ | ||
26511 | + $(am__cd) $(top_srcdir) && \ | ||
26512 | + $(AUTOMAKE) --gnu libbench2/Makefile | ||
26513 | .PRECIOUS: Makefile | ||
26514 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
26515 | @case '$?' in \ | ||
26516 | @@ -277,6 +282,7 @@ | ||
26517 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26518 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
26519 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26520 | +$(am__aclocal_m4_deps): | ||
26521 | |||
26522 | clean-noinstLIBRARIES: | ||
26523 | -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) | ||
26524 | @@ -329,21 +335,21 @@ | ||
26525 | |||
26526 | .c.o: | ||
26527 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
26528 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26529 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26530 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
26531 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
26532 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
26533 | |||
26534 | .c.obj: | ||
26535 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
26536 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26537 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
26538 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
26539 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
26540 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
26541 | |||
26542 | .c.lo: | ||
26543 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
26544 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
26545 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
26546 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
26547 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
26548 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
26549 | @@ -366,7 +372,7 @@ | ||
26550 | |||
26551 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
26552 | $(TAGS_FILES) $(LISP) | ||
26553 | - tags=; \ | ||
26554 | + set x; \ | ||
26555 | here=`pwd`; \ | ||
26556 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
26557 | unique=`for i in $$list; do \ | ||
26558 | @@ -374,29 +380,34 @@ | ||
26559 | done | \ | ||
26560 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
26561 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
26562 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
26563 | + shift; \ | ||
26564 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
26565 | test -n "$$unique" || unique=$$empty_fix; \ | ||
26566 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
26567 | - $$tags $$unique; \ | ||
26568 | + if test $$# -gt 0; then \ | ||
26569 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
26570 | + "$$@" $$unique; \ | ||
26571 | + else \ | ||
26572 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
26573 | + $$unique; \ | ||
26574 | + fi; \ | ||
26575 | fi | ||
26576 | ctags: CTAGS | ||
26577 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
26578 | $(TAGS_FILES) $(LISP) | ||
26579 | - tags=; \ | ||
26580 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
26581 | unique=`for i in $$list; do \ | ||
26582 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
26583 | done | \ | ||
26584 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
26585 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
26586 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
26587 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
26588 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
26589 | - $$tags $$unique | ||
26590 | + $$unique | ||
26591 | |||
26592 | GTAGS: | ||
26593 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
26594 | - && cd $(top_srcdir) \ | ||
26595 | - && gtags -i $(GTAGS_ARGS) $$here | ||
26596 | + && $(am__cd) $(top_srcdir) \ | ||
26597 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
26598 | |||
26599 | distclean-tags: | ||
26600 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
26601 | @@ -417,13 +428,17 @@ | ||
26602 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
26603 | if test -d $$d/$$file; then \ | ||
26604 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
26605 | + if test -d "$(distdir)/$$file"; then \ | ||
26606 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26607 | + fi; \ | ||
26608 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
26609 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
26610 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
26611 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26612 | fi; \ | ||
26613 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
26614 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
26615 | else \ | ||
26616 | - test -f $(distdir)/$$file \ | ||
26617 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
26618 | + test -f "$(distdir)/$$file" \ | ||
26619 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
26620 | || exit 1; \ | ||
26621 | fi; \ | ||
26622 | done | ||
26623 | @@ -451,6 +466,7 @@ | ||
26624 | |||
26625 | distclean-generic: | ||
26626 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
26627 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
26628 | |||
26629 | maintainer-clean-generic: | ||
26630 | @echo "This command is intended for maintainers to use" | ||
26631 | @@ -472,6 +488,8 @@ | ||
26632 | |||
26633 | html: html-am | ||
26634 | |||
26635 | +html-am: | ||
26636 | + | ||
26637 | info: info-am | ||
26638 | |||
26639 | info-am: | ||
26640 | @@ -480,18 +498,28 @@ | ||
26641 | |||
26642 | install-dvi: install-dvi-am | ||
26643 | |||
26644 | +install-dvi-am: | ||
26645 | + | ||
26646 | install-exec-am: | ||
26647 | |||
26648 | install-html: install-html-am | ||
26649 | |||
26650 | +install-html-am: | ||
26651 | + | ||
26652 | install-info: install-info-am | ||
26653 | |||
26654 | +install-info-am: | ||
26655 | + | ||
26656 | install-man: | ||
26657 | |||
26658 | install-pdf: install-pdf-am | ||
26659 | |||
26660 | +install-pdf-am: | ||
26661 | + | ||
26662 | install-ps: install-ps-am | ||
26663 | |||
26664 | +install-ps-am: | ||
26665 | + | ||
26666 | installcheck-am: | ||
26667 | |||
26668 | maintainer-clean: maintainer-clean-am | ||
26669 | @@ -535,6 +563,7 @@ | ||
26670 | |||
26671 | accuracy: all | ||
26672 | @echo "nothing to benchmark" | ||
26673 | + | ||
26674 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
26675 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
26676 | .NOEXPORT: | ||
26677 | diff -Nurd fftw-3.2.2/ltmain.sh fftw-3.2.2-arm-beta1/ltmain.sh | ||
26678 | --- fftw-3.2.2/ltmain.sh 2009-04-07 23:40:40.000000000 +0200 | ||
26679 | +++ fftw-3.2.2-arm-beta1/ltmain.sh 2011-03-26 20:21:12.000000000 +0100 | ||
26680 | @@ -1,6 +1,6 @@ | ||
26681 | # Generated from ltmain.m4sh. | ||
26682 | |||
26683 | -# ltmain.sh (GNU libtool) 2.2.6 | ||
26684 | +# ltmain.sh (GNU libtool) 2.2.6b | ||
26685 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | ||
26686 | |||
26687 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. | ||
26688 | @@ -65,7 +65,7 @@ | ||
26689 | # compiler: $LTCC | ||
26690 | # compiler flags: $LTCFLAGS | ||
26691 | # linker: $LD (gnu? $with_gnu_ld) | ||
26692 | -# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 | ||
26693 | +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 | ||
26694 | # automake: $automake_version | ||
26695 | # autoconf: $autoconf_version | ||
26696 | # | ||
26697 | @@ -73,9 +73,9 @@ | ||
26698 | |||
26699 | PROGRAM=ltmain.sh | ||
26700 | PACKAGE=libtool | ||
26701 | -VERSION="2.2.6 Debian-2.2.6a-4" | ||
26702 | +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" | ||
26703 | TIMESTAMP="" | ||
26704 | -package_revision=1.3012 | ||
26705 | +package_revision=1.3017 | ||
26706 | |||
26707 | # Be Bourne compatible | ||
26708 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
26709 | diff -Nurd fftw-3.2.2/m4/ltversion.m4 fftw-3.2.2-arm-beta1/m4/ltversion.m4 | ||
26710 | --- fftw-3.2.2/m4/ltversion.m4 2009-04-07 23:40:40.000000000 +0200 | ||
26711 | +++ fftw-3.2.2-arm-beta1/m4/ltversion.m4 2011-03-26 20:21:13.000000000 +0100 | ||
26712 | @@ -9,15 +9,15 @@ | ||
26713 | |||
26714 | # Generated from ltversion.in. | ||
26715 | |||
26716 | -# serial 3012 ltversion.m4 | ||
26717 | +# serial 3017 ltversion.m4 | ||
26718 | # This file is part of GNU Libtool | ||
26719 | |||
26720 | -m4_define([LT_PACKAGE_VERSION], [2.2.6]) | ||
26721 | -m4_define([LT_PACKAGE_REVISION], [1.3012]) | ||
26722 | +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) | ||
26723 | +m4_define([LT_PACKAGE_REVISION], [1.3017]) | ||
26724 | |||
26725 | AC_DEFUN([LTVERSION_VERSION], | ||
26726 | -[macro_version='2.2.6' | ||
26727 | -macro_revision='1.3012' | ||
26728 | +[macro_version='2.2.6b' | ||
26729 | +macro_revision='1.3017' | ||
26730 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | ||
26731 | _LT_DECL(, macro_revision, 0) | ||
26732 | ]) | ||
26733 | diff -Nurd fftw-3.2.2/m4/Makefile.in fftw-3.2.2-arm-beta1/m4/Makefile.in | ||
26734 | --- fftw-3.2.2/m4/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
26735 | +++ fftw-3.2.2-arm-beta1/m4/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
26736 | @@ -1,8 +1,9 @@ | ||
26737 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
26738 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
26739 | # @configure_input@ | ||
26740 | |||
26741 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
26742 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
26743 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
26744 | +# Inc. | ||
26745 | # This Makefile.in is free software; the Free Software Foundation | ||
26746 | # gives unlimited permission to copy and/or distribute it, | ||
26747 | # with or without modifications, as long as this notice is preserved. | ||
26748 | @@ -15,8 +16,9 @@ | ||
26749 | @SET_MAKE@ | ||
26750 | VPATH = @srcdir@ | ||
26751 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
26752 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
26753 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
26754 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
26755 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
26756 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
26757 | install_sh_DATA = $(install_sh) -c -m 644 | ||
26758 | install_sh_PROGRAM = $(install_sh) -c | ||
26759 | @@ -52,6 +54,7 @@ | ||
26760 | mkinstalldirs = $(install_sh) -d | ||
26761 | CONFIG_HEADER = $(top_builddir)/config.h | ||
26762 | CONFIG_CLEAN_FILES = | ||
26763 | +CONFIG_CLEAN_VPATH_FILES = | ||
26764 | SOURCES = | ||
26765 | DIST_SOURCES = | ||
26766 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
26767 | @@ -125,6 +128,7 @@ | ||
26768 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
26769 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
26770 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
26771 | +PACKAGE_URL = @PACKAGE_URL@ | ||
26772 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
26773 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
26774 | POW_LIB = @POW_LIB@ | ||
26775 | @@ -217,9 +221,9 @@ | ||
26776 | exit 1;; \ | ||
26777 | esac; \ | ||
26778 | done; \ | ||
26779 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ | ||
26780 | - cd $(top_srcdir) && \ | ||
26781 | - $(AUTOMAKE) --gnu m4/Makefile | ||
26782 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ | ||
26783 | + $(am__cd) $(top_srcdir) && \ | ||
26784 | + $(AUTOMAKE) --gnu m4/Makefile | ||
26785 | .PRECIOUS: Makefile | ||
26786 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
26787 | @case '$?' in \ | ||
26788 | @@ -237,6 +241,7 @@ | ||
26789 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26790 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
26791 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
26792 | +$(am__aclocal_m4_deps): | ||
26793 | |||
26794 | mostlyclean-libtool: | ||
26795 | -rm -f *.lo | ||
26796 | @@ -266,13 +271,17 @@ | ||
26797 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
26798 | if test -d $$d/$$file; then \ | ||
26799 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
26800 | + if test -d "$(distdir)/$$file"; then \ | ||
26801 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26802 | + fi; \ | ||
26803 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
26804 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
26805 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
26806 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
26807 | fi; \ | ||
26808 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
26809 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
26810 | else \ | ||
26811 | - test -f $(distdir)/$$file \ | ||
26812 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
26813 | + test -f "$(distdir)/$$file" \ | ||
26814 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
26815 | || exit 1; \ | ||
26816 | fi; \ | ||
26817 | done | ||
26818 | @@ -300,6 +309,7 @@ | ||
26819 | |||
26820 | distclean-generic: | ||
26821 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
26822 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
26823 | |||
26824 | maintainer-clean-generic: | ||
26825 | @echo "This command is intended for maintainers to use" | ||
26826 | @@ -318,6 +328,8 @@ | ||
26827 | |||
26828 | html: html-am | ||
26829 | |||
26830 | +html-am: | ||
26831 | + | ||
26832 | info: info-am | ||
26833 | |||
26834 | info-am: | ||
26835 | @@ -326,18 +338,28 @@ | ||
26836 | |||
26837 | install-dvi: install-dvi-am | ||
26838 | |||
26839 | +install-dvi-am: | ||
26840 | + | ||
26841 | install-exec-am: | ||
26842 | |||
26843 | install-html: install-html-am | ||
26844 | |||
26845 | +install-html-am: | ||
26846 | + | ||
26847 | install-info: install-info-am | ||
26848 | |||
26849 | +install-info-am: | ||
26850 | + | ||
26851 | install-man: | ||
26852 | |||
26853 | install-pdf: install-pdf-am | ||
26854 | |||
26855 | +install-pdf-am: | ||
26856 | + | ||
26857 | install-ps: install-ps-am | ||
26858 | |||
26859 | +install-ps-am: | ||
26860 | + | ||
26861 | installcheck-am: | ||
26862 | |||
26863 | maintainer-clean: maintainer-clean-am | ||
26864 | @@ -376,6 +398,7 @@ | ||
26865 | # but they don't seem to be needed for the distributed tarball | ||
26866 | # (they aren't needed for configure && make, and boostrapping | ||
26867 | # will regenerate them anyway). | ||
26868 | + | ||
26869 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
26870 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
26871 | .NOEXPORT: | ||
26872 | diff -Nurd fftw-3.2.2/Makefile.in fftw-3.2.2-arm-beta1/Makefile.in | ||
26873 | --- fftw-3.2.2/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
26874 | +++ fftw-3.2.2-arm-beta1/Makefile.in 2011-03-26 22:34:07.000000000 +0100 | ||
26875 | @@ -1,8 +1,9 @@ | ||
26876 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
26877 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
26878 | # @configure_input@ | ||
26879 | |||
26880 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
26881 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
26882 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
26883 | +# Inc. | ||
26884 | # This Makefile.in is free software; the Free Software Foundation | ||
26885 | # gives unlimited permission to copy and/or distribute it, | ||
26886 | # with or without modifications, as long as this notice is preserved. | ||
26887 | @@ -17,8 +18,9 @@ | ||
26888 | |||
26889 | VPATH = @srcdir@ | ||
26890 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
26891 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
26892 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
26893 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
26894 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
26895 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
26896 | install_sh_DATA = $(install_sh) -c -m 644 | ||
26897 | install_sh_PROGRAM = $(install_sh) -c | ||
26898 | @@ -60,14 +62,29 @@ | ||
26899 | mkinstalldirs = $(install_sh) -d | ||
26900 | CONFIG_HEADER = config.h | ||
26901 | CONFIG_CLEAN_FILES = fftw.pc | ||
26902 | +CONFIG_CLEAN_VPATH_FILES = | ||
26903 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
26904 | am__vpath_adj = case $$p in \ | ||
26905 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
26906 | *) f=$$p;; \ | ||
26907 | esac; | ||
26908 | -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
26909 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
26910 | +am__install_max = 40 | ||
26911 | +am__nobase_strip_setup = \ | ||
26912 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
26913 | +am__nobase_strip = \ | ||
26914 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
26915 | +am__nobase_list = $(am__nobase_strip_setup); \ | ||
26916 | + for p in $$list; do echo "$$p $$p"; done | \ | ||
26917 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
26918 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
26919 | + if (++n[$$2] == $(am__install_max)) \ | ||
26920 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
26921 | + END { for (dir in files) print dir, files[dir] }' | ||
26922 | +am__base_list = \ | ||
26923 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
26924 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
26925 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" | ||
26926 | -libLTLIBRARIES_INSTALL = $(INSTALL) | ||
26927 | LTLIBRARIES = $(lib_LTLIBRARIES) | ||
26928 | libfftw3@PREC_SUFFIX@_la_DEPENDENCIES = kernel/libkernel.la \ | ||
26929 | dft/libdft.la dft/scalar/libdft_scalar.la \ | ||
26930 | @@ -103,10 +120,12 @@ | ||
26931 | install-pdf-recursive install-ps-recursive install-recursive \ | ||
26932 | installcheck-recursive installdirs-recursive pdf-recursive \ | ||
26933 | ps-recursive uninstall-recursive | ||
26934 | -pkgconfigDATA_INSTALL = $(INSTALL_DATA) | ||
26935 | DATA = $(pkgconfig_DATA) | ||
26936 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
26937 | distclean-recursive maintainer-clean-recursive | ||
26938 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
26939 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
26940 | + distdir dist dist-all distcheck | ||
26941 | ETAGS = etags | ||
26942 | CTAGS = ctags | ||
26943 | DIST_SUBDIRS = support genfft kernel simd dft rdft reodft api threads \ | ||
26944 | @@ -115,9 +134,34 @@ | ||
26945 | distdir = $(PACKAGE)-$(VERSION) | ||
26946 | top_distdir = $(distdir) | ||
26947 | am__remove_distdir = \ | ||
26948 | - { test ! -d $(distdir) \ | ||
26949 | - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ | ||
26950 | - && rm -fr $(distdir); }; } | ||
26951 | + { test ! -d "$(distdir)" \ | ||
26952 | + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ | ||
26953 | + && rm -fr "$(distdir)"; }; } | ||
26954 | +am__relativize = \ | ||
26955 | + dir0=`pwd`; \ | ||
26956 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
26957 | + sed_rest='s,^[^/]*/*,,'; \ | ||
26958 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
26959 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
26960 | + while test -n "$$dir1"; do \ | ||
26961 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
26962 | + if test "$$first" != "."; then \ | ||
26963 | + if test "$$first" = ".."; then \ | ||
26964 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
26965 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
26966 | + else \ | ||
26967 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
26968 | + if test "$$first2" = "$$first"; then \ | ||
26969 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
26970 | + else \ | ||
26971 | + dir2="../$$dir2"; \ | ||
26972 | + fi; \ | ||
26973 | + dir0="$$dir0"/"$$first"; \ | ||
26974 | + fi; \ | ||
26975 | + fi; \ | ||
26976 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
26977 | + done; \ | ||
26978 | + reldir="$$dir2" | ||
26979 | DIST_ARCHIVES = $(distdir).tar.gz | ||
26980 | GZIP_ENV = --best | ||
26981 | distuninstallcheck_listfiles = find . -type f -print | ||
26982 | @@ -192,6 +236,7 @@ | ||
26983 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
26984 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
26985 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
26986 | +PACKAGE_URL = @PACKAGE_URL@ | ||
26987 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
26988 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
26989 | POW_LIB = @POW_LIB@ | ||
26990 | @@ -327,15 +372,15 @@ | ||
26991 | @for dep in $?; do \ | ||
26992 | case '$(am__configure_deps)' in \ | ||
26993 | *$$dep*) \ | ||
26994 | - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ | ||
26995 | - cd $(srcdir) && $(AUTOMAKE) --gnu \ | ||
26996 | + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ | ||
26997 | + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ | ||
26998 | && exit 0; \ | ||
26999 | exit 1;; \ | ||
27000 | esac; \ | ||
27001 | done; \ | ||
27002 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ | ||
27003 | - cd $(top_srcdir) && \ | ||
27004 | - $(AUTOMAKE) --gnu Makefile | ||
27005 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ | ||
27006 | + $(am__cd) $(top_srcdir) && \ | ||
27007 | + $(AUTOMAKE) --gnu Makefile | ||
27008 | .PRECIOUS: Makefile | ||
27009 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
27010 | @case '$?' in \ | ||
27011 | @@ -351,9 +396,10 @@ | ||
27012 | $(SHELL) ./config.status --recheck | ||
27013 | |||
27014 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
27015 | - cd $(srcdir) && $(AUTOCONF) | ||
27016 | + $(am__cd) $(srcdir) && $(AUTOCONF) | ||
27017 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
27018 | - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | ||
27019 | + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | ||
27020 | +$(am__aclocal_m4_deps): | ||
27021 | |||
27022 | config.h: stamp-h1 | ||
27023 | @if test ! -f $@; then \ | ||
27024 | @@ -365,7 +411,7 @@ | ||
27025 | @rm -f stamp-h1 | ||
27026 | cd $(top_builddir) && $(SHELL) ./config.status config.h | ||
27027 | $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
27028 | - cd $(top_srcdir) && $(AUTOHEADER) | ||
27029 | + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) | ||
27030 | rm -f stamp-h1 | ||
27031 | touch $@ | ||
27032 | |||
27033 | @@ -376,20 +422,24 @@ | ||
27034 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | ||
27035 | @$(NORMAL_INSTALL) | ||
27036 | test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" | ||
27037 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
27038 | + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
27039 | + list2=; for p in $$list; do \ | ||
27040 | if test -f $$p; then \ | ||
27041 | - f=$(am__strip_dir) \ | ||
27042 | - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ | ||
27043 | - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ | ||
27044 | + list2="$$list2 $$p"; \ | ||
27045 | else :; fi; \ | ||
27046 | - done | ||
27047 | + done; \ | ||
27048 | + test -z "$$list2" || { \ | ||
27049 | + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ | ||
27050 | + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ | ||
27051 | + } | ||
27052 | |||
27053 | uninstall-libLTLIBRARIES: | ||
27054 | @$(NORMAL_UNINSTALL) | ||
27055 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
27056 | - p=$(am__strip_dir) \ | ||
27057 | - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ | ||
27058 | - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ | ||
27059 | + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
27060 | + for p in $$list; do \ | ||
27061 | + $(am__strip_dir) \ | ||
27062 | + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ | ||
27063 | + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ | ||
27064 | done | ||
27065 | |||
27066 | clean-libLTLIBRARIES: | ||
27067 | @@ -420,20 +470,23 @@ | ||
27068 | install-pkgconfigDATA: $(pkgconfig_DATA) | ||
27069 | @$(NORMAL_INSTALL) | ||
27070 | test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" | ||
27071 | - @list='$(pkgconfig_DATA)'; for p in $$list; do \ | ||
27072 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | ||
27073 | + for p in $$list; do \ | ||
27074 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
27075 | - f=$(am__strip_dir) \ | ||
27076 | - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ | ||
27077 | - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ | ||
27078 | + echo "$$d$$p"; \ | ||
27079 | + done | $(am__base_list) | \ | ||
27080 | + while read files; do \ | ||
27081 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ | ||
27082 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ | ||
27083 | done | ||
27084 | |||
27085 | uninstall-pkgconfigDATA: | ||
27086 | @$(NORMAL_UNINSTALL) | ||
27087 | - @list='$(pkgconfig_DATA)'; for p in $$list; do \ | ||
27088 | - f=$(am__strip_dir) \ | ||
27089 | - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ | ||
27090 | - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ | ||
27091 | - done | ||
27092 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | ||
27093 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
27094 | + test -n "$$files" || exit 0; \ | ||
27095 | + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ | ||
27096 | + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files | ||
27097 | |||
27098 | # This directory's subdirectories are mostly independent; you can cd | ||
27099 | # into them and run `make' without going through this Makefile. | ||
27100 | @@ -442,7 +495,7 @@ | ||
27101 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
27102 | # (2) otherwise, pass the desired values on the `make' command line. | ||
27103 | $(RECURSIVE_TARGETS): | ||
27104 | - @failcom='exit 1'; \ | ||
27105 | + @fail= failcom='exit 1'; \ | ||
27106 | for f in x $$MAKEFLAGS; do \ | ||
27107 | case $$f in \ | ||
27108 | *=* | --[!k]*);; \ | ||
27109 | @@ -459,7 +512,7 @@ | ||
27110 | else \ | ||
27111 | local_target="$$target"; \ | ||
27112 | fi; \ | ||
27113 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27114 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27115 | || eval $$failcom; \ | ||
27116 | done; \ | ||
27117 | if test "$$dot_seen" = "no"; then \ | ||
27118 | @@ -467,7 +520,7 @@ | ||
27119 | fi; test -z "$$fail" | ||
27120 | |||
27121 | $(RECURSIVE_CLEAN_TARGETS): | ||
27122 | - @failcom='exit 1'; \ | ||
27123 | + @fail= failcom='exit 1'; \ | ||
27124 | for f in x $$MAKEFLAGS; do \ | ||
27125 | case $$f in \ | ||
27126 | *=* | --[!k]*);; \ | ||
27127 | @@ -493,16 +546,16 @@ | ||
27128 | else \ | ||
27129 | local_target="$$target"; \ | ||
27130 | fi; \ | ||
27131 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27132 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27133 | || eval $$failcom; \ | ||
27134 | done && test -z "$$fail" | ||
27135 | tags-recursive: | ||
27136 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27137 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
27138 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
27139 | done | ||
27140 | ctags-recursive: | ||
27141 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27142 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
27143 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
27144 | done | ||
27145 | |||
27146 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
27147 | @@ -517,7 +570,7 @@ | ||
27148 | |||
27149 | TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ | ||
27150 | $(TAGS_FILES) $(LISP) | ||
27151 | - tags=; \ | ||
27152 | + set x; \ | ||
27153 | here=`pwd`; \ | ||
27154 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
27155 | include_option=--etags-include; \ | ||
27156 | @@ -529,7 +582,7 @@ | ||
27157 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27158 | if test "$$subdir" = .; then :; else \ | ||
27159 | test ! -f $$subdir/TAGS || \ | ||
27160 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
27161 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
27162 | fi; \ | ||
27163 | done; \ | ||
27164 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ | ||
27165 | @@ -538,36 +591,41 @@ | ||
27166 | done | \ | ||
27167 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
27168 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
27169 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
27170 | + shift; \ | ||
27171 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
27172 | test -n "$$unique" || unique=$$empty_fix; \ | ||
27173 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27174 | - $$tags $$unique; \ | ||
27175 | + if test $$# -gt 0; then \ | ||
27176 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27177 | + "$$@" $$unique; \ | ||
27178 | + else \ | ||
27179 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27180 | + $$unique; \ | ||
27181 | + fi; \ | ||
27182 | fi | ||
27183 | ctags: CTAGS | ||
27184 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ | ||
27185 | $(TAGS_FILES) $(LISP) | ||
27186 | - tags=; \ | ||
27187 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ | ||
27188 | unique=`for i in $$list; do \ | ||
27189 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
27190 | done | \ | ||
27191 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
27192 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
27193 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
27194 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
27195 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
27196 | - $$tags $$unique | ||
27197 | + $$unique | ||
27198 | |||
27199 | GTAGS: | ||
27200 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
27201 | - && cd $(top_srcdir) \ | ||
27202 | - && gtags -i $(GTAGS_ARGS) $$here | ||
27203 | + && $(am__cd) $(top_srcdir) \ | ||
27204 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
27205 | |||
27206 | distclean-tags: | ||
27207 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
27208 | |||
27209 | distdir: $(DISTFILES) | ||
27210 | $(am__remove_distdir) | ||
27211 | - test -d $(distdir) || mkdir $(distdir) | ||
27212 | + test -d "$(distdir)" || mkdir "$(distdir)" | ||
27213 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
27214 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
27215 | list='$(DISTFILES)'; \ | ||
27216 | @@ -583,38 +641,55 @@ | ||
27217 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
27218 | if test -d $$d/$$file; then \ | ||
27219 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
27220 | + if test -d "$(distdir)/$$file"; then \ | ||
27221 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
27222 | + fi; \ | ||
27223 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
27224 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
27225 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
27226 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
27227 | fi; \ | ||
27228 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
27229 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
27230 | else \ | ||
27231 | - test -f $(distdir)/$$file \ | ||
27232 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
27233 | + test -f "$(distdir)/$$file" \ | ||
27234 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
27235 | || exit 1; \ | ||
27236 | fi; \ | ||
27237 | done | ||
27238 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
27239 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
27240 | if test "$$subdir" = .; then :; else \ | ||
27241 | test -d "$(distdir)/$$subdir" \ | ||
27242 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
27243 | || exit 1; \ | ||
27244 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
27245 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
27246 | - (cd $$subdir && \ | ||
27247 | + fi; \ | ||
27248 | + done | ||
27249 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
27250 | + if test "$$subdir" = .; then :; else \ | ||
27251 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
27252 | + $(am__relativize); \ | ||
27253 | + new_distdir=$$reldir; \ | ||
27254 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
27255 | + $(am__relativize); \ | ||
27256 | + new_top_distdir=$$reldir; \ | ||
27257 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
27258 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
27259 | + ($(am__cd) $$subdir && \ | ||
27260 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
27261 | - top_distdir="$$top_distdir" \ | ||
27262 | - distdir="$$distdir/$$subdir" \ | ||
27263 | + top_distdir="$$new_top_distdir" \ | ||
27264 | + distdir="$$new_distdir" \ | ||
27265 | am__remove_distdir=: \ | ||
27266 | am__skip_length_check=: \ | ||
27267 | + am__skip_mode_fix=: \ | ||
27268 | distdir) \ | ||
27269 | || exit 1; \ | ||
27270 | fi; \ | ||
27271 | done | ||
27272 | - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ | ||
27273 | + -test -n "$(am__skip_mode_fix)" \ | ||
27274 | + || find "$(distdir)" -type d ! -perm -755 \ | ||
27275 | + -exec chmod u+rwx,go+rx {} \; -o \ | ||
27276 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ | ||
27277 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ | ||
27278 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ | ||
27279 | - || chmod -R a+r $(distdir) | ||
27280 | + || chmod -R a+r "$(distdir)" | ||
27281 | dist-gzip: distdir | ||
27282 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | ||
27283 | $(am__remove_distdir) | ||
27284 | @@ -627,6 +702,10 @@ | ||
27285 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma | ||
27286 | $(am__remove_distdir) | ||
27287 | |||
27288 | +dist-xz: distdir | ||
27289 | + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz | ||
27290 | + $(am__remove_distdir) | ||
27291 | + | ||
27292 | dist-tarZ: distdir | ||
27293 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | ||
27294 | $(am__remove_distdir) | ||
27295 | @@ -650,15 +729,17 @@ | ||
27296 | distcheck: dist | ||
27297 | case '$(DIST_ARCHIVES)' in \ | ||
27298 | *.tar.gz*) \ | ||
27299 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ | ||
27300 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ | ||
27301 | *.tar.bz2*) \ | ||
27302 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ | ||
27303 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | ||
27304 | *.tar.lzma*) \ | ||
27305 | - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ | ||
27306 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ | ||
27307 | + *.tar.xz*) \ | ||
27308 | + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ | ||
27309 | *.tar.Z*) \ | ||
27310 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ | ||
27311 | *.shar.gz*) \ | ||
27312 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ | ||
27313 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ | ||
27314 | *.zip*) \ | ||
27315 | unzip $(distdir).zip ;;\ | ||
27316 | esac | ||
27317 | @@ -666,9 +747,11 @@ | ||
27318 | mkdir $(distdir)/_build | ||
27319 | mkdir $(distdir)/_inst | ||
27320 | chmod a-w $(distdir) | ||
27321 | + test -d $(distdir)/_build || exit 0; \ | ||
27322 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ | ||
27323 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | ||
27324 | - && cd $(distdir)/_build \ | ||
27325 | + && am__cwd=`pwd` \ | ||
27326 | + && $(am__cd) $(distdir)/_build \ | ||
27327 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | ||
27328 | $(DISTCHECK_CONFIGURE_FLAGS) \ | ||
27329 | && $(MAKE) $(AM_MAKEFLAGS) \ | ||
27330 | @@ -690,13 +773,15 @@ | ||
27331 | && rm -rf "$$dc_destdir" \ | ||
27332 | && $(MAKE) $(AM_MAKEFLAGS) dist \ | ||
27333 | && rm -rf $(DIST_ARCHIVES) \ | ||
27334 | - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck | ||
27335 | + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ | ||
27336 | + && cd "$$am__cwd" \ | ||
27337 | + || exit 1 | ||
27338 | $(am__remove_distdir) | ||
27339 | @(echo "$(distdir) archives ready for distribution: "; \ | ||
27340 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | ||
27341 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | ||
27342 | distuninstallcheck: | ||
27343 | - @cd $(distuninstallcheck_dir) \ | ||
27344 | + @$(am__cd) '$(distuninstallcheck_dir)' \ | ||
27345 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | ||
27346 | || { echo "ERROR: files left after uninstall:" ; \ | ||
27347 | if test -n "$(DESTDIR)"; then \ | ||
27348 | @@ -741,6 +826,7 @@ | ||
27349 | |||
27350 | distclean-generic: | ||
27351 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
27352 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
27353 | |||
27354 | maintainer-clean-generic: | ||
27355 | @echo "This command is intended for maintainers to use" | ||
27356 | @@ -762,6 +848,8 @@ | ||
27357 | |||
27358 | html: html-recursive | ||
27359 | |||
27360 | +html-am: | ||
27361 | + | ||
27362 | info: info-recursive | ||
27363 | |||
27364 | info-am: | ||
27365 | @@ -770,18 +858,28 @@ | ||
27366 | |||
27367 | install-dvi: install-dvi-recursive | ||
27368 | |||
27369 | +install-dvi-am: | ||
27370 | + | ||
27371 | install-exec-am: install-libLTLIBRARIES | ||
27372 | |||
27373 | install-html: install-html-recursive | ||
27374 | |||
27375 | +install-html-am: | ||
27376 | + | ||
27377 | install-info: install-info-recursive | ||
27378 | |||
27379 | +install-info-am: | ||
27380 | + | ||
27381 | install-man: | ||
27382 | |||
27383 | install-pdf: install-pdf-recursive | ||
27384 | |||
27385 | +install-pdf-am: | ||
27386 | + | ||
27387 | install-ps: install-ps-recursive | ||
27388 | |||
27389 | +install-ps-am: | ||
27390 | + | ||
27391 | installcheck-am: | ||
27392 | |||
27393 | maintainer-clean: maintainer-clean-recursive | ||
27394 | @@ -805,14 +903,14 @@ | ||
27395 | |||
27396 | uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA | ||
27397 | |||
27398 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
27399 | - install-strip | ||
27400 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ | ||
27401 | + ctags-recursive install-am install-strip tags-recursive | ||
27402 | |||
27403 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
27404 | all all-am am--refresh check check-am clean clean-generic \ | ||
27405 | clean-libLTLIBRARIES clean-libtool ctags ctags-recursive dist \ | ||
27406 | dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ | ||
27407 | - dist-zip distcheck distclean distclean-compile \ | ||
27408 | + dist-xz dist-zip distcheck distclean distclean-compile \ | ||
27409 | distclean-generic distclean-hdr distclean-libtool \ | ||
27410 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ | ||
27411 | dvi-am html html-am info info-am install install-am \ | ||
27412 | @@ -837,6 +935,7 @@ | ||
27413 | install-wisdom: wisdom | ||
27414 | $(mkinstalldirs) $(WISDOM_DIR) | ||
27415 | $(INSTALL_DATA) wisdom $(WISDOM_DIR)/$(WISDOM) | ||
27416 | + | ||
27417 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
27418 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
27419 | .NOEXPORT: | ||
27420 | diff -Nurd fftw-3.2.2/rdft/Makefile.in fftw-3.2.2-arm-beta1/rdft/Makefile.in | ||
27421 | --- fftw-3.2.2/rdft/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
27422 | +++ fftw-3.2.2-arm-beta1/rdft/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
27423 | @@ -1,8 +1,9 @@ | ||
27424 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
27425 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
27426 | # @configure_input@ | ||
27427 | |||
27428 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
27429 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
27430 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
27431 | +# Inc. | ||
27432 | # This Makefile.in is free software; the Free Software Foundation | ||
27433 | # gives unlimited permission to copy and/or distribute it, | ||
27434 | # with or without modifications, as long as this notice is preserved. | ||
27435 | @@ -16,8 +17,9 @@ | ||
27436 | |||
27437 | VPATH = @srcdir@ | ||
27438 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
27439 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
27440 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
27441 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
27442 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
27443 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
27444 | install_sh_DATA = $(install_sh) -c -m 644 | ||
27445 | install_sh_PROGRAM = $(install_sh) -c | ||
27446 | @@ -53,6 +55,7 @@ | ||
27447 | mkinstalldirs = $(install_sh) -d | ||
27448 | CONFIG_HEADER = $(top_builddir)/config.h | ||
27449 | CONFIG_CLEAN_FILES = | ||
27450 | +CONFIG_CLEAN_VPATH_FILES = | ||
27451 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
27452 | librdft_la_LIBADD = | ||
27453 | am__objects_1 = buffered2.lo direct2.lo nop2.lo rank0-rdft2.lo \ | ||
27454 | @@ -70,6 +73,7 @@ | ||
27455 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
27456 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
27457 | am__depfiles_maybe = depfiles | ||
27458 | +am__mv = mv -f | ||
27459 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
27460 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
27461 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
27462 | @@ -90,10 +94,38 @@ | ||
27463 | ps-recursive uninstall-recursive | ||
27464 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
27465 | distclean-recursive maintainer-clean-recursive | ||
27466 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
27467 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
27468 | + distdir | ||
27469 | ETAGS = etags | ||
27470 | CTAGS = ctags | ||
27471 | DIST_SUBDIRS = $(SUBDIRS) | ||
27472 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
27473 | +am__relativize = \ | ||
27474 | + dir0=`pwd`; \ | ||
27475 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
27476 | + sed_rest='s,^[^/]*/*,,'; \ | ||
27477 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
27478 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
27479 | + while test -n "$$dir1"; do \ | ||
27480 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
27481 | + if test "$$first" != "."; then \ | ||
27482 | + if test "$$first" = ".."; then \ | ||
27483 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
27484 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
27485 | + else \ | ||
27486 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
27487 | + if test "$$first2" = "$$first"; then \ | ||
27488 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
27489 | + else \ | ||
27490 | + dir2="../$$dir2"; \ | ||
27491 | + fi; \ | ||
27492 | + dir0="$$dir0"/"$$first"; \ | ||
27493 | + fi; \ | ||
27494 | + fi; \ | ||
27495 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
27496 | + done; \ | ||
27497 | + reldir="$$dir2" | ||
27498 | ACLOCAL = @ACLOCAL@ | ||
27499 | ALLOCA = @ALLOCA@ | ||
27500 | AMTAR = @AMTAR@ | ||
27501 | @@ -164,6 +196,7 @@ | ||
27502 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
27503 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
27504 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
27505 | +PACKAGE_URL = @PACKAGE_URL@ | ||
27506 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
27507 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
27508 | POW_LIB = @POW_LIB@ | ||
27509 | @@ -269,9 +302,9 @@ | ||
27510 | exit 1;; \ | ||
27511 | esac; \ | ||
27512 | done; \ | ||
27513 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/Makefile'; \ | ||
27514 | - cd $(top_srcdir) && \ | ||
27515 | - $(AUTOMAKE) --gnu rdft/Makefile | ||
27516 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/Makefile'; \ | ||
27517 | + $(am__cd) $(top_srcdir) && \ | ||
27518 | + $(AUTOMAKE) --gnu rdft/Makefile | ||
27519 | .PRECIOUS: Makefile | ||
27520 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
27521 | @case '$?' in \ | ||
27522 | @@ -289,6 +322,7 @@ | ||
27523 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
27524 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
27525 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
27526 | +$(am__aclocal_m4_deps): | ||
27527 | |||
27528 | clean-noinstLTLIBRARIES: | ||
27529 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
27530 | @@ -350,21 +384,21 @@ | ||
27531 | |||
27532 | .c.o: | ||
27533 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
27534 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27535 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27536 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
27537 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
27538 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
27539 | |||
27540 | .c.obj: | ||
27541 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
27542 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27543 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27544 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
27545 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
27546 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
27547 | |||
27548 | .c.lo: | ||
27549 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
27550 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
27551 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
27552 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
27553 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
27554 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
27555 | @@ -382,7 +416,7 @@ | ||
27556 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
27557 | # (2) otherwise, pass the desired values on the `make' command line. | ||
27558 | $(RECURSIVE_TARGETS): | ||
27559 | - @failcom='exit 1'; \ | ||
27560 | + @fail= failcom='exit 1'; \ | ||
27561 | for f in x $$MAKEFLAGS; do \ | ||
27562 | case $$f in \ | ||
27563 | *=* | --[!k]*);; \ | ||
27564 | @@ -399,7 +433,7 @@ | ||
27565 | else \ | ||
27566 | local_target="$$target"; \ | ||
27567 | fi; \ | ||
27568 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27569 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27570 | || eval $$failcom; \ | ||
27571 | done; \ | ||
27572 | if test "$$dot_seen" = "no"; then \ | ||
27573 | @@ -407,7 +441,7 @@ | ||
27574 | fi; test -z "$$fail" | ||
27575 | |||
27576 | $(RECURSIVE_CLEAN_TARGETS): | ||
27577 | - @failcom='exit 1'; \ | ||
27578 | + @fail= failcom='exit 1'; \ | ||
27579 | for f in x $$MAKEFLAGS; do \ | ||
27580 | case $$f in \ | ||
27581 | *=* | --[!k]*);; \ | ||
27582 | @@ -433,16 +467,16 @@ | ||
27583 | else \ | ||
27584 | local_target="$$target"; \ | ||
27585 | fi; \ | ||
27586 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27587 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27588 | || eval $$failcom; \ | ||
27589 | done && test -z "$$fail" | ||
27590 | tags-recursive: | ||
27591 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27592 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
27593 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
27594 | done | ||
27595 | ctags-recursive: | ||
27596 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27597 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
27598 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
27599 | done | ||
27600 | |||
27601 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
27602 | @@ -457,7 +491,7 @@ | ||
27603 | |||
27604 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
27605 | $(TAGS_FILES) $(LISP) | ||
27606 | - tags=; \ | ||
27607 | + set x; \ | ||
27608 | here=`pwd`; \ | ||
27609 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
27610 | include_option=--etags-include; \ | ||
27611 | @@ -469,7 +503,7 @@ | ||
27612 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27613 | if test "$$subdir" = .; then :; else \ | ||
27614 | test ! -f $$subdir/TAGS || \ | ||
27615 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
27616 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
27617 | fi; \ | ||
27618 | done; \ | ||
27619 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
27620 | @@ -478,29 +512,34 @@ | ||
27621 | done | \ | ||
27622 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
27623 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
27624 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
27625 | + shift; \ | ||
27626 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
27627 | test -n "$$unique" || unique=$$empty_fix; \ | ||
27628 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27629 | - $$tags $$unique; \ | ||
27630 | + if test $$# -gt 0; then \ | ||
27631 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27632 | + "$$@" $$unique; \ | ||
27633 | + else \ | ||
27634 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27635 | + $$unique; \ | ||
27636 | + fi; \ | ||
27637 | fi | ||
27638 | ctags: CTAGS | ||
27639 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
27640 | $(TAGS_FILES) $(LISP) | ||
27641 | - tags=; \ | ||
27642 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
27643 | unique=`for i in $$list; do \ | ||
27644 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
27645 | done | \ | ||
27646 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
27647 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
27648 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
27649 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
27650 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
27651 | - $$tags $$unique | ||
27652 | + $$unique | ||
27653 | |||
27654 | GTAGS: | ||
27655 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
27656 | - && cd $(top_srcdir) \ | ||
27657 | - && gtags -i $(GTAGS_ARGS) $$here | ||
27658 | + && $(am__cd) $(top_srcdir) \ | ||
27659 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
27660 | |||
27661 | distclean-tags: | ||
27662 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
27663 | @@ -521,29 +560,44 @@ | ||
27664 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
27665 | if test -d $$d/$$file; then \ | ||
27666 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
27667 | + if test -d "$(distdir)/$$file"; then \ | ||
27668 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
27669 | + fi; \ | ||
27670 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
27671 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
27672 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
27673 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
27674 | fi; \ | ||
27675 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
27676 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
27677 | else \ | ||
27678 | - test -f $(distdir)/$$file \ | ||
27679 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
27680 | + test -f "$(distdir)/$$file" \ | ||
27681 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
27682 | || exit 1; \ | ||
27683 | fi; \ | ||
27684 | done | ||
27685 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
27686 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
27687 | if test "$$subdir" = .; then :; else \ | ||
27688 | test -d "$(distdir)/$$subdir" \ | ||
27689 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
27690 | || exit 1; \ | ||
27691 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
27692 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
27693 | - (cd $$subdir && \ | ||
27694 | + fi; \ | ||
27695 | + done | ||
27696 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
27697 | + if test "$$subdir" = .; then :; else \ | ||
27698 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
27699 | + $(am__relativize); \ | ||
27700 | + new_distdir=$$reldir; \ | ||
27701 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
27702 | + $(am__relativize); \ | ||
27703 | + new_top_distdir=$$reldir; \ | ||
27704 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
27705 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
27706 | + ($(am__cd) $$subdir && \ | ||
27707 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
27708 | - top_distdir="$$top_distdir" \ | ||
27709 | - distdir="$$distdir/$$subdir" \ | ||
27710 | + top_distdir="$$new_top_distdir" \ | ||
27711 | + distdir="$$new_distdir" \ | ||
27712 | am__remove_distdir=: \ | ||
27713 | am__skip_length_check=: \ | ||
27714 | + am__skip_mode_fix=: \ | ||
27715 | distdir) \ | ||
27716 | || exit 1; \ | ||
27717 | fi; \ | ||
27718 | @@ -573,6 +627,7 @@ | ||
27719 | |||
27720 | distclean-generic: | ||
27721 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
27722 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
27723 | |||
27724 | maintainer-clean-generic: | ||
27725 | @echo "This command is intended for maintainers to use" | ||
27726 | @@ -594,6 +649,8 @@ | ||
27727 | |||
27728 | html: html-recursive | ||
27729 | |||
27730 | +html-am: | ||
27731 | + | ||
27732 | info: info-recursive | ||
27733 | |||
27734 | info-am: | ||
27735 | @@ -602,18 +659,28 @@ | ||
27736 | |||
27737 | install-dvi: install-dvi-recursive | ||
27738 | |||
27739 | +install-dvi-am: | ||
27740 | + | ||
27741 | install-exec-am: | ||
27742 | |||
27743 | install-html: install-html-recursive | ||
27744 | |||
27745 | +install-html-am: | ||
27746 | + | ||
27747 | install-info: install-info-recursive | ||
27748 | |||
27749 | +install-info-am: | ||
27750 | + | ||
27751 | install-man: | ||
27752 | |||
27753 | install-pdf: install-pdf-recursive | ||
27754 | |||
27755 | +install-pdf-am: | ||
27756 | + | ||
27757 | install-ps: install-ps-recursive | ||
27758 | |||
27759 | +install-ps-am: | ||
27760 | + | ||
27761 | installcheck-am: | ||
27762 | |||
27763 | maintainer-clean: maintainer-clean-recursive | ||
27764 | @@ -636,8 +703,8 @@ | ||
27765 | |||
27766 | uninstall-am: | ||
27767 | |||
27768 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
27769 | - install-strip | ||
27770 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
27771 | + install-am install-strip tags-recursive | ||
27772 | |||
27773 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
27774 | all all-am check check-am clean clean-generic clean-libtool \ | ||
27775 | @@ -654,6 +721,7 @@ | ||
27776 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | ||
27777 | uninstall uninstall-am | ||
27778 | |||
27779 | + | ||
27780 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
27781 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
27782 | .NOEXPORT: | ||
27783 | diff -Nurd fftw-3.2.2/rdft/scalar/Makefile.in fftw-3.2.2-arm-beta1/rdft/scalar/Makefile.in | ||
27784 | --- fftw-3.2.2/rdft/scalar/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
27785 | +++ fftw-3.2.2-arm-beta1/rdft/scalar/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
27786 | @@ -1,8 +1,9 @@ | ||
27787 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
27788 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
27789 | # @configure_input@ | ||
27790 | |||
27791 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
27792 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
27793 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
27794 | +# Inc. | ||
27795 | # This Makefile.in is free software; the Free Software Foundation | ||
27796 | # gives unlimited permission to copy and/or distribute it, | ||
27797 | # with or without modifications, as long as this notice is preserved. | ||
27798 | @@ -16,8 +17,9 @@ | ||
27799 | |||
27800 | VPATH = @srcdir@ | ||
27801 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
27802 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
27803 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
27804 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
27805 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
27806 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
27807 | install_sh_DATA = $(install_sh) -c -m 644 | ||
27808 | install_sh_PROGRAM = $(install_sh) -c | ||
27809 | @@ -53,6 +55,7 @@ | ||
27810 | mkinstalldirs = $(install_sh) -d | ||
27811 | CONFIG_HEADER = $(top_builddir)/config.h | ||
27812 | CONFIG_CLEAN_FILES = | ||
27813 | +CONFIG_CLEAN_VPATH_FILES = | ||
27814 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
27815 | librdft_scalar_la_LIBADD = | ||
27816 | am_librdft_scalar_la_OBJECTS = hfb.lo r2c.lo r2r.lo hc2c.lo | ||
27817 | @@ -60,6 +63,7 @@ | ||
27818 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
27819 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
27820 | am__depfiles_maybe = depfiles | ||
27821 | +am__mv = mv -f | ||
27822 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
27823 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
27824 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
27825 | @@ -80,10 +84,38 @@ | ||
27826 | ps-recursive uninstall-recursive | ||
27827 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
27828 | distclean-recursive maintainer-clean-recursive | ||
27829 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
27830 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
27831 | + distdir | ||
27832 | ETAGS = etags | ||
27833 | CTAGS = ctags | ||
27834 | DIST_SUBDIRS = $(SUBDIRS) | ||
27835 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
27836 | +am__relativize = \ | ||
27837 | + dir0=`pwd`; \ | ||
27838 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
27839 | + sed_rest='s,^[^/]*/*,,'; \ | ||
27840 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
27841 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
27842 | + while test -n "$$dir1"; do \ | ||
27843 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
27844 | + if test "$$first" != "."; then \ | ||
27845 | + if test "$$first" = ".."; then \ | ||
27846 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
27847 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
27848 | + else \ | ||
27849 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
27850 | + if test "$$first2" = "$$first"; then \ | ||
27851 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
27852 | + else \ | ||
27853 | + dir2="../$$dir2"; \ | ||
27854 | + fi; \ | ||
27855 | + dir0="$$dir0"/"$$first"; \ | ||
27856 | + fi; \ | ||
27857 | + fi; \ | ||
27858 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
27859 | + done; \ | ||
27860 | + reldir="$$dir2" | ||
27861 | ACLOCAL = @ACLOCAL@ | ||
27862 | ALLOCA = @ALLOCA@ | ||
27863 | AMTAR = @AMTAR@ | ||
27864 | @@ -154,6 +186,7 @@ | ||
27865 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
27866 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
27867 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
27868 | +PACKAGE_URL = @PACKAGE_URL@ | ||
27869 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
27870 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
27871 | POW_LIB = @POW_LIB@ | ||
27872 | @@ -248,9 +281,9 @@ | ||
27873 | exit 1;; \ | ||
27874 | esac; \ | ||
27875 | done; \ | ||
27876 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/Makefile'; \ | ||
27877 | - cd $(top_srcdir) && \ | ||
27878 | - $(AUTOMAKE) --gnu rdft/scalar/Makefile | ||
27879 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/Makefile'; \ | ||
27880 | + $(am__cd) $(top_srcdir) && \ | ||
27881 | + $(AUTOMAKE) --gnu rdft/scalar/Makefile | ||
27882 | .PRECIOUS: Makefile | ||
27883 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
27884 | @case '$?' in \ | ||
27885 | @@ -268,6 +301,7 @@ | ||
27886 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
27887 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
27888 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
27889 | +$(am__aclocal_m4_deps): | ||
27890 | |||
27891 | clean-noinstLTLIBRARIES: | ||
27892 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
27893 | @@ -293,21 +327,21 @@ | ||
27894 | |||
27895 | .c.o: | ||
27896 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
27897 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27898 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27899 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
27900 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
27901 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
27902 | |||
27903 | .c.obj: | ||
27904 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
27905 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27906 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
27907 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
27908 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
27909 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
27910 | |||
27911 | .c.lo: | ||
27912 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
27913 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
27914 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
27915 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
27916 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
27917 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
27918 | @@ -325,7 +359,7 @@ | ||
27919 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
27920 | # (2) otherwise, pass the desired values on the `make' command line. | ||
27921 | $(RECURSIVE_TARGETS): | ||
27922 | - @failcom='exit 1'; \ | ||
27923 | + @fail= failcom='exit 1'; \ | ||
27924 | for f in x $$MAKEFLAGS; do \ | ||
27925 | case $$f in \ | ||
27926 | *=* | --[!k]*);; \ | ||
27927 | @@ -342,7 +376,7 @@ | ||
27928 | else \ | ||
27929 | local_target="$$target"; \ | ||
27930 | fi; \ | ||
27931 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27932 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27933 | || eval $$failcom; \ | ||
27934 | done; \ | ||
27935 | if test "$$dot_seen" = "no"; then \ | ||
27936 | @@ -350,7 +384,7 @@ | ||
27937 | fi; test -z "$$fail" | ||
27938 | |||
27939 | $(RECURSIVE_CLEAN_TARGETS): | ||
27940 | - @failcom='exit 1'; \ | ||
27941 | + @fail= failcom='exit 1'; \ | ||
27942 | for f in x $$MAKEFLAGS; do \ | ||
27943 | case $$f in \ | ||
27944 | *=* | --[!k]*);; \ | ||
27945 | @@ -376,16 +410,16 @@ | ||
27946 | else \ | ||
27947 | local_target="$$target"; \ | ||
27948 | fi; \ | ||
27949 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27950 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
27951 | || eval $$failcom; \ | ||
27952 | done && test -z "$$fail" | ||
27953 | tags-recursive: | ||
27954 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27955 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
27956 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
27957 | done | ||
27958 | ctags-recursive: | ||
27959 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27960 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
27961 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
27962 | done | ||
27963 | |||
27964 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
27965 | @@ -400,7 +434,7 @@ | ||
27966 | |||
27967 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
27968 | $(TAGS_FILES) $(LISP) | ||
27969 | - tags=; \ | ||
27970 | + set x; \ | ||
27971 | here=`pwd`; \ | ||
27972 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
27973 | include_option=--etags-include; \ | ||
27974 | @@ -412,7 +446,7 @@ | ||
27975 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
27976 | if test "$$subdir" = .; then :; else \ | ||
27977 | test ! -f $$subdir/TAGS || \ | ||
27978 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
27979 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
27980 | fi; \ | ||
27981 | done; \ | ||
27982 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
27983 | @@ -421,29 +455,34 @@ | ||
27984 | done | \ | ||
27985 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
27986 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
27987 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
27988 | + shift; \ | ||
27989 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
27990 | test -n "$$unique" || unique=$$empty_fix; \ | ||
27991 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27992 | - $$tags $$unique; \ | ||
27993 | + if test $$# -gt 0; then \ | ||
27994 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27995 | + "$$@" $$unique; \ | ||
27996 | + else \ | ||
27997 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
27998 | + $$unique; \ | ||
27999 | + fi; \ | ||
28000 | fi | ||
28001 | ctags: CTAGS | ||
28002 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28003 | $(TAGS_FILES) $(LISP) | ||
28004 | - tags=; \ | ||
28005 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28006 | unique=`for i in $$list; do \ | ||
28007 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
28008 | done | \ | ||
28009 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28010 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28011 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
28012 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
28013 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
28014 | - $$tags $$unique | ||
28015 | + $$unique | ||
28016 | |||
28017 | GTAGS: | ||
28018 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
28019 | - && cd $(top_srcdir) \ | ||
28020 | - && gtags -i $(GTAGS_ARGS) $$here | ||
28021 | + && $(am__cd) $(top_srcdir) \ | ||
28022 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
28023 | |||
28024 | distclean-tags: | ||
28025 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
28026 | @@ -464,29 +503,44 @@ | ||
28027 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
28028 | if test -d $$d/$$file; then \ | ||
28029 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
28030 | + if test -d "$(distdir)/$$file"; then \ | ||
28031 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28032 | + fi; \ | ||
28033 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
28034 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
28035 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
28036 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28037 | fi; \ | ||
28038 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
28039 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
28040 | else \ | ||
28041 | - test -f $(distdir)/$$file \ | ||
28042 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
28043 | + test -f "$(distdir)/$$file" \ | ||
28044 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
28045 | || exit 1; \ | ||
28046 | fi; \ | ||
28047 | done | ||
28048 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
28049 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
28050 | if test "$$subdir" = .; then :; else \ | ||
28051 | test -d "$(distdir)/$$subdir" \ | ||
28052 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
28053 | || exit 1; \ | ||
28054 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
28055 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
28056 | - (cd $$subdir && \ | ||
28057 | + fi; \ | ||
28058 | + done | ||
28059 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
28060 | + if test "$$subdir" = .; then :; else \ | ||
28061 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
28062 | + $(am__relativize); \ | ||
28063 | + new_distdir=$$reldir; \ | ||
28064 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
28065 | + $(am__relativize); \ | ||
28066 | + new_top_distdir=$$reldir; \ | ||
28067 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
28068 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
28069 | + ($(am__cd) $$subdir && \ | ||
28070 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
28071 | - top_distdir="$$top_distdir" \ | ||
28072 | - distdir="$$distdir/$$subdir" \ | ||
28073 | + top_distdir="$$new_top_distdir" \ | ||
28074 | + distdir="$$new_distdir" \ | ||
28075 | am__remove_distdir=: \ | ||
28076 | am__skip_length_check=: \ | ||
28077 | + am__skip_mode_fix=: \ | ||
28078 | distdir) \ | ||
28079 | || exit 1; \ | ||
28080 | fi; \ | ||
28081 | @@ -516,6 +570,7 @@ | ||
28082 | |||
28083 | distclean-generic: | ||
28084 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
28085 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
28086 | |||
28087 | maintainer-clean-generic: | ||
28088 | @echo "This command is intended for maintainers to use" | ||
28089 | @@ -537,6 +592,8 @@ | ||
28090 | |||
28091 | html: html-recursive | ||
28092 | |||
28093 | +html-am: | ||
28094 | + | ||
28095 | info: info-recursive | ||
28096 | |||
28097 | info-am: | ||
28098 | @@ -545,18 +602,28 @@ | ||
28099 | |||
28100 | install-dvi: install-dvi-recursive | ||
28101 | |||
28102 | +install-dvi-am: | ||
28103 | + | ||
28104 | install-exec-am: | ||
28105 | |||
28106 | install-html: install-html-recursive | ||
28107 | |||
28108 | +install-html-am: | ||
28109 | + | ||
28110 | install-info: install-info-recursive | ||
28111 | |||
28112 | +install-info-am: | ||
28113 | + | ||
28114 | install-man: | ||
28115 | |||
28116 | install-pdf: install-pdf-recursive | ||
28117 | |||
28118 | +install-pdf-am: | ||
28119 | + | ||
28120 | install-ps: install-ps-recursive | ||
28121 | |||
28122 | +install-ps-am: | ||
28123 | + | ||
28124 | installcheck-am: | ||
28125 | |||
28126 | maintainer-clean: maintainer-clean-recursive | ||
28127 | @@ -579,8 +646,8 @@ | ||
28128 | |||
28129 | uninstall-am: | ||
28130 | |||
28131 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
28132 | - install-strip | ||
28133 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
28134 | + install-am install-strip tags-recursive | ||
28135 | |||
28136 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
28137 | all all-am check check-am clean clean-generic clean-libtool \ | ||
28138 | @@ -597,6 +664,7 @@ | ||
28139 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | ||
28140 | uninstall uninstall-am | ||
28141 | |||
28142 | + | ||
28143 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
28144 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
28145 | .NOEXPORT: | ||
28146 | diff -Nurd fftw-3.2.2/rdft/scalar/r2cb/Makefile.in fftw-3.2.2-arm-beta1/rdft/scalar/r2cb/Makefile.in | ||
28147 | --- fftw-3.2.2/rdft/scalar/r2cb/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
28148 | +++ fftw-3.2.2-arm-beta1/rdft/scalar/r2cb/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
28149 | @@ -1,8 +1,9 @@ | ||
28150 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
28151 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
28152 | # @configure_input@ | ||
28153 | |||
28154 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
28155 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
28156 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
28157 | +# Inc. | ||
28158 | # This Makefile.in is free software; the Free Software Foundation | ||
28159 | # gives unlimited permission to copy and/or distribute it, | ||
28160 | # with or without modifications, as long as this notice is preserved. | ||
28161 | @@ -32,8 +33,9 @@ | ||
28162 | |||
28163 | VPATH = @srcdir@ | ||
28164 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
28165 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
28166 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
28167 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
28168 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
28169 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
28170 | install_sh_DATA = $(install_sh) -c -m 644 | ||
28171 | install_sh_PROGRAM = $(install_sh) -c | ||
28172 | @@ -70,6 +72,7 @@ | ||
28173 | mkinstalldirs = $(install_sh) -d | ||
28174 | CONFIG_HEADER = $(top_builddir)/config.h | ||
28175 | CONFIG_CLEAN_FILES = | ||
28176 | +CONFIG_CLEAN_VPATH_FILES = | ||
28177 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
28178 | librdft_scalar_r2cb_la_LIBADD = | ||
28179 | am__objects_1 = r2cb_2.lo r2cb_3.lo r2cb_4.lo r2cb_5.lo r2cb_6.lo \ | ||
28180 | @@ -104,6 +107,7 @@ | ||
28181 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
28182 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
28183 | am__depfiles_maybe = depfiles | ||
28184 | +am__mv = mv -f | ||
28185 | CCLD = $(CC) | ||
28186 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
28187 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
28188 | @@ -183,6 +187,7 @@ | ||
28189 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
28190 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
28191 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
28192 | +PACKAGE_URL = @PACKAGE_URL@ | ||
28193 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
28194 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
28195 | POW_LIB = @POW_LIB@ | ||
28196 | @@ -382,9 +387,9 @@ | ||
28197 | exit 1;; \ | ||
28198 | esac; \ | ||
28199 | done; \ | ||
28200 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/r2cb/Makefile'; \ | ||
28201 | - cd $(top_srcdir) && \ | ||
28202 | - $(AUTOMAKE) --gnu rdft/scalar/r2cb/Makefile | ||
28203 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/r2cb/Makefile'; \ | ||
28204 | + $(am__cd) $(top_srcdir) && \ | ||
28205 | + $(AUTOMAKE) --gnu rdft/scalar/r2cb/Makefile | ||
28206 | .PRECIOUS: Makefile | ||
28207 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
28208 | @case '$?' in \ | ||
28209 | @@ -402,6 +407,7 @@ | ||
28210 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28211 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
28212 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28213 | +$(am__aclocal_m4_deps): | ||
28214 | |||
28215 | clean-noinstLTLIBRARIES: | ||
28216 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
28217 | @@ -511,21 +517,21 @@ | ||
28218 | |||
28219 | .c.o: | ||
28220 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28221 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28222 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28223 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28224 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28225 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
28226 | |||
28227 | .c.obj: | ||
28228 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
28229 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28230 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28231 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28232 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28233 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
28234 | |||
28235 | .c.lo: | ||
28236 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28237 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28238 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28239 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
28240 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28241 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
28242 | @@ -548,7 +554,7 @@ | ||
28243 | |||
28244 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28245 | $(TAGS_FILES) $(LISP) | ||
28246 | - tags=; \ | ||
28247 | + set x; \ | ||
28248 | here=`pwd`; \ | ||
28249 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28250 | unique=`for i in $$list; do \ | ||
28251 | @@ -556,29 +562,34 @@ | ||
28252 | done | \ | ||
28253 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28254 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28255 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
28256 | + shift; \ | ||
28257 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
28258 | test -n "$$unique" || unique=$$empty_fix; \ | ||
28259 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28260 | - $$tags $$unique; \ | ||
28261 | + if test $$# -gt 0; then \ | ||
28262 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28263 | + "$$@" $$unique; \ | ||
28264 | + else \ | ||
28265 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28266 | + $$unique; \ | ||
28267 | + fi; \ | ||
28268 | fi | ||
28269 | ctags: CTAGS | ||
28270 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28271 | $(TAGS_FILES) $(LISP) | ||
28272 | - tags=; \ | ||
28273 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28274 | unique=`for i in $$list; do \ | ||
28275 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
28276 | done | \ | ||
28277 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28278 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28279 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
28280 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
28281 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
28282 | - $$tags $$unique | ||
28283 | + $$unique | ||
28284 | |||
28285 | GTAGS: | ||
28286 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
28287 | - && cd $(top_srcdir) \ | ||
28288 | - && gtags -i $(GTAGS_ARGS) $$here | ||
28289 | + && $(am__cd) $(top_srcdir) \ | ||
28290 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
28291 | |||
28292 | distclean-tags: | ||
28293 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
28294 | @@ -599,13 +610,17 @@ | ||
28295 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
28296 | if test -d $$d/$$file; then \ | ||
28297 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
28298 | + if test -d "$(distdir)/$$file"; then \ | ||
28299 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28300 | + fi; \ | ||
28301 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
28302 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
28303 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
28304 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28305 | fi; \ | ||
28306 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
28307 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
28308 | else \ | ||
28309 | - test -f $(distdir)/$$file \ | ||
28310 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
28311 | + test -f "$(distdir)/$$file" \ | ||
28312 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
28313 | || exit 1; \ | ||
28314 | fi; \ | ||
28315 | done | ||
28316 | @@ -635,6 +650,7 @@ | ||
28317 | |||
28318 | distclean-generic: | ||
28319 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
28320 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
28321 | |||
28322 | maintainer-clean-generic: | ||
28323 | @echo "This command is intended for maintainers to use" | ||
28324 | @@ -657,6 +673,8 @@ | ||
28325 | |||
28326 | html: html-am | ||
28327 | |||
28328 | +html-am: | ||
28329 | + | ||
28330 | info: info-am | ||
28331 | |||
28332 | info-am: | ||
28333 | @@ -665,18 +683,28 @@ | ||
28334 | |||
28335 | install-dvi: install-dvi-am | ||
28336 | |||
28337 | +install-dvi-am: | ||
28338 | + | ||
28339 | install-exec-am: | ||
28340 | |||
28341 | install-html: install-html-am | ||
28342 | |||
28343 | +install-html-am: | ||
28344 | + | ||
28345 | install-info: install-info-am | ||
28346 | |||
28347 | +install-info-am: | ||
28348 | + | ||
28349 | install-man: | ||
28350 | |||
28351 | install-pdf: install-pdf-am | ||
28352 | |||
28353 | +install-pdf-am: | ||
28354 | + | ||
28355 | install-ps: install-ps-am | ||
28356 | |||
28357 | +install-ps-am: | ||
28358 | + | ||
28359 | installcheck-am: | ||
28360 | |||
28361 | maintainer-clean: maintainer-clean-am | ||
28362 | @@ -700,7 +728,7 @@ | ||
28363 | |||
28364 | uninstall-am: | ||
28365 | |||
28366 | -.MAKE: install-am install-strip | ||
28367 | +.MAKE: all check install install-am install-strip | ||
28368 | |||
28369 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
28370 | clean-libtool clean-noinstLTLIBRARIES ctags distclean \ | ||
28371 | @@ -776,6 +804,7 @@ | ||
28372 | |||
28373 | @MAINTAINER_MODE_TRUE@hc2cbdft2_%.c: $(CODELET_DEPS) $(GEN_HC2CDFT) | ||
28374 | @MAINTAINER_MODE_TRUE@ ($(PRELUDE_COMMANDS_RDFT); $(TWOVERS) $(GEN_HC2CDFT) $(FLAGS_HC2CB) -n $* -dif -name hc2cbdft2_$* -include "hc2cb.h") | $(ADD_DATE) | $(INDENT) >$@ | ||
28375 | + | ||
28376 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
28377 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
28378 | .NOEXPORT: | ||
28379 | diff -Nurd fftw-3.2.2/rdft/scalar/r2cf/Makefile.in fftw-3.2.2-arm-beta1/rdft/scalar/r2cf/Makefile.in | ||
28380 | --- fftw-3.2.2/rdft/scalar/r2cf/Makefile.in 2009-07-12 12:36:47.000000000 +0200 | ||
28381 | +++ fftw-3.2.2-arm-beta1/rdft/scalar/r2cf/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
28382 | @@ -1,8 +1,9 @@ | ||
28383 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
28384 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
28385 | # @configure_input@ | ||
28386 | |||
28387 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
28388 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
28389 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
28390 | +# Inc. | ||
28391 | # This Makefile.in is free software; the Free Software Foundation | ||
28392 | # gives unlimited permission to copy and/or distribute it, | ||
28393 | # with or without modifications, as long as this notice is preserved. | ||
28394 | @@ -32,8 +33,9 @@ | ||
28395 | |||
28396 | VPATH = @srcdir@ | ||
28397 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
28398 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
28399 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
28400 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
28401 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
28402 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
28403 | install_sh_DATA = $(install_sh) -c -m 644 | ||
28404 | install_sh_PROGRAM = $(install_sh) -c | ||
28405 | @@ -70,6 +72,7 @@ | ||
28406 | mkinstalldirs = $(install_sh) -d | ||
28407 | CONFIG_HEADER = $(top_builddir)/config.h | ||
28408 | CONFIG_CLEAN_FILES = | ||
28409 | +CONFIG_CLEAN_VPATH_FILES = | ||
28410 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
28411 | librdft_scalar_r2cf_la_LIBADD = | ||
28412 | am__objects_1 = r2cf_2.lo r2cf_3.lo r2cf_4.lo r2cf_5.lo r2cf_6.lo \ | ||
28413 | @@ -104,6 +107,7 @@ | ||
28414 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
28415 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
28416 | am__depfiles_maybe = depfiles | ||
28417 | +am__mv = mv -f | ||
28418 | CCLD = $(CC) | ||
28419 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
28420 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
28421 | @@ -183,6 +187,7 @@ | ||
28422 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
28423 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
28424 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
28425 | +PACKAGE_URL = @PACKAGE_URL@ | ||
28426 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
28427 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
28428 | POW_LIB = @POW_LIB@ | ||
28429 | @@ -382,9 +387,9 @@ | ||
28430 | exit 1;; \ | ||
28431 | esac; \ | ||
28432 | done; \ | ||
28433 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/r2cf/Makefile'; \ | ||
28434 | - cd $(top_srcdir) && \ | ||
28435 | - $(AUTOMAKE) --gnu rdft/scalar/r2cf/Makefile | ||
28436 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/r2cf/Makefile'; \ | ||
28437 | + $(am__cd) $(top_srcdir) && \ | ||
28438 | + $(AUTOMAKE) --gnu rdft/scalar/r2cf/Makefile | ||
28439 | .PRECIOUS: Makefile | ||
28440 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
28441 | @case '$?' in \ | ||
28442 | @@ -402,6 +407,7 @@ | ||
28443 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28444 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
28445 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28446 | +$(am__aclocal_m4_deps): | ||
28447 | |||
28448 | clean-noinstLTLIBRARIES: | ||
28449 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
28450 | @@ -511,21 +517,21 @@ | ||
28451 | |||
28452 | .c.o: | ||
28453 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28454 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28455 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28456 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28457 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28458 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
28459 | |||
28460 | .c.obj: | ||
28461 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
28462 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28463 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28464 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28465 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28466 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
28467 | |||
28468 | .c.lo: | ||
28469 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28470 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28471 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28472 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
28473 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28474 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
28475 | @@ -548,7 +554,7 @@ | ||
28476 | |||
28477 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28478 | $(TAGS_FILES) $(LISP) | ||
28479 | - tags=; \ | ||
28480 | + set x; \ | ||
28481 | here=`pwd`; \ | ||
28482 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28483 | unique=`for i in $$list; do \ | ||
28484 | @@ -556,29 +562,34 @@ | ||
28485 | done | \ | ||
28486 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28487 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28488 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
28489 | + shift; \ | ||
28490 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
28491 | test -n "$$unique" || unique=$$empty_fix; \ | ||
28492 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28493 | - $$tags $$unique; \ | ||
28494 | + if test $$# -gt 0; then \ | ||
28495 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28496 | + "$$@" $$unique; \ | ||
28497 | + else \ | ||
28498 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28499 | + $$unique; \ | ||
28500 | + fi; \ | ||
28501 | fi | ||
28502 | ctags: CTAGS | ||
28503 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28504 | $(TAGS_FILES) $(LISP) | ||
28505 | - tags=; \ | ||
28506 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28507 | unique=`for i in $$list; do \ | ||
28508 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
28509 | done | \ | ||
28510 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28511 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28512 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
28513 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
28514 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
28515 | - $$tags $$unique | ||
28516 | + $$unique | ||
28517 | |||
28518 | GTAGS: | ||
28519 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
28520 | - && cd $(top_srcdir) \ | ||
28521 | - && gtags -i $(GTAGS_ARGS) $$here | ||
28522 | + && $(am__cd) $(top_srcdir) \ | ||
28523 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
28524 | |||
28525 | distclean-tags: | ||
28526 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
28527 | @@ -599,13 +610,17 @@ | ||
28528 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
28529 | if test -d $$d/$$file; then \ | ||
28530 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
28531 | + if test -d "$(distdir)/$$file"; then \ | ||
28532 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28533 | + fi; \ | ||
28534 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
28535 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
28536 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
28537 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28538 | fi; \ | ||
28539 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
28540 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
28541 | else \ | ||
28542 | - test -f $(distdir)/$$file \ | ||
28543 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
28544 | + test -f "$(distdir)/$$file" \ | ||
28545 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
28546 | || exit 1; \ | ||
28547 | fi; \ | ||
28548 | done | ||
28549 | @@ -635,6 +650,7 @@ | ||
28550 | |||
28551 | distclean-generic: | ||
28552 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
28553 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
28554 | |||
28555 | maintainer-clean-generic: | ||
28556 | @echo "This command is intended for maintainers to use" | ||
28557 | @@ -657,6 +673,8 @@ | ||
28558 | |||
28559 | html: html-am | ||
28560 | |||
28561 | +html-am: | ||
28562 | + | ||
28563 | info: info-am | ||
28564 | |||
28565 | info-am: | ||
28566 | @@ -665,18 +683,28 @@ | ||
28567 | |||
28568 | install-dvi: install-dvi-am | ||
28569 | |||
28570 | +install-dvi-am: | ||
28571 | + | ||
28572 | install-exec-am: | ||
28573 | |||
28574 | install-html: install-html-am | ||
28575 | |||
28576 | +install-html-am: | ||
28577 | + | ||
28578 | install-info: install-info-am | ||
28579 | |||
28580 | +install-info-am: | ||
28581 | + | ||
28582 | install-man: | ||
28583 | |||
28584 | install-pdf: install-pdf-am | ||
28585 | |||
28586 | +install-pdf-am: | ||
28587 | + | ||
28588 | install-ps: install-ps-am | ||
28589 | |||
28590 | +install-ps-am: | ||
28591 | + | ||
28592 | installcheck-am: | ||
28593 | |||
28594 | maintainer-clean: maintainer-clean-am | ||
28595 | @@ -700,7 +728,7 @@ | ||
28596 | |||
28597 | uninstall-am: | ||
28598 | |||
28599 | -.MAKE: install-am install-strip | ||
28600 | +.MAKE: all check install install-am install-strip | ||
28601 | |||
28602 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
28603 | clean-libtool clean-noinstLTLIBRARIES ctags distclean \ | ||
28604 | @@ -776,6 +804,7 @@ | ||
28605 | |||
28606 | @MAINTAINER_MODE_TRUE@hc2cfdft2_%.c: $(CODELET_DEPS) $(GEN_HC2CDFT) | ||
28607 | @MAINTAINER_MODE_TRUE@ ($(PRELUDE_COMMANDS_RDFT); $(TWOVERS) $(GEN_HC2CDFT) $(FLAGS_HC2CF2) -n $* -dit -name hc2cfdft2_$* -include "hc2cf.h") | $(ADD_DATE) | $(INDENT) >$@ | ||
28608 | + | ||
28609 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
28610 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
28611 | .NOEXPORT: | ||
28612 | diff -Nurd fftw-3.2.2/rdft/scalar/r2r/Makefile.in fftw-3.2.2-arm-beta1/rdft/scalar/r2r/Makefile.in | ||
28613 | --- fftw-3.2.2/rdft/scalar/r2r/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
28614 | +++ fftw-3.2.2-arm-beta1/rdft/scalar/r2r/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
28615 | @@ -1,8 +1,9 @@ | ||
28616 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
28617 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
28618 | # @configure_input@ | ||
28619 | |||
28620 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
28621 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
28622 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
28623 | +# Inc. | ||
28624 | # This Makefile.in is free software; the Free Software Foundation | ||
28625 | # gives unlimited permission to copy and/or distribute it, | ||
28626 | # with or without modifications, as long as this notice is preserved. | ||
28627 | @@ -32,8 +33,9 @@ | ||
28628 | |||
28629 | VPATH = @srcdir@ | ||
28630 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
28631 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
28632 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
28633 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
28634 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
28635 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
28636 | install_sh_DATA = $(install_sh) -c -m 644 | ||
28637 | install_sh_PROGRAM = $(install_sh) -c | ||
28638 | @@ -70,6 +72,7 @@ | ||
28639 | mkinstalldirs = $(install_sh) -d | ||
28640 | CONFIG_HEADER = $(top_builddir)/config.h | ||
28641 | CONFIG_CLEAN_FILES = | ||
28642 | +CONFIG_CLEAN_VPATH_FILES = | ||
28643 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
28644 | librdft_scalar_r2r_la_LIBADD = | ||
28645 | am__objects_1 = | ||
28646 | @@ -85,6 +88,7 @@ | ||
28647 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
28648 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
28649 | am__depfiles_maybe = depfiles | ||
28650 | +am__mv = mv -f | ||
28651 | CCLD = $(CC) | ||
28652 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
28653 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
28654 | @@ -164,6 +168,7 @@ | ||
28655 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
28656 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
28657 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
28658 | +PACKAGE_URL = @PACKAGE_URL@ | ||
28659 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
28660 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
28661 | POW_LIB = @POW_LIB@ | ||
28662 | @@ -330,9 +335,9 @@ | ||
28663 | exit 1;; \ | ||
28664 | esac; \ | ||
28665 | done; \ | ||
28666 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/r2r/Makefile'; \ | ||
28667 | - cd $(top_srcdir) && \ | ||
28668 | - $(AUTOMAKE) --gnu rdft/scalar/r2r/Makefile | ||
28669 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/scalar/r2r/Makefile'; \ | ||
28670 | + $(am__cd) $(top_srcdir) && \ | ||
28671 | + $(AUTOMAKE) --gnu rdft/scalar/r2r/Makefile | ||
28672 | .PRECIOUS: Makefile | ||
28673 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
28674 | @case '$?' in \ | ||
28675 | @@ -350,6 +355,7 @@ | ||
28676 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28677 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
28678 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28679 | +$(am__aclocal_m4_deps): | ||
28680 | |||
28681 | clean-noinstLTLIBRARIES: | ||
28682 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
28683 | @@ -374,21 +380,21 @@ | ||
28684 | |||
28685 | .c.o: | ||
28686 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28687 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28688 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28689 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28690 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28691 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
28692 | |||
28693 | .c.obj: | ||
28694 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
28695 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28696 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28697 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28698 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28699 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
28700 | |||
28701 | .c.lo: | ||
28702 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28703 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28704 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28705 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
28706 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28707 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
28708 | @@ -411,7 +417,7 @@ | ||
28709 | |||
28710 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28711 | $(TAGS_FILES) $(LISP) | ||
28712 | - tags=; \ | ||
28713 | + set x; \ | ||
28714 | here=`pwd`; \ | ||
28715 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28716 | unique=`for i in $$list; do \ | ||
28717 | @@ -419,29 +425,34 @@ | ||
28718 | done | \ | ||
28719 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28720 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28721 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
28722 | + shift; \ | ||
28723 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
28724 | test -n "$$unique" || unique=$$empty_fix; \ | ||
28725 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28726 | - $$tags $$unique; \ | ||
28727 | + if test $$# -gt 0; then \ | ||
28728 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28729 | + "$$@" $$unique; \ | ||
28730 | + else \ | ||
28731 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28732 | + $$unique; \ | ||
28733 | + fi; \ | ||
28734 | fi | ||
28735 | ctags: CTAGS | ||
28736 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28737 | $(TAGS_FILES) $(LISP) | ||
28738 | - tags=; \ | ||
28739 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28740 | unique=`for i in $$list; do \ | ||
28741 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
28742 | done | \ | ||
28743 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28744 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28745 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
28746 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
28747 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
28748 | - $$tags $$unique | ||
28749 | + $$unique | ||
28750 | |||
28751 | GTAGS: | ||
28752 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
28753 | - && cd $(top_srcdir) \ | ||
28754 | - && gtags -i $(GTAGS_ARGS) $$here | ||
28755 | + && $(am__cd) $(top_srcdir) \ | ||
28756 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
28757 | |||
28758 | distclean-tags: | ||
28759 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
28760 | @@ -462,13 +473,17 @@ | ||
28761 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
28762 | if test -d $$d/$$file; then \ | ||
28763 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
28764 | + if test -d "$(distdir)/$$file"; then \ | ||
28765 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28766 | + fi; \ | ||
28767 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
28768 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
28769 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
28770 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28771 | fi; \ | ||
28772 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
28773 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
28774 | else \ | ||
28775 | - test -f $(distdir)/$$file \ | ||
28776 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
28777 | + test -f "$(distdir)/$$file" \ | ||
28778 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
28779 | || exit 1; \ | ||
28780 | fi; \ | ||
28781 | done | ||
28782 | @@ -498,6 +513,7 @@ | ||
28783 | |||
28784 | distclean-generic: | ||
28785 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
28786 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
28787 | |||
28788 | maintainer-clean-generic: | ||
28789 | @echo "This command is intended for maintainers to use" | ||
28790 | @@ -520,6 +536,8 @@ | ||
28791 | |||
28792 | html: html-am | ||
28793 | |||
28794 | +html-am: | ||
28795 | + | ||
28796 | info: info-am | ||
28797 | |||
28798 | info-am: | ||
28799 | @@ -528,18 +546,28 @@ | ||
28800 | |||
28801 | install-dvi: install-dvi-am | ||
28802 | |||
28803 | +install-dvi-am: | ||
28804 | + | ||
28805 | install-exec-am: | ||
28806 | |||
28807 | install-html: install-html-am | ||
28808 | |||
28809 | +install-html-am: | ||
28810 | + | ||
28811 | install-info: install-info-am | ||
28812 | |||
28813 | +install-info-am: | ||
28814 | + | ||
28815 | install-man: | ||
28816 | |||
28817 | install-pdf: install-pdf-am | ||
28818 | |||
28819 | +install-pdf-am: | ||
28820 | + | ||
28821 | install-ps: install-ps-am | ||
28822 | |||
28823 | +install-ps-am: | ||
28824 | + | ||
28825 | installcheck-am: | ||
28826 | |||
28827 | maintainer-clean: maintainer-clean-am | ||
28828 | @@ -563,7 +591,7 @@ | ||
28829 | |||
28830 | uninstall-am: | ||
28831 | |||
28832 | -.MAKE: install-am install-strip | ||
28833 | +.MAKE: all check install install-am install-strip | ||
28834 | |||
28835 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
28836 | clean-libtool clean-noinstLTLIBRARIES ctags distclean \ | ||
28837 | @@ -642,6 +670,7 @@ | ||
28838 | |||
28839 | @MAINTAINER_MODE_TRUE@dht_%.c: $(CODELET_DEPS) $(GEN_R2R) | ||
28840 | @MAINTAINER_MODE_TRUE@ ($(PRELUDE_COMMANDS_RDFT); $(TWOVERS) $(GEN_R2R) $(FLAGS_DHT) -dht -sign 1 -n $* -name dht_$* -include "r2r.h") | $(ADD_DATE) | $(INDENT) >$@ | ||
28841 | + | ||
28842 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
28843 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
28844 | .NOEXPORT: | ||
28845 | diff -Nurd fftw-3.2.2/rdft/simd/codelets/Makefile.in fftw-3.2.2-arm-beta1/rdft/simd/codelets/Makefile.in | ||
28846 | --- fftw-3.2.2/rdft/simd/codelets/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
28847 | +++ fftw-3.2.2-arm-beta1/rdft/simd/codelets/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
28848 | @@ -1,8 +1,9 @@ | ||
28849 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
28850 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
28851 | # @configure_input@ | ||
28852 | |||
28853 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
28854 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
28855 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
28856 | +# Inc. | ||
28857 | # This Makefile.in is free software; the Free Software Foundation | ||
28858 | # gives unlimited permission to copy and/or distribute it, | ||
28859 | # with or without modifications, as long as this notice is preserved. | ||
28860 | @@ -32,8 +33,9 @@ | ||
28861 | |||
28862 | VPATH = @srcdir@ | ||
28863 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
28864 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
28865 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
28866 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
28867 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
28868 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
28869 | install_sh_DATA = $(install_sh) -c -m 644 | ||
28870 | install_sh_PROGRAM = $(install_sh) -c | ||
28871 | @@ -70,6 +72,7 @@ | ||
28872 | mkinstalldirs = $(install_sh) -d | ||
28873 | CONFIG_HEADER = $(top_builddir)/config.h | ||
28874 | CONFIG_CLEAN_FILES = | ||
28875 | +CONFIG_CLEAN_VPATH_FILES = | ||
28876 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
28877 | librdft_simd_codelets_la_LIBADD = | ||
28878 | am__librdft_simd_codelets_la_SOURCES_DIST = hc2cfdftv_2.c \ | ||
28879 | @@ -94,6 +97,7 @@ | ||
28880 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
28881 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
28882 | am__depfiles_maybe = depfiles | ||
28883 | +am__mv = mv -f | ||
28884 | CCLD = $(CC) | ||
28885 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
28886 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
28887 | @@ -173,6 +177,7 @@ | ||
28888 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
28889 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
28890 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
28891 | +PACKAGE_URL = @PACKAGE_URL@ | ||
28892 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
28893 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
28894 | POW_LIB = @POW_LIB@ | ||
28895 | @@ -323,9 +328,9 @@ | ||
28896 | exit 1;; \ | ||
28897 | esac; \ | ||
28898 | done; \ | ||
28899 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/simd/codelets/Makefile'; \ | ||
28900 | - cd $(top_srcdir) && \ | ||
28901 | - $(AUTOMAKE) --gnu rdft/simd/codelets/Makefile | ||
28902 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/simd/codelets/Makefile'; \ | ||
28903 | + $(am__cd) $(top_srcdir) && \ | ||
28904 | + $(AUTOMAKE) --gnu rdft/simd/codelets/Makefile | ||
28905 | .PRECIOUS: Makefile | ||
28906 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
28907 | @case '$?' in \ | ||
28908 | @@ -343,6 +348,7 @@ | ||
28909 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28910 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
28911 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
28912 | +$(am__aclocal_m4_deps): | ||
28913 | |||
28914 | clean-noinstLTLIBRARIES: | ||
28915 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
28916 | @@ -383,21 +389,21 @@ | ||
28917 | |||
28918 | .c.o: | ||
28919 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28920 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28921 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28922 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28923 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28924 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
28925 | |||
28926 | .c.obj: | ||
28927 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
28928 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28929 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
28930 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
28931 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28932 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
28933 | |||
28934 | .c.lo: | ||
28935 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
28936 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28937 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
28938 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
28939 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
28940 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
28941 | @@ -420,7 +426,7 @@ | ||
28942 | |||
28943 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28944 | $(TAGS_FILES) $(LISP) | ||
28945 | - tags=; \ | ||
28946 | + set x; \ | ||
28947 | here=`pwd`; \ | ||
28948 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28949 | unique=`for i in $$list; do \ | ||
28950 | @@ -428,29 +434,34 @@ | ||
28951 | done | \ | ||
28952 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28953 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28954 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
28955 | + shift; \ | ||
28956 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
28957 | test -n "$$unique" || unique=$$empty_fix; \ | ||
28958 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28959 | - $$tags $$unique; \ | ||
28960 | + if test $$# -gt 0; then \ | ||
28961 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28962 | + "$$@" $$unique; \ | ||
28963 | + else \ | ||
28964 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
28965 | + $$unique; \ | ||
28966 | + fi; \ | ||
28967 | fi | ||
28968 | ctags: CTAGS | ||
28969 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
28970 | $(TAGS_FILES) $(LISP) | ||
28971 | - tags=; \ | ||
28972 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
28973 | unique=`for i in $$list; do \ | ||
28974 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
28975 | done | \ | ||
28976 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
28977 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
28978 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
28979 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
28980 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
28981 | - $$tags $$unique | ||
28982 | + $$unique | ||
28983 | |||
28984 | GTAGS: | ||
28985 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
28986 | - && cd $(top_srcdir) \ | ||
28987 | - && gtags -i $(GTAGS_ARGS) $$here | ||
28988 | + && $(am__cd) $(top_srcdir) \ | ||
28989 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
28990 | |||
28991 | distclean-tags: | ||
28992 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
28993 | @@ -471,13 +482,17 @@ | ||
28994 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
28995 | if test -d $$d/$$file; then \ | ||
28996 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
28997 | + if test -d "$(distdir)/$$file"; then \ | ||
28998 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
28999 | + fi; \ | ||
29000 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
29001 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
29002 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
29003 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
29004 | fi; \ | ||
29005 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
29006 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
29007 | else \ | ||
29008 | - test -f $(distdir)/$$file \ | ||
29009 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
29010 | + test -f "$(distdir)/$$file" \ | ||
29011 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
29012 | || exit 1; \ | ||
29013 | fi; \ | ||
29014 | done | ||
29015 | @@ -507,6 +522,7 @@ | ||
29016 | |||
29017 | distclean-generic: | ||
29018 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
29019 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
29020 | |||
29021 | maintainer-clean-generic: | ||
29022 | @echo "This command is intended for maintainers to use" | ||
29023 | @@ -529,6 +545,8 @@ | ||
29024 | |||
29025 | html: html-am | ||
29026 | |||
29027 | +html-am: | ||
29028 | + | ||
29029 | info: info-am | ||
29030 | |||
29031 | info-am: | ||
29032 | @@ -537,18 +555,28 @@ | ||
29033 | |||
29034 | install-dvi: install-dvi-am | ||
29035 | |||
29036 | +install-dvi-am: | ||
29037 | + | ||
29038 | install-exec-am: | ||
29039 | |||
29040 | install-html: install-html-am | ||
29041 | |||
29042 | +install-html-am: | ||
29043 | + | ||
29044 | install-info: install-info-am | ||
29045 | |||
29046 | +install-info-am: | ||
29047 | + | ||
29048 | install-man: | ||
29049 | |||
29050 | install-pdf: install-pdf-am | ||
29051 | |||
29052 | +install-pdf-am: | ||
29053 | + | ||
29054 | install-ps: install-ps-am | ||
29055 | |||
29056 | +install-ps-am: | ||
29057 | + | ||
29058 | installcheck-am: | ||
29059 | |||
29060 | maintainer-clean: maintainer-clean-am | ||
29061 | @@ -572,7 +600,7 @@ | ||
29062 | |||
29063 | uninstall-am: | ||
29064 | |||
29065 | -.MAKE: install-am install-strip | ||
29066 | +.MAKE: all check install install-am install-strip | ||
29067 | |||
29068 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | ||
29069 | clean-libtool clean-noinstLTLIBRARIES ctags distclean \ | ||
29070 | @@ -630,6 +658,7 @@ | ||
29071 | |||
29072 | @MAINTAINER_MODE_TRUE@hc2cbdftv_%.c: $(CODELET_DEPS) $(GEN_HC2CDFT_C) | ||
29073 | @MAINTAINER_MODE_TRUE@ ($(PRELUDE_COMMANDS_RDFT); $(TWOVERS) $(GEN_HC2CDFT_C) $(FLAGS_HC2C) -n $* -dif -sign 1 -name hc2cbdftv_$* -include "hc2cbv.h") | $(ADD_DATE) | $(INDENT) >$@ | ||
29074 | + | ||
29075 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
29076 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
29077 | .NOEXPORT: | ||
29078 | diff -Nurd fftw-3.2.2/rdft/simd/Makefile.in fftw-3.2.2-arm-beta1/rdft/simd/Makefile.in | ||
29079 | --- fftw-3.2.2/rdft/simd/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
29080 | +++ fftw-3.2.2-arm-beta1/rdft/simd/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
29081 | @@ -1,8 +1,9 @@ | ||
29082 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
29083 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
29084 | # @configure_input@ | ||
29085 | |||
29086 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
29087 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
29088 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
29089 | +# Inc. | ||
29090 | # This Makefile.in is free software; the Free Software Foundation | ||
29091 | # gives unlimited permission to copy and/or distribute it, | ||
29092 | # with or without modifications, as long as this notice is preserved. | ||
29093 | @@ -16,8 +17,9 @@ | ||
29094 | |||
29095 | VPATH = @srcdir@ | ||
29096 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
29097 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
29098 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
29099 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
29100 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
29101 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
29102 | install_sh_DATA = $(install_sh) -c -m 644 | ||
29103 | install_sh_PROGRAM = $(install_sh) -c | ||
29104 | @@ -53,6 +55,7 @@ | ||
29105 | mkinstalldirs = $(install_sh) -d | ||
29106 | CONFIG_HEADER = $(top_builddir)/config.h | ||
29107 | CONFIG_CLEAN_FILES = | ||
29108 | +CONFIG_CLEAN_VPATH_FILES = | ||
29109 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
29110 | librdft_simd_la_LIBADD = | ||
29111 | am_librdft_simd_la_OBJECTS = hc2cbv.lo hc2cfv.lo | ||
29112 | @@ -60,6 +63,7 @@ | ||
29113 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
29114 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
29115 | am__depfiles_maybe = depfiles | ||
29116 | +am__mv = mv -f | ||
29117 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
29118 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
29119 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
29120 | @@ -80,10 +84,38 @@ | ||
29121 | ps-recursive uninstall-recursive | ||
29122 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
29123 | distclean-recursive maintainer-clean-recursive | ||
29124 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
29125 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
29126 | + distdir | ||
29127 | ETAGS = etags | ||
29128 | CTAGS = ctags | ||
29129 | DIST_SUBDIRS = $(SUBDIRS) | ||
29130 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
29131 | +am__relativize = \ | ||
29132 | + dir0=`pwd`; \ | ||
29133 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
29134 | + sed_rest='s,^[^/]*/*,,'; \ | ||
29135 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
29136 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
29137 | + while test -n "$$dir1"; do \ | ||
29138 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
29139 | + if test "$$first" != "."; then \ | ||
29140 | + if test "$$first" = ".."; then \ | ||
29141 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
29142 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
29143 | + else \ | ||
29144 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
29145 | + if test "$$first2" = "$$first"; then \ | ||
29146 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
29147 | + else \ | ||
29148 | + dir2="../$$dir2"; \ | ||
29149 | + fi; \ | ||
29150 | + dir0="$$dir0"/"$$first"; \ | ||
29151 | + fi; \ | ||
29152 | + fi; \ | ||
29153 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
29154 | + done; \ | ||
29155 | + reldir="$$dir2" | ||
29156 | ACLOCAL = @ACLOCAL@ | ||
29157 | ALLOCA = @ALLOCA@ | ||
29158 | AMTAR = @AMTAR@ | ||
29159 | @@ -154,6 +186,7 @@ | ||
29160 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
29161 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
29162 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
29163 | +PACKAGE_URL = @PACKAGE_URL@ | ||
29164 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
29165 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
29166 | POW_LIB = @POW_LIB@ | ||
29167 | @@ -248,9 +281,9 @@ | ||
29168 | exit 1;; \ | ||
29169 | esac; \ | ||
29170 | done; \ | ||
29171 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/simd/Makefile'; \ | ||
29172 | - cd $(top_srcdir) && \ | ||
29173 | - $(AUTOMAKE) --gnu rdft/simd/Makefile | ||
29174 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rdft/simd/Makefile'; \ | ||
29175 | + $(am__cd) $(top_srcdir) && \ | ||
29176 | + $(AUTOMAKE) --gnu rdft/simd/Makefile | ||
29177 | .PRECIOUS: Makefile | ||
29178 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
29179 | @case '$?' in \ | ||
29180 | @@ -268,6 +301,7 @@ | ||
29181 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
29182 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
29183 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
29184 | +$(am__aclocal_m4_deps): | ||
29185 | |||
29186 | clean-noinstLTLIBRARIES: | ||
29187 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
29188 | @@ -291,21 +325,21 @@ | ||
29189 | |||
29190 | .c.o: | ||
29191 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
29192 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29193 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29194 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
29195 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29196 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
29197 | |||
29198 | .c.obj: | ||
29199 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
29200 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29201 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29202 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
29203 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29204 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
29205 | |||
29206 | .c.lo: | ||
29207 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
29208 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
29209 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
29210 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
29211 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29212 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
29213 | @@ -323,7 +357,7 @@ | ||
29214 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
29215 | # (2) otherwise, pass the desired values on the `make' command line. | ||
29216 | $(RECURSIVE_TARGETS): | ||
29217 | - @failcom='exit 1'; \ | ||
29218 | + @fail= failcom='exit 1'; \ | ||
29219 | for f in x $$MAKEFLAGS; do \ | ||
29220 | case $$f in \ | ||
29221 | *=* | --[!k]*);; \ | ||
29222 | @@ -340,7 +374,7 @@ | ||
29223 | else \ | ||
29224 | local_target="$$target"; \ | ||
29225 | fi; \ | ||
29226 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29227 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29228 | || eval $$failcom; \ | ||
29229 | done; \ | ||
29230 | if test "$$dot_seen" = "no"; then \ | ||
29231 | @@ -348,7 +382,7 @@ | ||
29232 | fi; test -z "$$fail" | ||
29233 | |||
29234 | $(RECURSIVE_CLEAN_TARGETS): | ||
29235 | - @failcom='exit 1'; \ | ||
29236 | + @fail= failcom='exit 1'; \ | ||
29237 | for f in x $$MAKEFLAGS; do \ | ||
29238 | case $$f in \ | ||
29239 | *=* | --[!k]*);; \ | ||
29240 | @@ -374,16 +408,16 @@ | ||
29241 | else \ | ||
29242 | local_target="$$target"; \ | ||
29243 | fi; \ | ||
29244 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29245 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29246 | || eval $$failcom; \ | ||
29247 | done && test -z "$$fail" | ||
29248 | tags-recursive: | ||
29249 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
29250 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
29251 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
29252 | done | ||
29253 | ctags-recursive: | ||
29254 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
29255 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
29256 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
29257 | done | ||
29258 | |||
29259 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
29260 | @@ -398,7 +432,7 @@ | ||
29261 | |||
29262 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
29263 | $(TAGS_FILES) $(LISP) | ||
29264 | - tags=; \ | ||
29265 | + set x; \ | ||
29266 | here=`pwd`; \ | ||
29267 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
29268 | include_option=--etags-include; \ | ||
29269 | @@ -410,7 +444,7 @@ | ||
29270 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
29271 | if test "$$subdir" = .; then :; else \ | ||
29272 | test ! -f $$subdir/TAGS || \ | ||
29273 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
29274 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
29275 | fi; \ | ||
29276 | done; \ | ||
29277 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
29278 | @@ -419,29 +453,34 @@ | ||
29279 | done | \ | ||
29280 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
29281 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
29282 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
29283 | + shift; \ | ||
29284 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
29285 | test -n "$$unique" || unique=$$empty_fix; \ | ||
29286 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
29287 | - $$tags $$unique; \ | ||
29288 | + if test $$# -gt 0; then \ | ||
29289 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
29290 | + "$$@" $$unique; \ | ||
29291 | + else \ | ||
29292 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
29293 | + $$unique; \ | ||
29294 | + fi; \ | ||
29295 | fi | ||
29296 | ctags: CTAGS | ||
29297 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
29298 | $(TAGS_FILES) $(LISP) | ||
29299 | - tags=; \ | ||
29300 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
29301 | unique=`for i in $$list; do \ | ||
29302 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
29303 | done | \ | ||
29304 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
29305 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
29306 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
29307 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
29308 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
29309 | - $$tags $$unique | ||
29310 | + $$unique | ||
29311 | |||
29312 | GTAGS: | ||
29313 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
29314 | - && cd $(top_srcdir) \ | ||
29315 | - && gtags -i $(GTAGS_ARGS) $$here | ||
29316 | + && $(am__cd) $(top_srcdir) \ | ||
29317 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
29318 | |||
29319 | distclean-tags: | ||
29320 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
29321 | @@ -462,29 +501,44 @@ | ||
29322 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
29323 | if test -d $$d/$$file; then \ | ||
29324 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
29325 | + if test -d "$(distdir)/$$file"; then \ | ||
29326 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
29327 | + fi; \ | ||
29328 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
29329 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
29330 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
29331 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
29332 | fi; \ | ||
29333 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
29334 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
29335 | else \ | ||
29336 | - test -f $(distdir)/$$file \ | ||
29337 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
29338 | + test -f "$(distdir)/$$file" \ | ||
29339 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
29340 | || exit 1; \ | ||
29341 | fi; \ | ||
29342 | done | ||
29343 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
29344 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
29345 | if test "$$subdir" = .; then :; else \ | ||
29346 | test -d "$(distdir)/$$subdir" \ | ||
29347 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
29348 | || exit 1; \ | ||
29349 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
29350 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
29351 | - (cd $$subdir && \ | ||
29352 | + fi; \ | ||
29353 | + done | ||
29354 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
29355 | + if test "$$subdir" = .; then :; else \ | ||
29356 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
29357 | + $(am__relativize); \ | ||
29358 | + new_distdir=$$reldir; \ | ||
29359 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
29360 | + $(am__relativize); \ | ||
29361 | + new_top_distdir=$$reldir; \ | ||
29362 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
29363 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
29364 | + ($(am__cd) $$subdir && \ | ||
29365 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
29366 | - top_distdir="$$top_distdir" \ | ||
29367 | - distdir="$$distdir/$$subdir" \ | ||
29368 | + top_distdir="$$new_top_distdir" \ | ||
29369 | + distdir="$$new_distdir" \ | ||
29370 | am__remove_distdir=: \ | ||
29371 | am__skip_length_check=: \ | ||
29372 | + am__skip_mode_fix=: \ | ||
29373 | distdir) \ | ||
29374 | || exit 1; \ | ||
29375 | fi; \ | ||
29376 | @@ -514,6 +568,7 @@ | ||
29377 | |||
29378 | distclean-generic: | ||
29379 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
29380 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
29381 | |||
29382 | maintainer-clean-generic: | ||
29383 | @echo "This command is intended for maintainers to use" | ||
29384 | @@ -535,6 +590,8 @@ | ||
29385 | |||
29386 | html: html-recursive | ||
29387 | |||
29388 | +html-am: | ||
29389 | + | ||
29390 | info: info-recursive | ||
29391 | |||
29392 | info-am: | ||
29393 | @@ -543,18 +600,28 @@ | ||
29394 | |||
29395 | install-dvi: install-dvi-recursive | ||
29396 | |||
29397 | +install-dvi-am: | ||
29398 | + | ||
29399 | install-exec-am: | ||
29400 | |||
29401 | install-html: install-html-recursive | ||
29402 | |||
29403 | +install-html-am: | ||
29404 | + | ||
29405 | install-info: install-info-recursive | ||
29406 | |||
29407 | +install-info-am: | ||
29408 | + | ||
29409 | install-man: | ||
29410 | |||
29411 | install-pdf: install-pdf-recursive | ||
29412 | |||
29413 | +install-pdf-am: | ||
29414 | + | ||
29415 | install-ps: install-ps-recursive | ||
29416 | |||
29417 | +install-ps-am: | ||
29418 | + | ||
29419 | installcheck-am: | ||
29420 | |||
29421 | maintainer-clean: maintainer-clean-recursive | ||
29422 | @@ -577,8 +644,8 @@ | ||
29423 | |||
29424 | uninstall-am: | ||
29425 | |||
29426 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
29427 | - install-strip | ||
29428 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
29429 | + install-am install-strip tags-recursive | ||
29430 | |||
29431 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
29432 | all all-am check check-am clean clean-generic clean-libtool \ | ||
29433 | @@ -595,6 +662,7 @@ | ||
29434 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | ||
29435 | uninstall uninstall-am | ||
29436 | |||
29437 | + | ||
29438 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
29439 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
29440 | .NOEXPORT: | ||
29441 | diff -Nurd fftw-3.2.2/reodft/Makefile.in fftw-3.2.2-arm-beta1/reodft/Makefile.in | ||
29442 | --- fftw-3.2.2/reodft/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
29443 | +++ fftw-3.2.2-arm-beta1/reodft/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
29444 | @@ -1,8 +1,9 @@ | ||
29445 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
29446 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
29447 | # @configure_input@ | ||
29448 | |||
29449 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
29450 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
29451 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
29452 | +# Inc. | ||
29453 | # This Makefile.in is free software; the Free Software Foundation | ||
29454 | # gives unlimited permission to copy and/or distribute it, | ||
29455 | # with or without modifications, as long as this notice is preserved. | ||
29456 | @@ -16,8 +17,9 @@ | ||
29457 | |||
29458 | VPATH = @srcdir@ | ||
29459 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
29460 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
29461 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
29462 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
29463 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
29464 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
29465 | install_sh_DATA = $(install_sh) -c -m 644 | ||
29466 | install_sh_PROGRAM = $(install_sh) -c | ||
29467 | @@ -53,6 +55,7 @@ | ||
29468 | mkinstalldirs = $(install_sh) -d | ||
29469 | CONFIG_HEADER = $(top_builddir)/config.h | ||
29470 | CONFIG_CLEAN_FILES = | ||
29471 | +CONFIG_CLEAN_VPATH_FILES = | ||
29472 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
29473 | libreodft_la_LIBADD = | ||
29474 | am_libreodft_la_OBJECTS = conf.lo reodft010e-r2hc.lo \ | ||
29475 | @@ -62,6 +65,7 @@ | ||
29476 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
29477 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
29478 | am__depfiles_maybe = depfiles | ||
29479 | +am__mv = mv -f | ||
29480 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
29481 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
29482 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
29483 | @@ -82,10 +86,38 @@ | ||
29484 | ps-recursive uninstall-recursive | ||
29485 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
29486 | distclean-recursive maintainer-clean-recursive | ||
29487 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
29488 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
29489 | + distdir | ||
29490 | ETAGS = etags | ||
29491 | CTAGS = ctags | ||
29492 | DIST_SUBDIRS = $(SUBDIRS) | ||
29493 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
29494 | +am__relativize = \ | ||
29495 | + dir0=`pwd`; \ | ||
29496 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
29497 | + sed_rest='s,^[^/]*/*,,'; \ | ||
29498 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
29499 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
29500 | + while test -n "$$dir1"; do \ | ||
29501 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
29502 | + if test "$$first" != "."; then \ | ||
29503 | + if test "$$first" = ".."; then \ | ||
29504 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
29505 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
29506 | + else \ | ||
29507 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
29508 | + if test "$$first2" = "$$first"; then \ | ||
29509 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
29510 | + else \ | ||
29511 | + dir2="../$$dir2"; \ | ||
29512 | + fi; \ | ||
29513 | + dir0="$$dir0"/"$$first"; \ | ||
29514 | + fi; \ | ||
29515 | + fi; \ | ||
29516 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
29517 | + done; \ | ||
29518 | + reldir="$$dir2" | ||
29519 | ACLOCAL = @ACLOCAL@ | ||
29520 | ALLOCA = @ALLOCA@ | ||
29521 | AMTAR = @AMTAR@ | ||
29522 | @@ -156,6 +188,7 @@ | ||
29523 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
29524 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
29525 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
29526 | +PACKAGE_URL = @PACKAGE_URL@ | ||
29527 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
29528 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
29529 | POW_LIB = @POW_LIB@ | ||
29530 | @@ -257,9 +290,9 @@ | ||
29531 | exit 1;; \ | ||
29532 | esac; \ | ||
29533 | done; \ | ||
29534 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu reodft/Makefile'; \ | ||
29535 | - cd $(top_srcdir) && \ | ||
29536 | - $(AUTOMAKE) --gnu reodft/Makefile | ||
29537 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu reodft/Makefile'; \ | ||
29538 | + $(am__cd) $(top_srcdir) && \ | ||
29539 | + $(AUTOMAKE) --gnu reodft/Makefile | ||
29540 | .PRECIOUS: Makefile | ||
29541 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
29542 | @case '$?' in \ | ||
29543 | @@ -277,6 +310,7 @@ | ||
29544 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
29545 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
29546 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
29547 | +$(am__aclocal_m4_deps): | ||
29548 | |||
29549 | clean-noinstLTLIBRARIES: | ||
29550 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
29551 | @@ -305,21 +339,21 @@ | ||
29552 | |||
29553 | .c.o: | ||
29554 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
29555 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29556 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29557 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
29558 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29559 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
29560 | |||
29561 | .c.obj: | ||
29562 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
29563 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29564 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29565 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
29566 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29567 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
29568 | |||
29569 | .c.lo: | ||
29570 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
29571 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
29572 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
29573 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
29574 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29575 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
29576 | @@ -337,7 +371,7 @@ | ||
29577 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
29578 | # (2) otherwise, pass the desired values on the `make' command line. | ||
29579 | $(RECURSIVE_TARGETS): | ||
29580 | - @failcom='exit 1'; \ | ||
29581 | + @fail= failcom='exit 1'; \ | ||
29582 | for f in x $$MAKEFLAGS; do \ | ||
29583 | case $$f in \ | ||
29584 | *=* | --[!k]*);; \ | ||
29585 | @@ -354,7 +388,7 @@ | ||
29586 | else \ | ||
29587 | local_target="$$target"; \ | ||
29588 | fi; \ | ||
29589 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29590 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29591 | || eval $$failcom; \ | ||
29592 | done; \ | ||
29593 | if test "$$dot_seen" = "no"; then \ | ||
29594 | @@ -362,7 +396,7 @@ | ||
29595 | fi; test -z "$$fail" | ||
29596 | |||
29597 | $(RECURSIVE_CLEAN_TARGETS): | ||
29598 | - @failcom='exit 1'; \ | ||
29599 | + @fail= failcom='exit 1'; \ | ||
29600 | for f in x $$MAKEFLAGS; do \ | ||
29601 | case $$f in \ | ||
29602 | *=* | --[!k]*);; \ | ||
29603 | @@ -388,16 +422,16 @@ | ||
29604 | else \ | ||
29605 | local_target="$$target"; \ | ||
29606 | fi; \ | ||
29607 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29608 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29609 | || eval $$failcom; \ | ||
29610 | done && test -z "$$fail" | ||
29611 | tags-recursive: | ||
29612 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
29613 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
29614 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
29615 | done | ||
29616 | ctags-recursive: | ||
29617 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
29618 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
29619 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
29620 | done | ||
29621 | |||
29622 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
29623 | @@ -412,7 +446,7 @@ | ||
29624 | |||
29625 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
29626 | $(TAGS_FILES) $(LISP) | ||
29627 | - tags=; \ | ||
29628 | + set x; \ | ||
29629 | here=`pwd`; \ | ||
29630 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
29631 | include_option=--etags-include; \ | ||
29632 | @@ -424,7 +458,7 @@ | ||
29633 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
29634 | if test "$$subdir" = .; then :; else \ | ||
29635 | test ! -f $$subdir/TAGS || \ | ||
29636 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
29637 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
29638 | fi; \ | ||
29639 | done; \ | ||
29640 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
29641 | @@ -433,29 +467,34 @@ | ||
29642 | done | \ | ||
29643 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
29644 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
29645 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
29646 | + shift; \ | ||
29647 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
29648 | test -n "$$unique" || unique=$$empty_fix; \ | ||
29649 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
29650 | - $$tags $$unique; \ | ||
29651 | + if test $$# -gt 0; then \ | ||
29652 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
29653 | + "$$@" $$unique; \ | ||
29654 | + else \ | ||
29655 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
29656 | + $$unique; \ | ||
29657 | + fi; \ | ||
29658 | fi | ||
29659 | ctags: CTAGS | ||
29660 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
29661 | $(TAGS_FILES) $(LISP) | ||
29662 | - tags=; \ | ||
29663 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
29664 | unique=`for i in $$list; do \ | ||
29665 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
29666 | done | \ | ||
29667 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
29668 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
29669 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
29670 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
29671 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
29672 | - $$tags $$unique | ||
29673 | + $$unique | ||
29674 | |||
29675 | GTAGS: | ||
29676 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
29677 | - && cd $(top_srcdir) \ | ||
29678 | - && gtags -i $(GTAGS_ARGS) $$here | ||
29679 | + && $(am__cd) $(top_srcdir) \ | ||
29680 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
29681 | |||
29682 | distclean-tags: | ||
29683 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
29684 | @@ -476,29 +515,44 @@ | ||
29685 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
29686 | if test -d $$d/$$file; then \ | ||
29687 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
29688 | + if test -d "$(distdir)/$$file"; then \ | ||
29689 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
29690 | + fi; \ | ||
29691 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
29692 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
29693 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
29694 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
29695 | fi; \ | ||
29696 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
29697 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
29698 | else \ | ||
29699 | - test -f $(distdir)/$$file \ | ||
29700 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
29701 | + test -f "$(distdir)/$$file" \ | ||
29702 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
29703 | || exit 1; \ | ||
29704 | fi; \ | ||
29705 | done | ||
29706 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
29707 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
29708 | if test "$$subdir" = .; then :; else \ | ||
29709 | test -d "$(distdir)/$$subdir" \ | ||
29710 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
29711 | || exit 1; \ | ||
29712 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
29713 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
29714 | - (cd $$subdir && \ | ||
29715 | + fi; \ | ||
29716 | + done | ||
29717 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
29718 | + if test "$$subdir" = .; then :; else \ | ||
29719 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
29720 | + $(am__relativize); \ | ||
29721 | + new_distdir=$$reldir; \ | ||
29722 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
29723 | + $(am__relativize); \ | ||
29724 | + new_top_distdir=$$reldir; \ | ||
29725 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
29726 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
29727 | + ($(am__cd) $$subdir && \ | ||
29728 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
29729 | - top_distdir="$$top_distdir" \ | ||
29730 | - distdir="$$distdir/$$subdir" \ | ||
29731 | + top_distdir="$$new_top_distdir" \ | ||
29732 | + distdir="$$new_distdir" \ | ||
29733 | am__remove_distdir=: \ | ||
29734 | am__skip_length_check=: \ | ||
29735 | + am__skip_mode_fix=: \ | ||
29736 | distdir) \ | ||
29737 | || exit 1; \ | ||
29738 | fi; \ | ||
29739 | @@ -528,6 +582,7 @@ | ||
29740 | |||
29741 | distclean-generic: | ||
29742 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
29743 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
29744 | |||
29745 | maintainer-clean-generic: | ||
29746 | @echo "This command is intended for maintainers to use" | ||
29747 | @@ -549,6 +604,8 @@ | ||
29748 | |||
29749 | html: html-recursive | ||
29750 | |||
29751 | +html-am: | ||
29752 | + | ||
29753 | info: info-recursive | ||
29754 | |||
29755 | info-am: | ||
29756 | @@ -557,18 +614,28 @@ | ||
29757 | |||
29758 | install-dvi: install-dvi-recursive | ||
29759 | |||
29760 | +install-dvi-am: | ||
29761 | + | ||
29762 | install-exec-am: | ||
29763 | |||
29764 | install-html: install-html-recursive | ||
29765 | |||
29766 | +install-html-am: | ||
29767 | + | ||
29768 | install-info: install-info-recursive | ||
29769 | |||
29770 | +install-info-am: | ||
29771 | + | ||
29772 | install-man: | ||
29773 | |||
29774 | install-pdf: install-pdf-recursive | ||
29775 | |||
29776 | +install-pdf-am: | ||
29777 | + | ||
29778 | install-ps: install-ps-recursive | ||
29779 | |||
29780 | +install-ps-am: | ||
29781 | + | ||
29782 | installcheck-am: | ||
29783 | |||
29784 | maintainer-clean: maintainer-clean-recursive | ||
29785 | @@ -591,8 +658,8 @@ | ||
29786 | |||
29787 | uninstall-am: | ||
29788 | |||
29789 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
29790 | - install-strip | ||
29791 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
29792 | + install-am install-strip tags-recursive | ||
29793 | |||
29794 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
29795 | all all-am check check-am clean clean-generic clean-libtool \ | ||
29796 | @@ -610,6 +677,7 @@ | ||
29797 | uninstall uninstall-am | ||
29798 | |||
29799 | # redft00e-r2hc.c rodft00e-r2hc.c reodft11e-r2hc.c | ||
29800 | + | ||
29801 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
29802 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
29803 | .NOEXPORT: | ||
29804 | diff -Nurd fftw-3.2.2/simd/Makefile.am fftw-3.2.2-arm-beta1/simd/Makefile.am | ||
29805 | --- fftw-3.2.2/simd/Makefile.am 2009-07-12 12:35:49.000000000 +0200 | ||
29806 | +++ fftw-3.2.2-arm-beta1/simd/Makefile.am 2011-03-26 22:28:55.000000000 +0100 | ||
29807 | @@ -3,4 +3,4 @@ | ||
29808 | noinst_LTLIBRARIES = libsimd.la | ||
29809 | |||
29810 | libsimd_la_SOURCES = altivec.c sse.c sse2.c simd-altivec.h simd-sse.h \ | ||
29811 | -simd-sse2.h simd.h taint.c x86-cpuid.h mips_ps.c mips_ps.h simd-mips_ps.h | ||
29812 | +simd-sse2.h simd.h taint.c x86-cpuid.h mips_ps.c mips_ps.h simd-mips_ps.h neon.c simd-neon.h | ||
29813 | diff -Nurd fftw-3.2.2/simd/Makefile.in fftw-3.2.2-arm-beta1/simd/Makefile.in | ||
29814 | --- fftw-3.2.2/simd/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
29815 | +++ fftw-3.2.2-arm-beta1/simd/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
29816 | @@ -1,8 +1,9 @@ | ||
29817 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
29818 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
29819 | # @configure_input@ | ||
29820 | |||
29821 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
29822 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
29823 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
29824 | +# Inc. | ||
29825 | # This Makefile.in is free software; the Free Software Foundation | ||
29826 | # gives unlimited permission to copy and/or distribute it, | ||
29827 | # with or without modifications, as long as this notice is preserved. | ||
29828 | @@ -16,8 +17,9 @@ | ||
29829 | |||
29830 | VPATH = @srcdir@ | ||
29831 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
29832 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
29833 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
29834 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
29835 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
29836 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
29837 | install_sh_DATA = $(install_sh) -c -m 644 | ||
29838 | install_sh_PROGRAM = $(install_sh) -c | ||
29839 | @@ -53,13 +55,16 @@ | ||
29840 | mkinstalldirs = $(install_sh) -d | ||
29841 | CONFIG_HEADER = $(top_builddir)/config.h | ||
29842 | CONFIG_CLEAN_FILES = | ||
29843 | +CONFIG_CLEAN_VPATH_FILES = | ||
29844 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
29845 | libsimd_la_LIBADD = | ||
29846 | -am_libsimd_la_OBJECTS = altivec.lo sse.lo sse2.lo taint.lo mips_ps.lo | ||
29847 | +am_libsimd_la_OBJECTS = altivec.lo sse.lo sse2.lo taint.lo mips_ps.lo \ | ||
29848 | + neon.lo | ||
29849 | libsimd_la_OBJECTS = $(am_libsimd_la_OBJECTS) | ||
29850 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
29851 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
29852 | am__depfiles_maybe = depfiles | ||
29853 | +am__mv = mv -f | ||
29854 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
29855 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
29856 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
29857 | @@ -80,10 +85,38 @@ | ||
29858 | ps-recursive uninstall-recursive | ||
29859 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | ||
29860 | distclean-recursive maintainer-clean-recursive | ||
29861 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
29862 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
29863 | + distdir | ||
29864 | ETAGS = etags | ||
29865 | CTAGS = ctags | ||
29866 | DIST_SUBDIRS = $(SUBDIRS) | ||
29867 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
29868 | +am__relativize = \ | ||
29869 | + dir0=`pwd`; \ | ||
29870 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
29871 | + sed_rest='s,^[^/]*/*,,'; \ | ||
29872 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
29873 | + sed_butlast='s,/*[^/]*$$,,'; \ | ||
29874 | + while test -n "$$dir1"; do \ | ||
29875 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
29876 | + if test "$$first" != "."; then \ | ||
29877 | + if test "$$first" = ".."; then \ | ||
29878 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
29879 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
29880 | + else \ | ||
29881 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
29882 | + if test "$$first2" = "$$first"; then \ | ||
29883 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
29884 | + else \ | ||
29885 | + dir2="../$$dir2"; \ | ||
29886 | + fi; \ | ||
29887 | + dir0="$$dir0"/"$$first"; \ | ||
29888 | + fi; \ | ||
29889 | + fi; \ | ||
29890 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
29891 | + done; \ | ||
29892 | + reldir="$$dir2" | ||
29893 | ACLOCAL = @ACLOCAL@ | ||
29894 | ALLOCA = @ALLOCA@ | ||
29895 | AMTAR = @AMTAR@ | ||
29896 | @@ -154,6 +187,7 @@ | ||
29897 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
29898 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
29899 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
29900 | +PACKAGE_URL = @PACKAGE_URL@ | ||
29901 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
29902 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
29903 | POW_LIB = @POW_LIB@ | ||
29904 | @@ -233,7 +267,7 @@ | ||
29905 | AM_CPPFLAGS = -I$(top_srcdir)/kernel | ||
29906 | noinst_LTLIBRARIES = libsimd.la | ||
29907 | libsimd_la_SOURCES = altivec.c sse.c sse2.c simd-altivec.h simd-sse.h \ | ||
29908 | -simd-sse2.h simd.h taint.c x86-cpuid.h mips_ps.c mips_ps.h simd-mips_ps.h | ||
29909 | +simd-sse2.h simd.h taint.c x86-cpuid.h mips_ps.c mips_ps.h simd-mips_ps.h neon.c simd-neon.h | ||
29910 | |||
29911 | all: all-recursive | ||
29912 | |||
29913 | @@ -248,9 +282,9 @@ | ||
29914 | exit 1;; \ | ||
29915 | esac; \ | ||
29916 | done; \ | ||
29917 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu simd/Makefile'; \ | ||
29918 | - cd $(top_srcdir) && \ | ||
29919 | - $(AUTOMAKE) --gnu simd/Makefile | ||
29920 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu simd/Makefile'; \ | ||
29921 | + $(am__cd) $(top_srcdir) && \ | ||
29922 | + $(AUTOMAKE) --gnu simd/Makefile | ||
29923 | .PRECIOUS: Makefile | ||
29924 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
29925 | @case '$?' in \ | ||
29926 | @@ -268,6 +302,7 @@ | ||
29927 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
29928 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
29929 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
29930 | +$(am__aclocal_m4_deps): | ||
29931 | |||
29932 | clean-noinstLTLIBRARIES: | ||
29933 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
29934 | @@ -288,27 +323,28 @@ | ||
29935 | |||
29936 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/altivec.Plo@am__quote@ | ||
29937 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_ps.Plo@am__quote@ | ||
29938 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/neon.Plo@am__quote@ | ||
29939 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sse.Plo@am__quote@ | ||
29940 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sse2.Plo@am__quote@ | ||
29941 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/taint.Plo@am__quote@ | ||
29942 | |||
29943 | .c.o: | ||
29944 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
29945 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29946 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29947 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
29948 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29949 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
29950 | |||
29951 | .c.obj: | ||
29952 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
29953 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29954 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
29955 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
29956 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29957 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
29958 | |||
29959 | .c.lo: | ||
29960 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
29961 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
29962 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
29963 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
29964 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
29965 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
29966 | @@ -326,7 +362,7 @@ | ||
29967 | # (which will cause the Makefiles to be regenerated when you run `make'); | ||
29968 | # (2) otherwise, pass the desired values on the `make' command line. | ||
29969 | $(RECURSIVE_TARGETS): | ||
29970 | - @failcom='exit 1'; \ | ||
29971 | + @fail= failcom='exit 1'; \ | ||
29972 | for f in x $$MAKEFLAGS; do \ | ||
29973 | case $$f in \ | ||
29974 | *=* | --[!k]*);; \ | ||
29975 | @@ -343,7 +379,7 @@ | ||
29976 | else \ | ||
29977 | local_target="$$target"; \ | ||
29978 | fi; \ | ||
29979 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29980 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29981 | || eval $$failcom; \ | ||
29982 | done; \ | ||
29983 | if test "$$dot_seen" = "no"; then \ | ||
29984 | @@ -351,7 +387,7 @@ | ||
29985 | fi; test -z "$$fail" | ||
29986 | |||
29987 | $(RECURSIVE_CLEAN_TARGETS): | ||
29988 | - @failcom='exit 1'; \ | ||
29989 | + @fail= failcom='exit 1'; \ | ||
29990 | for f in x $$MAKEFLAGS; do \ | ||
29991 | case $$f in \ | ||
29992 | *=* | --[!k]*);; \ | ||
29993 | @@ -377,16 +413,16 @@ | ||
29994 | else \ | ||
29995 | local_target="$$target"; \ | ||
29996 | fi; \ | ||
29997 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29998 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
29999 | || eval $$failcom; \ | ||
30000 | done && test -z "$$fail" | ||
30001 | tags-recursive: | ||
30002 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
30003 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
30004 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | ||
30005 | done | ||
30006 | ctags-recursive: | ||
30007 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
30008 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
30009 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | ||
30010 | done | ||
30011 | |||
30012 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
30013 | @@ -401,7 +437,7 @@ | ||
30014 | |||
30015 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
30016 | $(TAGS_FILES) $(LISP) | ||
30017 | - tags=; \ | ||
30018 | + set x; \ | ||
30019 | here=`pwd`; \ | ||
30020 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | ||
30021 | include_option=--etags-include; \ | ||
30022 | @@ -413,7 +449,7 @@ | ||
30023 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
30024 | if test "$$subdir" = .; then :; else \ | ||
30025 | test ! -f $$subdir/TAGS || \ | ||
30026 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | ||
30027 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | ||
30028 | fi; \ | ||
30029 | done; \ | ||
30030 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
30031 | @@ -422,29 +458,34 @@ | ||
30032 | done | \ | ||
30033 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
30034 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
30035 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
30036 | + shift; \ | ||
30037 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
30038 | test -n "$$unique" || unique=$$empty_fix; \ | ||
30039 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30040 | - $$tags $$unique; \ | ||
30041 | + if test $$# -gt 0; then \ | ||
30042 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30043 | + "$$@" $$unique; \ | ||
30044 | + else \ | ||
30045 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30046 | + $$unique; \ | ||
30047 | + fi; \ | ||
30048 | fi | ||
30049 | ctags: CTAGS | ||
30050 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
30051 | $(TAGS_FILES) $(LISP) | ||
30052 | - tags=; \ | ||
30053 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
30054 | unique=`for i in $$list; do \ | ||
30055 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
30056 | done | \ | ||
30057 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
30058 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
30059 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
30060 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
30061 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
30062 | - $$tags $$unique | ||
30063 | + $$unique | ||
30064 | |||
30065 | GTAGS: | ||
30066 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
30067 | - && cd $(top_srcdir) \ | ||
30068 | - && gtags -i $(GTAGS_ARGS) $$here | ||
30069 | + && $(am__cd) $(top_srcdir) \ | ||
30070 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
30071 | |||
30072 | distclean-tags: | ||
30073 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
30074 | @@ -465,29 +506,44 @@ | ||
30075 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
30076 | if test -d $$d/$$file; then \ | ||
30077 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
30078 | + if test -d "$(distdir)/$$file"; then \ | ||
30079 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30080 | + fi; \ | ||
30081 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
30082 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
30083 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
30084 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30085 | fi; \ | ||
30086 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
30087 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
30088 | else \ | ||
30089 | - test -f $(distdir)/$$file \ | ||
30090 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
30091 | + test -f "$(distdir)/$$file" \ | ||
30092 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
30093 | || exit 1; \ | ||
30094 | fi; \ | ||
30095 | done | ||
30096 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
30097 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
30098 | if test "$$subdir" = .; then :; else \ | ||
30099 | test -d "$(distdir)/$$subdir" \ | ||
30100 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | ||
30101 | || exit 1; \ | ||
30102 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | ||
30103 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | ||
30104 | - (cd $$subdir && \ | ||
30105 | + fi; \ | ||
30106 | + done | ||
30107 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
30108 | + if test "$$subdir" = .; then :; else \ | ||
30109 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
30110 | + $(am__relativize); \ | ||
30111 | + new_distdir=$$reldir; \ | ||
30112 | + dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
30113 | + $(am__relativize); \ | ||
30114 | + new_top_distdir=$$reldir; \ | ||
30115 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
30116 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
30117 | + ($(am__cd) $$subdir && \ | ||
30118 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
30119 | - top_distdir="$$top_distdir" \ | ||
30120 | - distdir="$$distdir/$$subdir" \ | ||
30121 | + top_distdir="$$new_top_distdir" \ | ||
30122 | + distdir="$$new_distdir" \ | ||
30123 | am__remove_distdir=: \ | ||
30124 | am__skip_length_check=: \ | ||
30125 | + am__skip_mode_fix=: \ | ||
30126 | distdir) \ | ||
30127 | || exit 1; \ | ||
30128 | fi; \ | ||
30129 | @@ -517,6 +573,7 @@ | ||
30130 | |||
30131 | distclean-generic: | ||
30132 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
30133 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
30134 | |||
30135 | maintainer-clean-generic: | ||
30136 | @echo "This command is intended for maintainers to use" | ||
30137 | @@ -538,6 +595,8 @@ | ||
30138 | |||
30139 | html: html-recursive | ||
30140 | |||
30141 | +html-am: | ||
30142 | + | ||
30143 | info: info-recursive | ||
30144 | |||
30145 | info-am: | ||
30146 | @@ -546,18 +605,28 @@ | ||
30147 | |||
30148 | install-dvi: install-dvi-recursive | ||
30149 | |||
30150 | +install-dvi-am: | ||
30151 | + | ||
30152 | install-exec-am: | ||
30153 | |||
30154 | install-html: install-html-recursive | ||
30155 | |||
30156 | +install-html-am: | ||
30157 | + | ||
30158 | install-info: install-info-recursive | ||
30159 | |||
30160 | +install-info-am: | ||
30161 | + | ||
30162 | install-man: | ||
30163 | |||
30164 | install-pdf: install-pdf-recursive | ||
30165 | |||
30166 | +install-pdf-am: | ||
30167 | + | ||
30168 | install-ps: install-ps-recursive | ||
30169 | |||
30170 | +install-ps-am: | ||
30171 | + | ||
30172 | installcheck-am: | ||
30173 | |||
30174 | maintainer-clean: maintainer-clean-recursive | ||
30175 | @@ -580,8 +649,8 @@ | ||
30176 | |||
30177 | uninstall-am: | ||
30178 | |||
30179 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | ||
30180 | - install-strip | ||
30181 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | ||
30182 | + install-am install-strip tags-recursive | ||
30183 | |||
30184 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | ||
30185 | all all-am check check-am clean clean-generic clean-libtool \ | ||
30186 | @@ -598,6 +667,7 @@ | ||
30187 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | ||
30188 | uninstall uninstall-am | ||
30189 | |||
30190 | + | ||
30191 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
30192 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
30193 | .NOEXPORT: | ||
30194 | diff -Nurd fftw-3.2.2/simd/neon.c fftw-3.2.2-arm-beta1/simd/neon.c | ||
30195 | --- fftw-3.2.2/simd/neon.c 1970-01-01 01:00:00.000000000 +0100 | ||
30196 | +++ fftw-3.2.2-arm-beta1/simd/neon.c 2011-04-10 14:16:55.000000000 +0200 | ||
30197 | @@ -0,0 +1,73 @@ | ||
30198 | +/* | ||
30199 | + * Copyright (c) 2011 Vesperix Corporation | ||
30200 | + * | ||
30201 | + * This program is free software; you can redistribute it and/or modify | ||
30202 | + * it under the terms of the GNU General Public License as published by | ||
30203 | + * the Free Software Foundation; either version 2 of the License, or | ||
30204 | + * (at your option) any later version. | ||
30205 | + * | ||
30206 | + * This program is distributed in the hope that it will be useful, | ||
30207 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
30208 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
30209 | + * GNU General Public License for more details. | ||
30210 | + * | ||
30211 | + * You should have received a copy of the GNU General Public License | ||
30212 | + * along with this program; if not, write to the Free Software | ||
30213 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
30214 | + */ | ||
30215 | + | ||
30216 | + | ||
30217 | +#include "ifftw.h" | ||
30218 | +#include "simd.h" | ||
30219 | + | ||
30220 | +#if HAVE_NEON | ||
30221 | + | ||
30222 | +#ifdef __ARM_NEON__ | ||
30223 | + | ||
30224 | +int RIGHT_CPU(void) | ||
30225 | +{ | ||
30226 | + return 1; | ||
30227 | +} | ||
30228 | + | ||
30229 | +#else | ||
30230 | + | ||
30231 | +#include <signal.h> | ||
30232 | +#include <setjmp.h> | ||
30233 | + | ||
30234 | +static jmp_buf jb; | ||
30235 | + | ||
30236 | +static void sighandler(int x) | ||
30237 | +{ | ||
30238 | + longjmp(jb, 1); | ||
30239 | +} | ||
30240 | + | ||
30241 | +static int really_have_neon(void) | ||
30242 | +{ | ||
30243 | + void (*oldsig)(int); | ||
30244 | + oldsig = signal(SIGILL, sighandler); | ||
30245 | + if (setjmp(jb)) { | ||
30246 | + signal(SIGILL, oldsig); | ||
30247 | + return 0; | ||
30248 | + } else { | ||
30249 | + __asm__ __volatile__ ("vmov.f32 d0, #0.0\n" : : : "d0"); | ||
30250 | + signal(SIGILL, oldsig); | ||
30251 | + return 1; | ||
30252 | + } | ||
30253 | + return 0; | ||
30254 | +} | ||
30255 | + | ||
30256 | +int RIGHT_CPU(void) | ||
30257 | +{ | ||
30258 | + static int init = 0, res; | ||
30259 | + if (!init) { | ||
30260 | + res = really_have_neon(); | ||
30261 | + init = 1; | ||
30262 | + } | ||
30263 | + return res; | ||
30264 | +} | ||
30265 | + | ||
30266 | +#endif /* __ARM_NEON__ */ | ||
30267 | + | ||
30268 | +#endif /* HAVE_NEON */ | ||
30269 | + | ||
30270 | + | ||
30271 | diff -Nurd fftw-3.2.2/simd/nonportable/Makefile.in fftw-3.2.2-arm-beta1/simd/nonportable/Makefile.in | ||
30272 | --- fftw-3.2.2/simd/nonportable/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
30273 | +++ fftw-3.2.2-arm-beta1/simd/nonportable/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
30274 | @@ -1,8 +1,9 @@ | ||
30275 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
30276 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
30277 | # @configure_input@ | ||
30278 | |||
30279 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
30280 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
30281 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
30282 | +# Inc. | ||
30283 | # This Makefile.in is free software; the Free Software Foundation | ||
30284 | # gives unlimited permission to copy and/or distribute it, | ||
30285 | # with or without modifications, as long as this notice is preserved. | ||
30286 | @@ -19,8 +20,9 @@ | ||
30287 | |||
30288 | VPATH = @srcdir@ | ||
30289 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
30290 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
30291 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
30292 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
30293 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
30294 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
30295 | install_sh_DATA = $(install_sh) -c -m 644 | ||
30296 | install_sh_PROGRAM = $(install_sh) -c | ||
30297 | @@ -56,6 +58,7 @@ | ||
30298 | mkinstalldirs = $(install_sh) -d | ||
30299 | CONFIG_HEADER = $(top_builddir)/config.h | ||
30300 | CONFIG_CLEAN_FILES = | ||
30301 | +CONFIG_CLEAN_VPATH_FILES = | ||
30302 | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||
30303 | libsimd_nonportable_la_LIBADD = | ||
30304 | am_libsimd_nonportable_la_OBJECTS = sse.lo sse2.lo | ||
30305 | @@ -63,6 +66,7 @@ | ||
30306 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
30307 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
30308 | am__depfiles_maybe = depfiles | ||
30309 | +am__mv = mv -f | ||
30310 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
30311 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
30312 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
30313 | @@ -147,6 +151,7 @@ | ||
30314 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
30315 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
30316 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
30317 | +PACKAGE_URL = @PACKAGE_URL@ | ||
30318 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
30319 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
30320 | POW_LIB = @POW_LIB@ | ||
30321 | @@ -239,9 +244,9 @@ | ||
30322 | exit 1;; \ | ||
30323 | esac; \ | ||
30324 | done; \ | ||
30325 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu simd/nonportable/Makefile'; \ | ||
30326 | - cd $(top_srcdir) && \ | ||
30327 | - $(AUTOMAKE) --gnu simd/nonportable/Makefile | ||
30328 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu simd/nonportable/Makefile'; \ | ||
30329 | + $(am__cd) $(top_srcdir) && \ | ||
30330 | + $(AUTOMAKE) --gnu simd/nonportable/Makefile | ||
30331 | .PRECIOUS: Makefile | ||
30332 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
30333 | @case '$?' in \ | ||
30334 | @@ -259,6 +264,7 @@ | ||
30335 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
30336 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
30337 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
30338 | +$(am__aclocal_m4_deps): | ||
30339 | |||
30340 | clean-noinstLTLIBRARIES: | ||
30341 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
30342 | @@ -282,21 +288,21 @@ | ||
30343 | |||
30344 | .c.o: | ||
30345 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
30346 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30347 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30348 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
30349 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
30350 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
30351 | |||
30352 | .c.obj: | ||
30353 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
30354 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30355 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30356 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
30357 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
30358 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
30359 | |||
30360 | .c.lo: | ||
30361 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
30362 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
30363 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
30364 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
30365 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
30366 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
30367 | @@ -319,7 +325,7 @@ | ||
30368 | |||
30369 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
30370 | $(TAGS_FILES) $(LISP) | ||
30371 | - tags=; \ | ||
30372 | + set x; \ | ||
30373 | here=`pwd`; \ | ||
30374 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
30375 | unique=`for i in $$list; do \ | ||
30376 | @@ -327,29 +333,34 @@ | ||
30377 | done | \ | ||
30378 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
30379 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
30380 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
30381 | + shift; \ | ||
30382 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
30383 | test -n "$$unique" || unique=$$empty_fix; \ | ||
30384 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30385 | - $$tags $$unique; \ | ||
30386 | + if test $$# -gt 0; then \ | ||
30387 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30388 | + "$$@" $$unique; \ | ||
30389 | + else \ | ||
30390 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30391 | + $$unique; \ | ||
30392 | + fi; \ | ||
30393 | fi | ||
30394 | ctags: CTAGS | ||
30395 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
30396 | $(TAGS_FILES) $(LISP) | ||
30397 | - tags=; \ | ||
30398 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
30399 | unique=`for i in $$list; do \ | ||
30400 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
30401 | done | \ | ||
30402 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
30403 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
30404 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
30405 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
30406 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
30407 | - $$tags $$unique | ||
30408 | + $$unique | ||
30409 | |||
30410 | GTAGS: | ||
30411 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
30412 | - && cd $(top_srcdir) \ | ||
30413 | - && gtags -i $(GTAGS_ARGS) $$here | ||
30414 | + && $(am__cd) $(top_srcdir) \ | ||
30415 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
30416 | |||
30417 | distclean-tags: | ||
30418 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
30419 | @@ -370,13 +381,17 @@ | ||
30420 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
30421 | if test -d $$d/$$file; then \ | ||
30422 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
30423 | + if test -d "$(distdir)/$$file"; then \ | ||
30424 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30425 | + fi; \ | ||
30426 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
30427 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
30428 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
30429 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30430 | fi; \ | ||
30431 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
30432 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
30433 | else \ | ||
30434 | - test -f $(distdir)/$$file \ | ||
30435 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
30436 | + test -f "$(distdir)/$$file" \ | ||
30437 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
30438 | || exit 1; \ | ||
30439 | fi; \ | ||
30440 | done | ||
30441 | @@ -404,6 +419,7 @@ | ||
30442 | |||
30443 | distclean-generic: | ||
30444 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
30445 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
30446 | |||
30447 | maintainer-clean-generic: | ||
30448 | @echo "This command is intended for maintainers to use" | ||
30449 | @@ -425,6 +441,8 @@ | ||
30450 | |||
30451 | html: html-am | ||
30452 | |||
30453 | +html-am: | ||
30454 | + | ||
30455 | info: info-am | ||
30456 | |||
30457 | info-am: | ||
30458 | @@ -433,18 +451,28 @@ | ||
30459 | |||
30460 | install-dvi: install-dvi-am | ||
30461 | |||
30462 | +install-dvi-am: | ||
30463 | + | ||
30464 | install-exec-am: | ||
30465 | |||
30466 | install-html: install-html-am | ||
30467 | |||
30468 | +install-html-am: | ||
30469 | + | ||
30470 | install-info: install-info-am | ||
30471 | |||
30472 | +install-info-am: | ||
30473 | + | ||
30474 | install-man: | ||
30475 | |||
30476 | install-pdf: install-pdf-am | ||
30477 | |||
30478 | +install-pdf-am: | ||
30479 | + | ||
30480 | install-ps: install-ps-am | ||
30481 | |||
30482 | +install-ps-am: | ||
30483 | + | ||
30484 | installcheck-am: | ||
30485 | |||
30486 | maintainer-clean: maintainer-clean-am | ||
30487 | @@ -482,6 +510,7 @@ | ||
30488 | mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | ||
30489 | pdf pdf-am ps ps-am tags uninstall uninstall-am | ||
30490 | |||
30491 | + | ||
30492 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
30493 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
30494 | .NOEXPORT: | ||
30495 | diff -Nurd fftw-3.2.2/simd/simd.h fftw-3.2.2-arm-beta1/simd/simd.h | ||
30496 | --- fftw-3.2.2/simd/simd.h 2009-07-12 12:35:49.000000000 +0200 | ||
30497 | +++ fftw-3.2.2-arm-beta1/simd/simd.h 2011-03-26 20:20:11.000000000 +0100 | ||
30498 | @@ -40,6 +40,10 @@ | ||
30499 | #include "simd-mips_ps.h" | ||
30500 | #endif | ||
30501 | |||
30502 | +#ifdef HAVE_NEON | ||
30503 | +#include "simd-neon.h" | ||
30504 | +#endif | ||
30505 | + | ||
30506 | /* TAINT_BIT is set if pointers are not guaranteed to be multiples of | ||
30507 | ALIGNMENT */ | ||
30508 | #define TAINT_BIT 1 | ||
30509 | diff -Nurd fftw-3.2.2/simd/simd-neon.h fftw-3.2.2-arm-beta1/simd/simd-neon.h | ||
30510 | --- fftw-3.2.2/simd/simd-neon.h 1970-01-01 01:00:00.000000000 +0100 | ||
30511 | +++ fftw-3.2.2-arm-beta1/simd/simd-neon.h 2011-04-10 14:16:12.000000000 +0200 | ||
30512 | @@ -0,0 +1,134 @@ | ||
30513 | +/* | ||
30514 | + * Copyright (c) 2011 Vesperix Corporation | ||
30515 | + * | ||
30516 | + * This program is free software; you can redistribute it and/or modify | ||
30517 | + * it under the terms of the GNU General Public License as published by | ||
30518 | + * the Free Software Foundation; either version 2 of the License, or | ||
30519 | + * (at your option) any later version. | ||
30520 | + * | ||
30521 | + * This program is distributed in the hope that it will be useful, | ||
30522 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
30523 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
30524 | + * GNU General Public License for more details. | ||
30525 | + * | ||
30526 | + * You should have received a copy of the GNU General Public License | ||
30527 | + * along with this program; if not, write to the Free Software | ||
30528 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
30529 | + */ | ||
30530 | + | ||
30531 | +#ifndef FFTW_SINGLE | ||
30532 | +#error "NEON only works in single precision" | ||
30533 | +#endif | ||
30534 | + | ||
30535 | +#define RIGHT_CPU X(have_neon) | ||
30536 | +extern int RIGHT_CPU(void); | ||
30537 | + | ||
30538 | +#define VL 1 | ||
30539 | +#define ALIGNMENT 8 | ||
30540 | +#define ALIGNMENTA 8 | ||
30541 | +#define SIMD_VSTRIDE_OKA(x) 1 | ||
30542 | +#define SIMD_STRIDE_OKPAIR SIMD_STRIDE_OKA | ||
30543 | + | ||
30544 | +#ifdef __ARM_NEON__ | ||
30545 | + | ||
30546 | +#ifdef HAVE_ARM_NEON_H | ||
30547 | +#include <arm_neon.h> | ||
30548 | +#endif | ||
30549 | + | ||
30550 | +typedef float32x2_t V; | ||
30551 | + | ||
30552 | +#define LDK(x) x | ||
30553 | +#define DVK(var, val) const V var = { val, val } | ||
30554 | + | ||
30555 | +#define VADD(a, b) vadd_f32(a, b) | ||
30556 | +#define VSUB(a, b) vsub_f32(a, b) | ||
30557 | +#define VMUL(a, b) vmul_f32(a, b) | ||
30558 | +#define VFMA(a, b, c) vmla_f32(c, b, a) | ||
30559 | +#define VFNMS(a, b, c) vmls_f32(c, b, a) | ||
30560 | +#define VFMS(a, b, c) vmla_f32(vneg_f32(c), b, a) | ||
30561 | + | ||
30562 | +#define LD(x, ivs, aligned_like) vld1_f32((float32_t *)x) | ||
30563 | +#define LDA(x, ivs, aligned_like) vld1_f32((float32_t *)x) | ||
30564 | + | ||
30565 | +#define ST(x, v, ovs, aligned_like) vst1_f32((float32_t *)x, v) | ||
30566 | +#define STA(x, v, ovs, aligned_like) vst1_f32((float32_t *)x, v) | ||
30567 | + | ||
30568 | +#define STM2(x, v, ovs, aligned_like) vst1_f32((float32_t *)x, v) | ||
30569 | + | ||
30570 | +#define STN2(x, v0, v1, ovs) /* not using STN2, using STM2 */ | ||
30571 | + | ||
30572 | +static inline void STM4(R *x, V v, INT ovs, R *aligned_like) | ||
30573 | +{ | ||
30574 | + *x = vget_lane_f32(v,0); | ||
30575 | + *(x + ovs) = vget_lane_f32(v,1); | ||
30576 | +} | ||
30577 | + | ||
30578 | +#define STN4(x, v0, v1, v2, v3, ovs) /* not using STN4, using STM4 */ | ||
30579 | + | ||
30580 | +#define FLIP_RI(x) vrev64_f32(x) | ||
30581 | + | ||
30582 | +static inline V VCONJ(V x) | ||
30583 | +{ | ||
30584 | + const V pm = {1.0, -1.0}; | ||
30585 | + return VMUL(x, pm); | ||
30586 | +} | ||
30587 | + | ||
30588 | +static inline V VBYI(V x) | ||
30589 | +{ | ||
30590 | + return FLIP_RI(VCONJ(x)); | ||
30591 | +} | ||
30592 | + | ||
30593 | +static inline V VZMUL(V a, V b) | ||
30594 | +{ | ||
30595 | + V tr = vdup_n_f32(vget_lane_f32(a,0)); | ||
30596 | + V ti = vdup_n_f32(vget_lane_f32(a,1)); | ||
30597 | + tr = VMUL(b, tr); | ||
30598 | + b = VBYI(b); | ||
30599 | +#ifdef HAVE_FMA | ||
30600 | + return VFMA(ti,b,tr); | ||
30601 | +#else | ||
30602 | + return VADD(tr,VMUL(ti,b)); | ||
30603 | +#endif /* HAVE_FMA */ | ||
30604 | +} | ||
30605 | + | ||
30606 | +#define VFMAI(a, b) VADD(b, VBYI(a)) | ||
30607 | +#define VFNMSI(a, b) VSUB(b, VBYI(a)) | ||
30608 | +#define VZMULJ(a, b) VZMUL(VCONJ(a), b) | ||
30609 | +#define VZMULI(a, b) VBYI(VZMUL(a, b)) | ||
30610 | +#define VZMULIJ(a, b) VBYI(VZMULJ(a, b)) | ||
30611 | +#define VFMACONJ(a, b) VADD(VCONJ(a), b) | ||
30612 | +#define VFMSCONJ(a, b) VSUB(VCONJ(a), b) | ||
30613 | +#define VFNMSCONJ(a, b) VSUB(b, VCONJ(a)) | ||
30614 | + | ||
30615 | +#define VTW1(v,x) {TW_CEXP,v,x} | ||
30616 | +#define TWVL1 1 | ||
30617 | +#define VTW2(v,x) {TW_COS,v,x}, {TW_COS,v,x}, {TW_SIN,v,-x}, {TW_SIN,v,x} | ||
30618 | +#define TWVL2 2 | ||
30619 | +#define VTW3(v,x) VTW1(v,x) | ||
30620 | +#define TWVL3 TWVL1 | ||
30621 | +#define VTWS(v,x) {TW_COS,v,x}, {TW_COS,v+1,x}, {TW_SIN,v,x}, {TW_SIN,v+1,x} | ||
30622 | +#define TWVLS (2 * VL) | ||
30623 | + | ||
30624 | +static inline V BYTW1(const R *t, V sr) | ||
30625 | +{ | ||
30626 | + return VZMUL(vld1_f32((float32_t *)t),sr); | ||
30627 | +} | ||
30628 | + | ||
30629 | +static inline V BYTWJ1(const R *t, V sr) | ||
30630 | +{ | ||
30631 | + return VZMULJ(vld1_f32((float32_t *)t),sr); | ||
30632 | +} | ||
30633 | + | ||
30634 | +static inline V BYTW2(const R *t, V sr) | ||
30635 | +{ | ||
30636 | + const V *tv = (const V *)t; | ||
30637 | + return VADD(VMUL(*tv,sr),VMUL(*(tv + 1),FLIP_RI(sr))); | ||
30638 | +} | ||
30639 | + | ||
30640 | +static inline V BYTWJ2(const R *t, V sr) | ||
30641 | +{ | ||
30642 | + const V *tv = (const V *)t; | ||
30643 | + return VSUB(VMUL(*tv,sr),VMUL(*(tv + 1),FLIP_RI(sr))); | ||
30644 | +} | ||
30645 | + | ||
30646 | +#endif /* __ARM_NEON__ */ | ||
30647 | diff -Nurd fftw-3.2.2/support/Makefile.in fftw-3.2.2-arm-beta1/support/Makefile.in | ||
30648 | --- fftw-3.2.2/support/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
30649 | +++ fftw-3.2.2-arm-beta1/support/Makefile.in 2011-03-26 22:34:06.000000000 +0100 | ||
30650 | @@ -1,8 +1,9 @@ | ||
30651 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
30652 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
30653 | # @configure_input@ | ||
30654 | |||
30655 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
30656 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
30657 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
30658 | +# Inc. | ||
30659 | # This Makefile.in is free software; the Free Software Foundation | ||
30660 | # gives unlimited permission to copy and/or distribute it, | ||
30661 | # with or without modifications, as long as this notice is preserved. | ||
30662 | @@ -15,8 +16,9 @@ | ||
30663 | @SET_MAKE@ | ||
30664 | VPATH = @srcdir@ | ||
30665 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
30666 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
30667 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
30668 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
30669 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
30670 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
30671 | install_sh_DATA = $(install_sh) -c -m 644 | ||
30672 | install_sh_PROGRAM = $(install_sh) -c | ||
30673 | @@ -52,6 +54,7 @@ | ||
30674 | mkinstalldirs = $(install_sh) -d | ||
30675 | CONFIG_HEADER = $(top_builddir)/config.h | ||
30676 | CONFIG_CLEAN_FILES = | ||
30677 | +CONFIG_CLEAN_VPATH_FILES = | ||
30678 | SOURCES = | ||
30679 | DIST_SOURCES = | ||
30680 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
30681 | @@ -125,6 +128,7 @@ | ||
30682 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
30683 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
30684 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
30685 | +PACKAGE_URL = @PACKAGE_URL@ | ||
30686 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
30687 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
30688 | POW_LIB = @POW_LIB@ | ||
30689 | @@ -215,9 +219,9 @@ | ||
30690 | exit 1;; \ | ||
30691 | esac; \ | ||
30692 | done; \ | ||
30693 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu support/Makefile'; \ | ||
30694 | - cd $(top_srcdir) && \ | ||
30695 | - $(AUTOMAKE) --gnu support/Makefile | ||
30696 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu support/Makefile'; \ | ||
30697 | + $(am__cd) $(top_srcdir) && \ | ||
30698 | + $(AUTOMAKE) --gnu support/Makefile | ||
30699 | .PRECIOUS: Makefile | ||
30700 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
30701 | @case '$?' in \ | ||
30702 | @@ -235,6 +239,7 @@ | ||
30703 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
30704 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
30705 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
30706 | +$(am__aclocal_m4_deps): | ||
30707 | |||
30708 | mostlyclean-libtool: | ||
30709 | -rm -f *.lo | ||
30710 | @@ -264,13 +269,17 @@ | ||
30711 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
30712 | if test -d $$d/$$file; then \ | ||
30713 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
30714 | + if test -d "$(distdir)/$$file"; then \ | ||
30715 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30716 | + fi; \ | ||
30717 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
30718 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
30719 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
30720 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30721 | fi; \ | ||
30722 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
30723 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
30724 | else \ | ||
30725 | - test -f $(distdir)/$$file \ | ||
30726 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
30727 | + test -f "$(distdir)/$$file" \ | ||
30728 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
30729 | || exit 1; \ | ||
30730 | fi; \ | ||
30731 | done | ||
30732 | @@ -298,6 +307,7 @@ | ||
30733 | |||
30734 | distclean-generic: | ||
30735 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
30736 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
30737 | |||
30738 | maintainer-clean-generic: | ||
30739 | @echo "This command is intended for maintainers to use" | ||
30740 | @@ -316,6 +326,8 @@ | ||
30741 | |||
30742 | html: html-am | ||
30743 | |||
30744 | +html-am: | ||
30745 | + | ||
30746 | info: info-am | ||
30747 | |||
30748 | info-am: | ||
30749 | @@ -324,18 +336,28 @@ | ||
30750 | |||
30751 | install-dvi: install-dvi-am | ||
30752 | |||
30753 | +install-dvi-am: | ||
30754 | + | ||
30755 | install-exec-am: | ||
30756 | |||
30757 | install-html: install-html-am | ||
30758 | |||
30759 | +install-html-am: | ||
30760 | + | ||
30761 | install-info: install-info-am | ||
30762 | |||
30763 | +install-info-am: | ||
30764 | + | ||
30765 | install-man: | ||
30766 | |||
30767 | install-pdf: install-pdf-am | ||
30768 | |||
30769 | +install-pdf-am: | ||
30770 | + | ||
30771 | install-ps: install-ps-am | ||
30772 | |||
30773 | +install-ps-am: | ||
30774 | + | ||
30775 | installcheck-am: | ||
30776 | |||
30777 | maintainer-clean: maintainer-clean-am | ||
30778 | @@ -369,6 +391,7 @@ | ||
30779 | maintainer-clean-generic mostlyclean mostlyclean-generic \ | ||
30780 | mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am | ||
30781 | |||
30782 | + | ||
30783 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
30784 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
30785 | .NOEXPORT: | ||
30786 | diff -Nurd fftw-3.2.2/tests/Makefile.in fftw-3.2.2-arm-beta1/tests/Makefile.in | ||
30787 | --- fftw-3.2.2/tests/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
30788 | +++ fftw-3.2.2-arm-beta1/tests/Makefile.in 2011-03-26 22:34:07.000000000 +0100 | ||
30789 | @@ -1,8 +1,9 @@ | ||
30790 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
30791 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
30792 | # @configure_input@ | ||
30793 | |||
30794 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
30795 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
30796 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
30797 | +# Inc. | ||
30798 | # This Makefile.in is free software; the Free Software Foundation | ||
30799 | # gives unlimited permission to copy and/or distribute it, | ||
30800 | # with or without modifications, as long as this notice is preserved. | ||
30801 | @@ -16,8 +17,9 @@ | ||
30802 | |||
30803 | VPATH = @srcdir@ | ||
30804 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
30805 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
30806 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
30807 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
30808 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
30809 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
30810 | install_sh_DATA = $(install_sh) -c -m 644 | ||
30811 | install_sh_PROGRAM = $(install_sh) -c | ||
30812 | @@ -54,6 +56,7 @@ | ||
30813 | mkinstalldirs = $(install_sh) -d | ||
30814 | CONFIG_HEADER = $(top_builddir)/config.h | ||
30815 | CONFIG_CLEAN_FILES = | ||
30816 | +CONFIG_CLEAN_VPATH_FILES = | ||
30817 | PROGRAMS = $(noinst_PROGRAMS) | ||
30818 | am_bench_OBJECTS = bench.$(OBJEXT) hook.$(OBJEXT) fftw-bench.$(OBJEXT) | ||
30819 | bench_OBJECTS = $(am_bench_OBJECTS) | ||
30820 | @@ -65,6 +68,7 @@ | ||
30821 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
30822 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
30823 | am__depfiles_maybe = depfiles | ||
30824 | +am__mv = mv -f | ||
30825 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
30826 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
30827 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
30828 | @@ -149,6 +153,7 @@ | ||
30829 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
30830 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
30831 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
30832 | +PACKAGE_URL = @PACKAGE_URL@ | ||
30833 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
30834 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
30835 | POW_LIB = @POW_LIB@ | ||
30836 | @@ -249,9 +254,9 @@ | ||
30837 | exit 1;; \ | ||
30838 | esac; \ | ||
30839 | done; \ | ||
30840 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ | ||
30841 | - cd $(top_srcdir) && \ | ||
30842 | - $(AUTOMAKE) --gnu tests/Makefile | ||
30843 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ | ||
30844 | + $(am__cd) $(top_srcdir) && \ | ||
30845 | + $(AUTOMAKE) --gnu tests/Makefile | ||
30846 | .PRECIOUS: Makefile | ||
30847 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
30848 | @case '$?' in \ | ||
30849 | @@ -269,13 +274,16 @@ | ||
30850 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
30851 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
30852 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
30853 | +$(am__aclocal_m4_deps): | ||
30854 | |||
30855 | clean-noinstPROGRAMS: | ||
30856 | - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ | ||
30857 | - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ | ||
30858 | - echo " rm -f $$p $$f"; \ | ||
30859 | - rm -f $$p $$f ; \ | ||
30860 | - done | ||
30861 | + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
30862 | + echo " rm -f" $$list; \ | ||
30863 | + rm -f $$list || exit $$?; \ | ||
30864 | + test -n "$(EXEEXT)" || exit 0; \ | ||
30865 | + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
30866 | + echo " rm -f" $$list; \ | ||
30867 | + rm -f $$list | ||
30868 | bench$(EXEEXT): $(bench_OBJECTS) $(bench_DEPENDENCIES) | ||
30869 | @rm -f bench$(EXEEXT) | ||
30870 | $(LINK) $(bench_OBJECTS) $(bench_LDADD) $(LIBS) | ||
30871 | @@ -292,21 +300,21 @@ | ||
30872 | |||
30873 | .c.o: | ||
30874 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
30875 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30876 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30877 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
30878 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
30879 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
30880 | |||
30881 | .c.obj: | ||
30882 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
30883 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30884 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
30885 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
30886 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
30887 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
30888 | |||
30889 | .c.lo: | ||
30890 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
30891 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
30892 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
30893 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
30894 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
30895 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
30896 | @@ -329,7 +337,7 @@ | ||
30897 | |||
30898 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
30899 | $(TAGS_FILES) $(LISP) | ||
30900 | - tags=; \ | ||
30901 | + set x; \ | ||
30902 | here=`pwd`; \ | ||
30903 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
30904 | unique=`for i in $$list; do \ | ||
30905 | @@ -337,29 +345,34 @@ | ||
30906 | done | \ | ||
30907 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
30908 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
30909 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
30910 | + shift; \ | ||
30911 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
30912 | test -n "$$unique" || unique=$$empty_fix; \ | ||
30913 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30914 | - $$tags $$unique; \ | ||
30915 | + if test $$# -gt 0; then \ | ||
30916 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30917 | + "$$@" $$unique; \ | ||
30918 | + else \ | ||
30919 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
30920 | + $$unique; \ | ||
30921 | + fi; \ | ||
30922 | fi | ||
30923 | ctags: CTAGS | ||
30924 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
30925 | $(TAGS_FILES) $(LISP) | ||
30926 | - tags=; \ | ||
30927 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
30928 | unique=`for i in $$list; do \ | ||
30929 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
30930 | done | \ | ||
30931 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
30932 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
30933 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
30934 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
30935 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
30936 | - $$tags $$unique | ||
30937 | + $$unique | ||
30938 | |||
30939 | GTAGS: | ||
30940 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
30941 | - && cd $(top_srcdir) \ | ||
30942 | - && gtags -i $(GTAGS_ARGS) $$here | ||
30943 | + && $(am__cd) $(top_srcdir) \ | ||
30944 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
30945 | |||
30946 | distclean-tags: | ||
30947 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
30948 | @@ -380,13 +393,17 @@ | ||
30949 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
30950 | if test -d $$d/$$file; then \ | ||
30951 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
30952 | + if test -d "$(distdir)/$$file"; then \ | ||
30953 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30954 | + fi; \ | ||
30955 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
30956 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
30957 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
30958 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
30959 | fi; \ | ||
30960 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
30961 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
30962 | else \ | ||
30963 | - test -f $(distdir)/$$file \ | ||
30964 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
30965 | + test -f "$(distdir)/$$file" \ | ||
30966 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
30967 | || exit 1; \ | ||
30968 | fi; \ | ||
30969 | done | ||
30970 | @@ -415,6 +432,7 @@ | ||
30971 | |||
30972 | distclean-generic: | ||
30973 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
30974 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
30975 | |||
30976 | maintainer-clean-generic: | ||
30977 | @echo "This command is intended for maintainers to use" | ||
30978 | @@ -436,6 +454,8 @@ | ||
30979 | |||
30980 | html: html-am | ||
30981 | |||
30982 | +html-am: | ||
30983 | + | ||
30984 | info: info-am | ||
30985 | |||
30986 | info-am: | ||
30987 | @@ -444,18 +464,28 @@ | ||
30988 | |||
30989 | install-dvi: install-dvi-am | ||
30990 | |||
30991 | +install-dvi-am: | ||
30992 | + | ||
30993 | install-exec-am: | ||
30994 | |||
30995 | install-html: install-html-am | ||
30996 | |||
30997 | +install-html-am: | ||
30998 | + | ||
30999 | install-info: install-info-am | ||
31000 | |||
31001 | +install-info-am: | ||
31002 | + | ||
31003 | install-man: | ||
31004 | |||
31005 | install-pdf: install-pdf-am | ||
31006 | |||
31007 | +install-pdf-am: | ||
31008 | + | ||
31009 | install-ps: install-ps-am | ||
31010 | |||
31011 | +install-ps-am: | ||
31012 | + | ||
31013 | installcheck-am: | ||
31014 | |||
31015 | maintainer-clean: maintainer-clean-am | ||
31016 | @@ -478,7 +508,7 @@ | ||
31017 | |||
31018 | uninstall-am: | ||
31019 | |||
31020 | -.MAKE: install-am install-strip | ||
31021 | +.MAKE: check-am install-am install-strip | ||
31022 | |||
31023 | .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ | ||
31024 | clean-generic clean-libtool clean-noinstPROGRAMS ctags \ | ||
31025 | @@ -541,6 +571,7 @@ | ||
31026 | @SMP_TRUE@ perl -w $(srcdir)/check.pl -a --exhaustive --nthreads=3 --paranoid `pwd`/bench | ||
31027 | @SMP_TRUE@ perl -w $(srcdir)/check.pl -a --exhaustive --nthreads=2 --paranoid `pwd`/bench | ||
31028 | perl -w $(srcdir)/check.pl -a --exhaustive --paranoid `pwd`/bench | ||
31029 | + | ||
31030 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
31031 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
31032 | .NOEXPORT: | ||
31033 | diff -Nurd fftw-3.2.2/threads/Makefile.in fftw-3.2.2-arm-beta1/threads/Makefile.in | ||
31034 | --- fftw-3.2.2/threads/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
31035 | +++ fftw-3.2.2-arm-beta1/threads/Makefile.in 2011-03-26 22:34:07.000000000 +0100 | ||
31036 | @@ -1,8 +1,9 @@ | ||
31037 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
31038 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
31039 | # @configure_input@ | ||
31040 | |||
31041 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
31042 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
31043 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
31044 | +# Inc. | ||
31045 | # This Makefile.in is free software; the Free Software Foundation | ||
31046 | # gives unlimited permission to copy and/or distribute it, | ||
31047 | # with or without modifications, as long as this notice is preserved. | ||
31048 | @@ -16,8 +17,9 @@ | ||
31049 | |||
31050 | VPATH = @srcdir@ | ||
31051 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
31052 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
31053 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
31054 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
31055 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
31056 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
31057 | install_sh_DATA = $(install_sh) -c -m 644 | ||
31058 | install_sh_PROGRAM = $(install_sh) -c | ||
31059 | @@ -53,14 +55,29 @@ | ||
31060 | mkinstalldirs = $(install_sh) -d | ||
31061 | CONFIG_HEADER = $(top_builddir)/config.h | ||
31062 | CONFIG_CLEAN_FILES = | ||
31063 | +CONFIG_CLEAN_VPATH_FILES = | ||
31064 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
31065 | am__vpath_adj = case $$p in \ | ||
31066 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
31067 | *) f=$$p;; \ | ||
31068 | esac; | ||
31069 | -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
31070 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
31071 | +am__install_max = 40 | ||
31072 | +am__nobase_strip_setup = \ | ||
31073 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
31074 | +am__nobase_strip = \ | ||
31075 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
31076 | +am__nobase_list = $(am__nobase_strip_setup); \ | ||
31077 | + for p in $$list; do echo "$$p $$p"; done | \ | ||
31078 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
31079 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
31080 | + if (++n[$$2] == $(am__install_max)) \ | ||
31081 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
31082 | + END { for (dir in files) print dir, files[dir] }' | ||
31083 | +am__base_list = \ | ||
31084 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
31085 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
31086 | am__installdirs = "$(DESTDIR)$(libdir)" | ||
31087 | -libLTLIBRARIES_INSTALL = $(INSTALL) | ||
31088 | LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) | ||
31089 | libfftw3@PREC_SUFFIX@_threads_la_LIBADD = | ||
31090 | am_libfftw3@PREC_SUFFIX@_threads_la_OBJECTS = api.lo conf.lo \ | ||
31091 | @@ -78,6 +95,7 @@ | ||
31092 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
31093 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
31094 | am__depfiles_maybe = depfiles | ||
31095 | +am__mv = mv -f | ||
31096 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
31097 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
31098 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
31099 | @@ -162,6 +180,7 @@ | ||
31100 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
31101 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
31102 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
31103 | +PACKAGE_URL = @PACKAGE_URL@ | ||
31104 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
31105 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
31106 | POW_LIB = @POW_LIB@ | ||
31107 | @@ -263,9 +282,9 @@ | ||
31108 | exit 1;; \ | ||
31109 | esac; \ | ||
31110 | done; \ | ||
31111 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu threads/Makefile'; \ | ||
31112 | - cd $(top_srcdir) && \ | ||
31113 | - $(AUTOMAKE) --gnu threads/Makefile | ||
31114 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu threads/Makefile'; \ | ||
31115 | + $(am__cd) $(top_srcdir) && \ | ||
31116 | + $(AUTOMAKE) --gnu threads/Makefile | ||
31117 | .PRECIOUS: Makefile | ||
31118 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
31119 | @case '$?' in \ | ||
31120 | @@ -283,23 +302,28 @@ | ||
31121 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
31122 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
31123 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
31124 | +$(am__aclocal_m4_deps): | ||
31125 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | ||
31126 | @$(NORMAL_INSTALL) | ||
31127 | test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" | ||
31128 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
31129 | + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
31130 | + list2=; for p in $$list; do \ | ||
31131 | if test -f $$p; then \ | ||
31132 | - f=$(am__strip_dir) \ | ||
31133 | - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ | ||
31134 | - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ | ||
31135 | + list2="$$list2 $$p"; \ | ||
31136 | else :; fi; \ | ||
31137 | - done | ||
31138 | + done; \ | ||
31139 | + test -z "$$list2" || { \ | ||
31140 | + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ | ||
31141 | + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ | ||
31142 | + } | ||
31143 | |||
31144 | uninstall-libLTLIBRARIES: | ||
31145 | @$(NORMAL_UNINSTALL) | ||
31146 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
31147 | - p=$(am__strip_dir) \ | ||
31148 | - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ | ||
31149 | - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ | ||
31150 | + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
31151 | + for p in $$list; do \ | ||
31152 | + $(am__strip_dir) \ | ||
31153 | + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ | ||
31154 | + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ | ||
31155 | done | ||
31156 | |||
31157 | clean-libLTLIBRARIES: | ||
31158 | @@ -341,21 +365,21 @@ | ||
31159 | |||
31160 | .c.o: | ||
31161 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
31162 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31163 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31164 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
31165 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
31166 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
31167 | |||
31168 | .c.obj: | ||
31169 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
31170 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31171 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31172 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
31173 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
31174 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
31175 | |||
31176 | .c.lo: | ||
31177 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
31178 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
31179 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
31180 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
31181 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
31182 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
31183 | @@ -378,7 +402,7 @@ | ||
31184 | |||
31185 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
31186 | $(TAGS_FILES) $(LISP) | ||
31187 | - tags=; \ | ||
31188 | + set x; \ | ||
31189 | here=`pwd`; \ | ||
31190 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
31191 | unique=`for i in $$list; do \ | ||
31192 | @@ -386,29 +410,34 @@ | ||
31193 | done | \ | ||
31194 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
31195 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
31196 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
31197 | + shift; \ | ||
31198 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
31199 | test -n "$$unique" || unique=$$empty_fix; \ | ||
31200 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
31201 | - $$tags $$unique; \ | ||
31202 | + if test $$# -gt 0; then \ | ||
31203 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
31204 | + "$$@" $$unique; \ | ||
31205 | + else \ | ||
31206 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
31207 | + $$unique; \ | ||
31208 | + fi; \ | ||
31209 | fi | ||
31210 | ctags: CTAGS | ||
31211 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
31212 | $(TAGS_FILES) $(LISP) | ||
31213 | - tags=; \ | ||
31214 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
31215 | unique=`for i in $$list; do \ | ||
31216 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
31217 | done | \ | ||
31218 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
31219 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
31220 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
31221 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
31222 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
31223 | - $$tags $$unique | ||
31224 | + $$unique | ||
31225 | |||
31226 | GTAGS: | ||
31227 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
31228 | - && cd $(top_srcdir) \ | ||
31229 | - && gtags -i $(GTAGS_ARGS) $$here | ||
31230 | + && $(am__cd) $(top_srcdir) \ | ||
31231 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
31232 | |||
31233 | distclean-tags: | ||
31234 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
31235 | @@ -429,13 +458,17 @@ | ||
31236 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
31237 | if test -d $$d/$$file; then \ | ||
31238 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
31239 | + if test -d "$(distdir)/$$file"; then \ | ||
31240 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
31241 | + fi; \ | ||
31242 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
31243 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
31244 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
31245 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
31246 | fi; \ | ||
31247 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
31248 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
31249 | else \ | ||
31250 | - test -f $(distdir)/$$file \ | ||
31251 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
31252 | + test -f "$(distdir)/$$file" \ | ||
31253 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
31254 | || exit 1; \ | ||
31255 | fi; \ | ||
31256 | done | ||
31257 | @@ -466,6 +499,7 @@ | ||
31258 | |||
31259 | distclean-generic: | ||
31260 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
31261 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
31262 | |||
31263 | maintainer-clean-generic: | ||
31264 | @echo "This command is intended for maintainers to use" | ||
31265 | @@ -487,6 +521,8 @@ | ||
31266 | |||
31267 | html: html-am | ||
31268 | |||
31269 | +html-am: | ||
31270 | + | ||
31271 | info: info-am | ||
31272 | |||
31273 | info-am: | ||
31274 | @@ -495,18 +531,28 @@ | ||
31275 | |||
31276 | install-dvi: install-dvi-am | ||
31277 | |||
31278 | +install-dvi-am: | ||
31279 | + | ||
31280 | install-exec-am: install-libLTLIBRARIES | ||
31281 | |||
31282 | install-html: install-html-am | ||
31283 | |||
31284 | +install-html-am: | ||
31285 | + | ||
31286 | install-info: install-info-am | ||
31287 | |||
31288 | +install-info-am: | ||
31289 | + | ||
31290 | install-man: | ||
31291 | |||
31292 | install-pdf: install-pdf-am | ||
31293 | |||
31294 | +install-pdf-am: | ||
31295 | + | ||
31296 | install-ps: install-ps-am | ||
31297 | |||
31298 | +install-ps-am: | ||
31299 | + | ||
31300 | installcheck-am: | ||
31301 | |||
31302 | maintainer-clean: maintainer-clean-am | ||
31303 | @@ -545,6 +591,7 @@ | ||
31304 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | ||
31305 | tags uninstall uninstall-am uninstall-libLTLIBRARIES | ||
31306 | |||
31307 | + | ||
31308 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
31309 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
31310 | .NOEXPORT: | ||
31311 | diff -Nurd fftw-3.2.2/tools/Makefile.in fftw-3.2.2-arm-beta1/tools/Makefile.in | ||
31312 | --- fftw-3.2.2/tools/Makefile.in 2009-07-12 12:36:48.000000000 +0200 | ||
31313 | +++ fftw-3.2.2-arm-beta1/tools/Makefile.in 2011-03-26 22:34:07.000000000 +0100 | ||
31314 | @@ -1,8 +1,9 @@ | ||
31315 | -# Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
31316 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
31317 | # @configure_input@ | ||
31318 | |||
31319 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
31320 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
31321 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
31322 | +# Inc. | ||
31323 | # This Makefile.in is free software; the Free Software Foundation | ||
31324 | # gives unlimited permission to copy and/or distribute it, | ||
31325 | # with or without modifications, as long as this notice is preserved. | ||
31326 | @@ -17,8 +18,9 @@ | ||
31327 | |||
31328 | VPATH = @srcdir@ | ||
31329 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
31330 | -pkglibdir = $(libdir)/@PACKAGE@ | ||
31331 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
31332 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
31333 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
31334 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
31335 | install_sh_DATA = $(install_sh) -c -m 644 | ||
31336 | install_sh_PROGRAM = $(install_sh) -c | ||
31337 | @@ -57,9 +59,9 @@ | ||
31338 | mkinstalldirs = $(install_sh) -d | ||
31339 | CONFIG_HEADER = $(top_builddir)/config.h | ||
31340 | CONFIG_CLEAN_FILES = fftw_wisdom.1 fftw-wisdom-to-conf | ||
31341 | +CONFIG_CLEAN_VPATH_FILES = | ||
31342 | am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ | ||
31343 | "$(DESTDIR)$(man1dir)" | ||
31344 | -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) | ||
31345 | PROGRAMS = $(bin_PROGRAMS) | ||
31346 | am_fftw@PREC_SUFFIX@_wisdom_OBJECTS = fftw-wisdom.$(OBJEXT) | ||
31347 | fftw@PREC_SUFFIX@_wisdom_OBJECTS = \ | ||
31348 | @@ -70,11 +72,32 @@ | ||
31349 | $(top_builddir)/tests/fftw-bench.o $(am__DEPENDENCIES_1) \ | ||
31350 | $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ | ||
31351 | $(top_builddir)/libbench2/libbench2.a $(am__DEPENDENCIES_2) | ||
31352 | -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) | ||
31353 | +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
31354 | +am__vpath_adj = case $$p in \ | ||
31355 | + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
31356 | + *) f=$$p;; \ | ||
31357 | + esac; | ||
31358 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
31359 | +am__install_max = 40 | ||
31360 | +am__nobase_strip_setup = \ | ||
31361 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
31362 | +am__nobase_strip = \ | ||
31363 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
31364 | +am__nobase_list = $(am__nobase_strip_setup); \ | ||
31365 | + for p in $$list; do echo "$$p $$p"; done | \ | ||
31366 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
31367 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
31368 | + if (++n[$$2] == $(am__install_max)) \ | ||
31369 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
31370 | + END { for (dir in files) print dir, files[dir] }' | ||
31371 | +am__base_list = \ | ||
31372 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
31373 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
31374 | SCRIPTS = $(bin_SCRIPTS) | ||
31375 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | ||
31376 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
31377 | am__depfiles_maybe = depfiles | ||
31378 | +am__mv = mv -f | ||
31379 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
31380 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
31381 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
31382 | @@ -162,6 +185,7 @@ | ||
31383 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
31384 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
31385 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
31386 | +PACKAGE_URL = @PACKAGE_URL@ | ||
31387 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
31388 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
31389 | POW_LIB = @POW_LIB@ | ||
31390 | @@ -265,9 +289,9 @@ | ||
31391 | exit 1;; \ | ||
31392 | esac; \ | ||
31393 | done; \ | ||
31394 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ | ||
31395 | - cd $(top_srcdir) && \ | ||
31396 | - $(AUTOMAKE) --gnu tools/Makefile | ||
31397 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ | ||
31398 | + $(am__cd) $(top_srcdir) && \ | ||
31399 | + $(AUTOMAKE) --gnu tools/Makefile | ||
31400 | .PRECIOUS: Makefile | ||
31401 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
31402 | @case '$?' in \ | ||
31403 | @@ -285,6 +309,7 @@ | ||
31404 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
31405 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
31406 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
31407 | +$(am__aclocal_m4_deps): | ||
31408 | fftw_wisdom.1: $(top_builddir)/config.status $(srcdir)/fftw_wisdom.1.in | ||
31409 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ | ||
31410 | fftw-wisdom-to-conf: $(top_builddir)/config.status $(srcdir)/fftw-wisdom-to-conf.in | ||
31411 | @@ -292,53 +317,83 @@ | ||
31412 | install-binPROGRAMS: $(bin_PROGRAMS) | ||
31413 | @$(NORMAL_INSTALL) | ||
31414 | test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" | ||
31415 | - @list='$(bin_PROGRAMS)'; for p in $$list; do \ | ||
31416 | - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ | ||
31417 | - if test -f $$p \ | ||
31418 | - || test -f $$p1 \ | ||
31419 | - ; then \ | ||
31420 | - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ | ||
31421 | - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ | ||
31422 | - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ | ||
31423 | - else :; fi; \ | ||
31424 | - done | ||
31425 | + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ | ||
31426 | + for p in $$list; do echo "$$p $$p"; done | \ | ||
31427 | + sed 's/$(EXEEXT)$$//' | \ | ||
31428 | + while read p p1; do if test -f $$p || test -f $$p1; \ | ||
31429 | + then echo "$$p"; echo "$$p"; else :; fi; \ | ||
31430 | + done | \ | ||
31431 | + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ | ||
31432 | + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ | ||
31433 | + sed 'N;N;N;s,\n, ,g' | \ | ||
31434 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ | ||
31435 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ | ||
31436 | + if ($$2 == $$4) files[d] = files[d] " " $$1; \ | ||
31437 | + else { print "f", $$3 "/" $$4, $$1; } } \ | ||
31438 | + END { for (d in files) print "f", d, files[d] }' | \ | ||
31439 | + while read type dir files; do \ | ||
31440 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ | ||
31441 | + test -z "$$files" || { \ | ||
31442 | + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ | ||
31443 | + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ | ||
31444 | + } \ | ||
31445 | + ; done | ||
31446 | |||
31447 | uninstall-binPROGRAMS: | ||
31448 | @$(NORMAL_UNINSTALL) | ||
31449 | - @list='$(bin_PROGRAMS)'; for p in $$list; do \ | ||
31450 | - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ | ||
31451 | - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ | ||
31452 | - rm -f "$(DESTDIR)$(bindir)/$$f"; \ | ||
31453 | - done | ||
31454 | + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ | ||
31455 | + files=`for p in $$list; do echo "$$p"; done | \ | ||
31456 | + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ | ||
31457 | + -e 's/$$/$(EXEEXT)/' `; \ | ||
31458 | + test -n "$$list" || exit 0; \ | ||
31459 | + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ | ||
31460 | + cd "$(DESTDIR)$(bindir)" && rm -f $$files | ||
31461 | |||
31462 | clean-binPROGRAMS: | ||
31463 | - @list='$(bin_PROGRAMS)'; for p in $$list; do \ | ||
31464 | - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ | ||
31465 | - echo " rm -f $$p $$f"; \ | ||
31466 | - rm -f $$p $$f ; \ | ||
31467 | - done | ||
31468 | + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ | ||
31469 | + echo " rm -f" $$list; \ | ||
31470 | + rm -f $$list || exit $$?; \ | ||
31471 | + test -n "$(EXEEXT)" || exit 0; \ | ||
31472 | + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | ||
31473 | + echo " rm -f" $$list; \ | ||
31474 | + rm -f $$list | ||
31475 | fftw@PREC_SUFFIX@-wisdom$(EXEEXT): $(fftw@PREC_SUFFIX@_wisdom_OBJECTS) $(fftw@PREC_SUFFIX@_wisdom_DEPENDENCIES) | ||
31476 | @rm -f fftw@PREC_SUFFIX@-wisdom$(EXEEXT) | ||
31477 | $(LINK) $(fftw@PREC_SUFFIX@_wisdom_OBJECTS) $(fftw@PREC_SUFFIX@_wisdom_LDADD) $(LIBS) | ||
31478 | install-binSCRIPTS: $(bin_SCRIPTS) | ||
31479 | @$(NORMAL_INSTALL) | ||
31480 | test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" | ||
31481 | - @list='$(bin_SCRIPTS)'; for p in $$list; do \ | ||
31482 | + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ | ||
31483 | + for p in $$list; do \ | ||
31484 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
31485 | - if test -f $$d$$p; then \ | ||
31486 | - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ | ||
31487 | - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ | ||
31488 | - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ | ||
31489 | - else :; fi; \ | ||
31490 | - done | ||
31491 | + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ | ||
31492 | + done | \ | ||
31493 | + sed -e 'p;s,.*/,,;n' \ | ||
31494 | + -e 'h;s|.*|.|' \ | ||
31495 | + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ | ||
31496 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ | ||
31497 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ | ||
31498 | + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ | ||
31499 | + if (++n[d] == $(am__install_max)) { \ | ||
31500 | + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ | ||
31501 | + else { print "f", d "/" $$4, $$1 } } \ | ||
31502 | + END { for (d in files) print "f", d, files[d] }' | \ | ||
31503 | + while read type dir files; do \ | ||
31504 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ | ||
31505 | + test -z "$$files" || { \ | ||
31506 | + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ | ||
31507 | + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ | ||
31508 | + } \ | ||
31509 | + ; done | ||
31510 | |||
31511 | uninstall-binSCRIPTS: | ||
31512 | @$(NORMAL_UNINSTALL) | ||
31513 | - @list='$(bin_SCRIPTS)'; for p in $$list; do \ | ||
31514 | - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ | ||
31515 | - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ | ||
31516 | - rm -f "$(DESTDIR)$(bindir)/$$f"; \ | ||
31517 | - done | ||
31518 | + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ | ||
31519 | + files=`for p in $$list; do echo "$$p"; done | \ | ||
31520 | + sed -e 's,.*/,,;$(transform)'`; \ | ||
31521 | + test -n "$$list" || exit 0; \ | ||
31522 | + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ | ||
31523 | + cd "$(DESTDIR)$(bindir)" && rm -f $$files | ||
31524 | |||
31525 | mostlyclean-compile: | ||
31526 | -rm -f *.$(OBJEXT) | ||
31527 | @@ -350,21 +405,21 @@ | ||
31528 | |||
31529 | .c.o: | ||
31530 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
31531 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31532 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31533 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
31534 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
31535 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
31536 | |||
31537 | .c.obj: | ||
31538 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
31539 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31540 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
31541 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
31542 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
31543 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
31544 | |||
31545 | .c.lo: | ||
31546 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
31547 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
31548 | +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
31549 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
31550 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
31551 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
31552 | @@ -374,51 +429,44 @@ | ||
31553 | |||
31554 | clean-libtool: | ||
31555 | -rm -rf .libs _libs | ||
31556 | -install-man1: $(man1_MANS) $(man_MANS) | ||
31557 | +install-man1: $(dist_man_MANS) | ||
31558 | @$(NORMAL_INSTALL) | ||
31559 | test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" | ||
31560 | - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ | ||
31561 | - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ | ||
31562 | - for i in $$l2; do \ | ||
31563 | - case "$$i" in \ | ||
31564 | - *.1*) list="$$list $$i" ;; \ | ||
31565 | - esac; \ | ||
31566 | + @list=''; test -n "$(man1dir)" || exit 0; \ | ||
31567 | + { for i in $$list; do echo "$$i"; done; \ | ||
31568 | + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ | ||
31569 | + sed -n '/\.1[a-z]*$$/p'; \ | ||
31570 | + } | while read p; do \ | ||
31571 | + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ | ||
31572 | + echo "$$d$$p"; echo "$$p"; \ | ||
31573 | + done | \ | ||
31574 | + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ | ||
31575 | + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ | ||
31576 | + sed 'N;N;s,\n, ,g' | { \ | ||
31577 | + list=; while read file base inst; do \ | ||
31578 | + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ | ||
31579 | + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ | ||
31580 | + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ | ||
31581 | + fi; \ | ||
31582 | done; \ | ||
31583 | - for i in $$list; do \ | ||
31584 | - if test -f $$i; then file=$$i; \ | ||
31585 | - else file=$(srcdir)/$$i; fi; \ | ||
31586 | - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ | ||
31587 | - case "$$ext" in \ | ||
31588 | - 1*) ;; \ | ||
31589 | - *) ext='1' ;; \ | ||
31590 | - esac; \ | ||
31591 | - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ | ||
31592 | - inst=`echo $$inst | sed -e 's/^.*\///'`; \ | ||
31593 | - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ | ||
31594 | - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ | ||
31595 | - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ | ||
31596 | - done | ||
31597 | + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ | ||
31598 | + while read files; do \ | ||
31599 | + test -z "$$files" || { \ | ||
31600 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ | ||
31601 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ | ||
31602 | + done; } | ||
31603 | + | ||
31604 | uninstall-man1: | ||
31605 | @$(NORMAL_UNINSTALL) | ||
31606 | - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ | ||
31607 | - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ | ||
31608 | - for i in $$l2; do \ | ||
31609 | - case "$$i" in \ | ||
31610 | - *.1*) list="$$list $$i" ;; \ | ||
31611 | - esac; \ | ||
31612 | - done; \ | ||
31613 | - for i in $$list; do \ | ||
31614 | - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ | ||
31615 | - case "$$ext" in \ | ||
31616 | - 1*) ;; \ | ||
31617 | - *) ext='1' ;; \ | ||
31618 | - esac; \ | ||
31619 | - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ | ||
31620 | - inst=`echo $$inst | sed -e 's/^.*\///'`; \ | ||
31621 | - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ | ||
31622 | - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ | ||
31623 | - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ | ||
31624 | - done | ||
31625 | + @list=''; test -n "$(man1dir)" || exit 0; \ | ||
31626 | + files=`{ for i in $$list; do echo "$$i"; done; \ | ||
31627 | + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ | ||
31628 | + sed -n '/\.1[a-z]*$$/p'; \ | ||
31629 | + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ | ||
31630 | + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ | ||
31631 | + test -z "$$files" || { \ | ||
31632 | + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ | ||
31633 | + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } | ||
31634 | |||
31635 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
31636 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
31637 | @@ -432,7 +480,7 @@ | ||
31638 | |||
31639 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
31640 | $(TAGS_FILES) $(LISP) | ||
31641 | - tags=; \ | ||
31642 | + set x; \ | ||
31643 | here=`pwd`; \ | ||
31644 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
31645 | unique=`for i in $$list; do \ | ||
31646 | @@ -440,34 +488,52 @@ | ||
31647 | done | \ | ||
31648 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
31649 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
31650 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
31651 | + shift; \ | ||
31652 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
31653 | test -n "$$unique" || unique=$$empty_fix; \ | ||
31654 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
31655 | - $$tags $$unique; \ | ||
31656 | + if test $$# -gt 0; then \ | ||
31657 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
31658 | + "$$@" $$unique; \ | ||
31659 | + else \ | ||
31660 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
31661 | + $$unique; \ | ||
31662 | + fi; \ | ||
31663 | fi | ||
31664 | ctags: CTAGS | ||
31665 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
31666 | $(TAGS_FILES) $(LISP) | ||
31667 | - tags=; \ | ||
31668 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
31669 | unique=`for i in $$list; do \ | ||
31670 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
31671 | done | \ | ||
31672 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
31673 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
31674 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
31675 | + test -z "$(CTAGS_ARGS)$$unique" \ | ||
31676 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
31677 | - $$tags $$unique | ||
31678 | + $$unique | ||
31679 | |||
31680 | GTAGS: | ||
31681 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
31682 | - && cd $(top_srcdir) \ | ||
31683 | - && gtags -i $(GTAGS_ARGS) $$here | ||
31684 | + && $(am__cd) $(top_srcdir) \ | ||
31685 | + && gtags -i $(GTAGS_ARGS) "$$here" | ||
31686 | |||
31687 | distclean-tags: | ||
31688 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
31689 | |||
31690 | distdir: $(DISTFILES) | ||
31691 | + @list='$(MANS)'; if test -n "$$list"; then \ | ||
31692 | + list=`for p in $$list; do \ | ||
31693 | + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ | ||
31694 | + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ | ||
31695 | + if test -n "$$list" && \ | ||
31696 | + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ | ||
31697 | + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ | ||
31698 | + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ | ||
31699 | + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ | ||
31700 | + echo " typically \`make maintainer-clean' will remove them" >&2; \ | ||
31701 | + exit 1; \ | ||
31702 | + else :; fi; \ | ||
31703 | + else :; fi | ||
31704 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
31705 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
31706 | list='$(DISTFILES)'; \ | ||
31707 | @@ -483,13 +549,17 @@ | ||
31708 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
31709 | if test -d $$d/$$file; then \ | ||
31710 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
31711 | + if test -d "$(distdir)/$$file"; then \ | ||
31712 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
31713 | + fi; \ | ||
31714 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
31715 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
31716 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
31717 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
31718 | fi; \ | ||
31719 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
31720 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
31721 | else \ | ||
31722 | - test -f $(distdir)/$$file \ | ||
31723 | - || cp -p $$d/$$file $(distdir)/$$file \ | ||
31724 | + test -f "$(distdir)/$$file" \ | ||
31725 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
31726 | || exit 1; \ | ||
31727 | fi; \ | ||
31728 | done | ||
31729 | @@ -522,6 +592,7 @@ | ||
31730 | |||
31731 | distclean-generic: | ||
31732 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
31733 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
31734 | |||
31735 | maintainer-clean-generic: | ||
31736 | @echo "This command is intended for maintainers to use" | ||
31737 | @@ -543,6 +614,8 @@ | ||
31738 | |||
31739 | html: html-am | ||
31740 | |||
31741 | +html-am: | ||
31742 | + | ||
31743 | info: info-am | ||
31744 | |||
31745 | info-am: | ||
31746 | @@ -551,18 +624,28 @@ | ||
31747 | |||
31748 | install-dvi: install-dvi-am | ||
31749 | |||
31750 | +install-dvi-am: | ||
31751 | + | ||
31752 | install-exec-am: install-binPROGRAMS install-binSCRIPTS | ||
31753 | |||
31754 | install-html: install-html-am | ||
31755 | |||
31756 | +install-html-am: | ||
31757 | + | ||
31758 | install-info: install-info-am | ||
31759 | |||
31760 | +install-info-am: | ||
31761 | + | ||
31762 | install-man: install-man1 | ||
31763 | |||
31764 | install-pdf: install-pdf-am | ||
31765 | |||
31766 | +install-pdf-am: | ||
31767 | + | ||
31768 | install-ps: install-ps-am | ||
31769 | |||
31770 | +install-ps-am: | ||
31771 | + | ||
31772 | installcheck-am: | ||
31773 | |||
31774 | maintainer-clean: maintainer-clean-am | ||
31775 | @@ -587,7 +670,7 @@ | ||
31776 | |||
31777 | uninstall-man: uninstall-man1 | ||
31778 | |||
31779 | -.MAKE: install-am install-strip | ||
31780 | +.MAKE: all check install install-am install-strip | ||
31781 | |||
31782 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ | ||
31783 | clean-generic clean-libtool ctags distclean distclean-compile \ | ||
31784 | @@ -607,6 +690,7 @@ | ||
31785 | fftw@PREC_SUFFIX@-wisdom.1: fftw_wisdom.1 | ||
31786 | rm -f $@ | ||
31787 | cp fftw_wisdom.1 $@ | ||
31788 | + | ||
31789 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
31790 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
31791 | .NOEXPORT: | ||
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.2.2.bb b/meta-oe/recipes-support/fftw/fftwf_3.2.2.bb deleted file mode 100644 index 466ba8dbc..000000000 --- a/meta-oe/recipes-support/fftw/fftwf_3.2.2.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | require fftw.inc | ||
2 | |||
3 | PR = "r2" | ||
4 | |||
5 | SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz \ | ||
6 | file://vesperix-neon.patch \ | ||
7 | " | ||
8 | |||
9 | EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared --enable-threads" | ||
10 | |||
11 | # Enable the vesperix code we patched in above for armv7a | ||
12 | EXTRA_OECONF_append_armv7a = " --enable-neon" | ||
13 | |||
14 | SRC_URI[md5sum] = "b616e5c91218cc778b5aa735fefb61ae" | ||
15 | SRC_URI[sha256sum] = "6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f" | ||
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb new file mode 100644 index 000000000..a7b8b6789 --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require fftw.inc | ||
2 | |||
3 | EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared \ | ||
4 | --enable-threads \ | ||
5 | ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2" | ||
9 | SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3" | ||
10 | |||
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.2.2.bb b/meta-oe/recipes-support/fftw/fftwl_3.2.2.bb deleted file mode 100644 index ff2cb2aaa..000000000 --- a/meta-oe/recipes-support/fftw/fftwl_3.2.2.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require fftw.inc | ||
2 | |||
3 | SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz" | ||
4 | |||
5 | EXTRA_OECONF = "--disable-fortran --enable-long-double --enable-shared --enable-threads" | ||
6 | |||
7 | SRC_URI[md5sum] = "b616e5c91218cc778b5aa735fefb61ae" | ||
8 | SRC_URI[sha256sum] = "6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f" | ||
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb new file mode 100644 index 000000000..b28784ea1 --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require fftw.inc | ||
2 | |||
3 | EXTRA_OECONF = "--disable-fortran --enable-long-double --enable-shared --enable-threads" | ||
4 | |||
5 | SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2" | ||
6 | SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3" | ||
7 | |||