Merge lp:~david-ham/spud/update_fortran_interface into lp:spud
- update_fortran_interface
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Patrick Farrell |
Approved revision: | 415 |
Merged at revision: | 414 |
Proposed branch: | lp:~david-ham/spud/update_fortran_interface |
Merge into: | lp:spud |
Diff against target: | 7815 lines |
To merge this branch: | bzr merge lp:~david-ham/spud/update_fortran_interface |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Patrick Farrell | Pending | ||
Review via email:
|
Commit message
Description of the change
This change updates the fortran/C interface to use the Fortran 2003 iso_c_bindings rather than the old hacks.

Patrick Farrell (pefarrell) wrote : | # |

David Ham (david-ham) wrote : | # |
> Aside: the main reason why the C interface takes pointers to /everything/,
> even when it is very unCish, is because Fortran used to only be able to pass
> over pointers. Now that we have the value keyword, do you think it is worth
> cleaning up the C api?
Could do. I think it's just the type(c_int), intent(in) arguments which would more naturally be passed by value in C. That would be really easy to fix.
>
> The other thing: how heavily have you tested this? Have you ran fluidity's
> test suite with this version of libspud? I know from bitter experience that it
> is very easy to make a mistake while writing F2003 iso_c_binding interfaces by
> hand -- and these mistakes show up as mysterious stack smashes later on.
Good point. I have only run Spud's internal tests. I'll test it on the trunk.
- 413. By David Ham
-
Convert int* interfaces which would more naturally be passed by value to int
Change the C spud prefix from cspud to spud - 414. By David Ham
-
Update the spud interface by:
* renaming number_of_children to get_number_of_children for consistency.
* causing write_options, load_options and get_number_of_children to return error codes, also for consistency. - 415. By David Ham
-
Update header file names to more standard ones.
Consequential manual updates.

David Ham (david-ham) wrote : | # |
Ok, the above changes are now in. It passes short tests when hacked into the current fluidity source so it's clearly 100% correct in every way and should be merged, right? ;)

Patrick Farrell (pefarrell) wrote : | # |
OK. It'll see lots of testing very soon, anyway :-)
Preview Diff
1 | === modified file 'Makefile.in' |
2 | --- Makefile.in 2010-01-18 14:23:57 +0000 |
3 | +++ Makefile.in 2011-07-11 16:34:27 +0000 |
4 | @@ -39,7 +39,7 @@ |
5 | LIB = libspud.la |
6 | LIBS = $(shell echo @LIBS@ | sed 's/-L /-L/g') |
7 | |
8 | -HEADERS = include/cspud.h include/spud.h include/spud_config.h include/spud_enums.h include/tinystr.h include/tinyxml.h |
9 | +HEADERS = include/spud.h include/spud include/spud_enums.h include/tinystr.h include/tinyxml.h |
10 | MODS = spud.mod |
11 | OBJS = spud.lo spud_interfaces.lo tinystr.lo tinyxml.lo tinyxmlerror.lo tinyxmlparser.lo fspud.lo |
12 | |
13 | @@ -102,7 +102,6 @@ |
14 | distclean: clean |
15 | @cd src/tests; $(MAKE) distclean |
16 | rm -fr config.log config.status autom4te.cache Makefile |
17 | - rm -f include/spud_config.h |
18 | rm -f Makefile src/tests/Makefile examples/Makefile |
19 | rm -f bin/spud-preprocess |
20 | rm -f diamond/setup.py diamond/diamond/plugins.py diamond/diamond/preprocess.py |
21 | |
22 | === modified file 'configure' |
23 | --- configure 2010-01-18 14:19:00 +0000 |
24 | +++ configure 2011-07-11 16:34:27 +0000 |
25 | @@ -1,11 +1,13 @@ |
26 | #! /bin/sh |
27 | # Guess values for system-dependent variables and create Makefiles. |
28 | -# Generated by GNU Autoconf 2.64. |
29 | +# Generated by GNU Autoconf 2.67. |
30 | +# |
31 | # |
32 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
33 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software |
34 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
35 | # Foundation, Inc. |
36 | # |
37 | +# |
38 | # This configure script is free software; the Free Software Foundation |
39 | # gives unlimited permission to copy, distribute and modify it. |
40 | ## -------------------- ## |
41 | @@ -314,7 +316,7 @@ |
42 | test -d "$as_dir" && break |
43 | done |
44 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
45 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
46 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
47 | |
48 | |
49 | } # as_fn_mkdir_p |
50 | @@ -354,19 +356,19 @@ |
51 | fi # as_fn_arith |
52 | |
53 | |
54 | -# as_fn_error ERROR [LINENO LOG_FD] |
55 | -# --------------------------------- |
56 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
57 | +# ---------------------------------------- |
58 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
59 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
60 | -# script with status $?, using 1 if that was 0. |
61 | +# script with STATUS, using 1 if that was 0. |
62 | as_fn_error () |
63 | { |
64 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
65 | - if test "$3"; then |
66 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
67 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
68 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
69 | + if test "$4"; then |
70 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
71 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
72 | fi |
73 | - $as_echo "$as_me: error: $1" >&2 |
74 | + $as_echo "$as_me: error: $2" >&2 |
75 | as_fn_exit $as_status |
76 | } # as_fn_error |
77 | |
78 | @@ -673,10 +675,11 @@ |
79 | |
80 | |
81 | |
82 | -exec 7<&0 </dev/null 6>&1 |
83 | +test -n "$DJDIR" || exec 7<&0 </dev/null |
84 | +exec 6>&1 |
85 | |
86 | # Name of the host. |
87 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
88 | +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
89 | # so uname gets run too. |
90 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
91 | |
92 | @@ -925,8 +928,9 @@ |
93 | fi |
94 | |
95 | case $ac_option in |
96 | - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
97 | - *) ac_optarg=yes ;; |
98 | + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
99 | + *=) ac_optarg= ;; |
100 | + *) ac_optarg=yes ;; |
101 | esac |
102 | |
103 | # Accept the important Cygnus configure options, so we can diagnose typos. |
104 | @@ -971,7 +975,7 @@ |
105 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
106 | # Reject names that are not valid shell variable names. |
107 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
108 | - as_fn_error "invalid feature name: $ac_useropt" |
109 | + as_fn_error $? "invalid feature name: $ac_useropt" |
110 | ac_useropt_orig=$ac_useropt |
111 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
112 | case $ac_user_opts in |
113 | @@ -997,7 +1001,7 @@ |
114 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
115 | # Reject names that are not valid shell variable names. |
116 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
117 | - as_fn_error "invalid feature name: $ac_useropt" |
118 | + as_fn_error $? "invalid feature name: $ac_useropt" |
119 | ac_useropt_orig=$ac_useropt |
120 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
121 | case $ac_user_opts in |
122 | @@ -1201,7 +1205,7 @@ |
123 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
124 | # Reject names that are not valid shell variable names. |
125 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
126 | - as_fn_error "invalid package name: $ac_useropt" |
127 | + as_fn_error $? "invalid package name: $ac_useropt" |
128 | ac_useropt_orig=$ac_useropt |
129 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
130 | case $ac_user_opts in |
131 | @@ -1217,7 +1221,7 @@ |
132 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
133 | # Reject names that are not valid shell variable names. |
134 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
135 | - as_fn_error "invalid package name: $ac_useropt" |
136 | + as_fn_error $? "invalid package name: $ac_useropt" |
137 | ac_useropt_orig=$ac_useropt |
138 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
139 | case $ac_user_opts in |
140 | @@ -1247,8 +1251,8 @@ |
141 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
142 | x_libraries=$ac_optarg ;; |
143 | |
144 | - -*) as_fn_error "unrecognized option: \`$ac_option' |
145 | -Try \`$0 --help' for more information." |
146 | + -*) as_fn_error $? "unrecognized option: \`$ac_option' |
147 | +Try \`$0 --help' for more information" |
148 | ;; |
149 | |
150 | *=*) |
151 | @@ -1256,7 +1260,7 @@ |
152 | # Reject names that are not valid shell variable names. |
153 | case $ac_envvar in #( |
154 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
155 | - as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
156 | + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
157 | esac |
158 | eval $ac_envvar=\$ac_optarg |
159 | export $ac_envvar ;; |
160 | @@ -1274,13 +1278,13 @@ |
161 | |
162 | if test -n "$ac_prev"; then |
163 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
164 | - as_fn_error "missing argument to $ac_option" |
165 | + as_fn_error $? "missing argument to $ac_option" |
166 | fi |
167 | |
168 | if test -n "$ac_unrecognized_opts"; then |
169 | case $enable_option_checking in |
170 | no) ;; |
171 | - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
172 | + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
173 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
174 | esac |
175 | fi |
176 | @@ -1303,7 +1307,7 @@ |
177 | [\\/$]* | ?:[\\/]* ) continue;; |
178 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
179 | esac |
180 | - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
181 | + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
182 | done |
183 | |
184 | # There might be people who depend on the old broken behavior: `$host' |
185 | @@ -1317,8 +1321,8 @@ |
186 | if test "x$host_alias" != x; then |
187 | if test "x$build_alias" = x; then |
188 | cross_compiling=maybe |
189 | - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
190 | - If a cross compiler is detected then cross compile mode will be used." >&2 |
191 | + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
192 | + If a cross compiler is detected then cross compile mode will be used" >&2 |
193 | elif test "x$build_alias" != "x$host_alias"; then |
194 | cross_compiling=yes |
195 | fi |
196 | @@ -1333,9 +1337,9 @@ |
197 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
198 | ac_ls_di=`ls -di .` && |
199 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
200 | - as_fn_error "working directory cannot be determined" |
201 | + as_fn_error $? "working directory cannot be determined" |
202 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
203 | - as_fn_error "pwd does not report name of working directory" |
204 | + as_fn_error $? "pwd does not report name of working directory" |
205 | |
206 | |
207 | # Find the source files, if location was not specified. |
208 | @@ -1374,11 +1378,11 @@ |
209 | fi |
210 | if test ! -r "$srcdir/$ac_unique_file"; then |
211 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
212 | - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
213 | + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
214 | fi |
215 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
216 | ac_abs_confdir=`( |
217 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
218 | + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
219 | pwd)` |
220 | # When building in place, set srcdir=. |
221 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
222 | @@ -1418,7 +1422,7 @@ |
223 | --help=short display options specific to this package |
224 | --help=recursive display the short help of all the included packages |
225 | -V, --version display version information and exit |
226 | - -q, --quiet, --silent do not print \`checking...' messages |
227 | + -q, --quiet, --silent do not print \`checking ...' messages |
228 | --cache-file=FILE cache test results in FILE [disabled] |
229 | -C, --config-cache alias for \`--cache-file=config.cache' |
230 | -n, --no-create do not create output files |
231 | @@ -1497,7 +1501,7 @@ |
232 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
233 | nonstandard directory <lib dir> |
234 | LIBS libraries to pass to the linker, e.g. -l<library> |
235 | - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if |
236 | + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
237 | you have headers in a nonstandard directory <include dir> |
238 | CPP C preprocessor |
239 | CXX C++ compiler command |
240 | @@ -1575,9 +1579,9 @@ |
241 | if $ac_init_version; then |
242 | cat <<\_ACEOF |
243 | configure |
244 | -generated by GNU Autoconf 2.64 |
245 | +generated by GNU Autoconf 2.67 |
246 | |
247 | -Copyright (C) 2009 Free Software Foundation, Inc. |
248 | +Copyright (C) 2010 Free Software Foundation, Inc. |
249 | This configure script is free software; the Free Software Foundation |
250 | gives unlimited permission to copy, distribute and modify it. |
251 | _ACEOF |
252 | @@ -1622,7 +1626,7 @@ |
253 | ac_retval=1 |
254 | fi |
255 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
256 | - return $ac_retval |
257 | + as_fn_set_status $ac_retval |
258 | |
259 | } # ac_fn_c_try_compile |
260 | |
261 | @@ -1668,7 +1672,7 @@ |
262 | # left behind by Apple's compiler. We do this before executing the actions. |
263 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
264 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
265 | - return $ac_retval |
266 | + as_fn_set_status $ac_retval |
267 | |
268 | } # ac_fn_c_try_link |
269 | |
270 | @@ -1681,7 +1685,7 @@ |
271 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
272 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
273 | $as_echo_n "checking for $2... " >&6; } |
274 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
275 | +if eval "test \"\${$3+set}\"" = set; then : |
276 | $as_echo_n "(cached) " >&6 |
277 | else |
278 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
279 | @@ -1724,7 +1728,7 @@ |
280 | mv -f conftest.er1 conftest.err |
281 | fi |
282 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
283 | - test $ac_status = 0; } >/dev/null && { |
284 | + test $ac_status = 0; } > conftest.i && { |
285 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
286 | test ! -s conftest.err |
287 | }; then : |
288 | @@ -1736,7 +1740,7 @@ |
289 | ac_retval=1 |
290 | fi |
291 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
292 | - return $ac_retval |
293 | + as_fn_set_status $ac_retval |
294 | |
295 | } # ac_fn_c_try_cpp |
296 | |
297 | @@ -1778,7 +1782,7 @@ |
298 | fi |
299 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
300 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
301 | - return $ac_retval |
302 | + as_fn_set_status $ac_retval |
303 | |
304 | } # ac_fn_c_try_run |
305 | |
306 | @@ -1790,7 +1794,7 @@ |
307 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
308 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
309 | $as_echo_n "checking for $2... " >&6; } |
310 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
311 | +if eval "test \"\${$3+set}\"" = set; then : |
312 | $as_echo_n "(cached) " >&6 |
313 | else |
314 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
315 | @@ -1883,7 +1887,7 @@ |
316 | ac_retval=1 |
317 | fi |
318 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
319 | - return $ac_retval |
320 | + as_fn_set_status $ac_retval |
321 | |
322 | } # ac_fn_cxx_try_compile |
323 | |
324 | @@ -1908,7 +1912,7 @@ |
325 | mv -f conftest.er1 conftest.err |
326 | fi |
327 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
328 | - test $ac_status = 0; } >/dev/null && { |
329 | + test $ac_status = 0; } > conftest.i && { |
330 | test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || |
331 | test ! -s conftest.err |
332 | }; then : |
333 | @@ -1920,7 +1924,7 @@ |
334 | ac_retval=1 |
335 | fi |
336 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
337 | - return $ac_retval |
338 | + as_fn_set_status $ac_retval |
339 | |
340 | } # ac_fn_cxx_try_cpp |
341 | |
342 | @@ -1966,7 +1970,7 @@ |
343 | # left behind by Apple's compiler. We do this before executing the actions. |
344 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
345 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
346 | - return $ac_retval |
347 | + as_fn_set_status $ac_retval |
348 | |
349 | } # ac_fn_cxx_try_link |
350 | |
351 | @@ -2004,7 +2008,7 @@ |
352 | ac_retval=1 |
353 | fi |
354 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
355 | - return $ac_retval |
356 | + as_fn_set_status $ac_retval |
357 | |
358 | } # ac_fn_fc_try_compile |
359 | |
360 | @@ -2050,7 +2054,7 @@ |
361 | # left behind by Apple's compiler. We do this before executing the actions. |
362 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
363 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
364 | - return $ac_retval |
365 | + as_fn_set_status $ac_retval |
366 | |
367 | } # ac_fn_fc_try_link |
368 | |
369 | @@ -2088,7 +2092,7 @@ |
370 | ac_retval=1 |
371 | fi |
372 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
373 | - return $ac_retval |
374 | + as_fn_set_status $ac_retval |
375 | |
376 | } # ac_fn_f77_try_compile |
377 | |
378 | @@ -2134,7 +2138,7 @@ |
379 | # left behind by Apple's compiler. We do this before executing the actions. |
380 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
381 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
382 | - return $ac_retval |
383 | + as_fn_set_status $ac_retval |
384 | |
385 | } # ac_fn_f77_try_link |
386 | |
387 | @@ -2312,7 +2316,7 @@ |
388 | |
389 | fi |
390 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
391 | - return $ac_retval |
392 | + as_fn_set_status $ac_retval |
393 | |
394 | } # ac_fn_c_compute_int |
395 | cat >config.log <<_ACEOF |
396 | @@ -2320,7 +2324,7 @@ |
397 | running configure, to aid debugging if configure makes a mistake. |
398 | |
399 | It was created by $as_me, which was |
400 | -generated by GNU Autoconf 2.64. Invocation command line was |
401 | +generated by GNU Autoconf 2.67. Invocation command line was |
402 | |
403 | $ $0 $@ |
404 | |
405 | @@ -2430,11 +2434,9 @@ |
406 | { |
407 | echo |
408 | |
409 | - cat <<\_ASBOX |
410 | -## ---------------- ## |
411 | + $as_echo "## ---------------- ## |
412 | ## Cache variables. ## |
413 | -## ---------------- ## |
414 | -_ASBOX |
415 | +## ---------------- ##" |
416 | echo |
417 | # The following way of writing the cache mishandles newlines in values, |
418 | ( |
419 | @@ -2468,11 +2470,9 @@ |
420 | ) |
421 | echo |
422 | |
423 | - cat <<\_ASBOX |
424 | -## ----------------- ## |
425 | + $as_echo "## ----------------- ## |
426 | ## Output variables. ## |
427 | -## ----------------- ## |
428 | -_ASBOX |
429 | +## ----------------- ##" |
430 | echo |
431 | for ac_var in $ac_subst_vars |
432 | do |
433 | @@ -2485,11 +2485,9 @@ |
434 | echo |
435 | |
436 | if test -n "$ac_subst_files"; then |
437 | - cat <<\_ASBOX |
438 | -## ------------------- ## |
439 | + $as_echo "## ------------------- ## |
440 | ## File substitutions. ## |
441 | -## ------------------- ## |
442 | -_ASBOX |
443 | +## ------------------- ##" |
444 | echo |
445 | for ac_var in $ac_subst_files |
446 | do |
447 | @@ -2503,11 +2501,9 @@ |
448 | fi |
449 | |
450 | if test -s confdefs.h; then |
451 | - cat <<\_ASBOX |
452 | -## ----------- ## |
453 | + $as_echo "## ----------- ## |
454 | ## confdefs.h. ## |
455 | -## ----------- ## |
456 | -_ASBOX |
457 | +## ----------- ##" |
458 | echo |
459 | cat confdefs.h |
460 | echo |
461 | @@ -2562,7 +2558,12 @@ |
462 | ac_site_file1=NONE |
463 | ac_site_file2=NONE |
464 | if test -n "$CONFIG_SITE"; then |
465 | - ac_site_file1=$CONFIG_SITE |
466 | + # We do not want a PATH search for config.site. |
467 | + case $CONFIG_SITE in #(( |
468 | + -*) ac_site_file1=./$CONFIG_SITE;; |
469 | + */*) ac_site_file1=$CONFIG_SITE;; |
470 | + *) ac_site_file1=./$CONFIG_SITE;; |
471 | + esac |
472 | elif test "x$prefix" != xNONE; then |
473 | ac_site_file1=$prefix/share/config.site |
474 | ac_site_file2=$prefix/etc/config.site |
475 | @@ -2573,18 +2574,22 @@ |
476 | for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
477 | do |
478 | test "x$ac_site_file" = xNONE && continue |
479 | - if test -r "$ac_site_file"; then |
480 | + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |
481 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
482 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
483 | sed 's/^/| /' "$ac_site_file" >&5 |
484 | - . "$ac_site_file" |
485 | + . "$ac_site_file" \ |
486 | + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
487 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
488 | +as_fn_error $? "failed to load site script $ac_site_file |
489 | +See \`config.log' for more details" "$LINENO" 5 ; } |
490 | fi |
491 | done |
492 | |
493 | if test -r "$cache_file"; then |
494 | - # Some versions of bash will fail to source /dev/null (special |
495 | - # files actually), so we avoid doing that. |
496 | - if test -f "$cache_file"; then |
497 | + # Some versions of bash will fail to source /dev/null (special files |
498 | + # actually), so we avoid doing that. DJGPP emulates it as a regular file. |
499 | + if test /dev/null != "$cache_file" && test -f "$cache_file"; then |
500 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 |
501 | $as_echo "$as_me: loading cache $cache_file" >&6;} |
502 | case $cache_file in |
503 | @@ -2653,7 +2658,7 @@ |
504 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
505 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
506 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
507 | - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
508 | + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
509 | fi |
510 | ## -------------------- ## |
511 | ## Main body of script. ## |
512 | @@ -2666,8 +2671,6 @@ |
513 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
514 | |
515 | |
516 | -ac_config_headers="$ac_config_headers include/spud_config.h" |
517 | - |
518 | |
519 | case `pwd` in |
520 | *\ * | *\ *) |
521 | @@ -2696,16 +2699,22 @@ |
522 | |
523 | ac_aux_dir= |
524 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
525 | - for ac_t in install-sh install.sh shtool; do |
526 | - if test -f "$ac_dir/$ac_t"; then |
527 | - ac_aux_dir=$ac_dir |
528 | - ac_install_sh="$ac_aux_dir/$ac_t -c" |
529 | - break 2 |
530 | - fi |
531 | - done |
532 | + if test -f "$ac_dir/install-sh"; then |
533 | + ac_aux_dir=$ac_dir |
534 | + ac_install_sh="$ac_aux_dir/install-sh -c" |
535 | + break |
536 | + elif test -f "$ac_dir/install.sh"; then |
537 | + ac_aux_dir=$ac_dir |
538 | + ac_install_sh="$ac_aux_dir/install.sh -c" |
539 | + break |
540 | + elif test -f "$ac_dir/shtool"; then |
541 | + ac_aux_dir=$ac_dir |
542 | + ac_install_sh="$ac_aux_dir/shtool install -c" |
543 | + break |
544 | + fi |
545 | done |
546 | if test -z "$ac_aux_dir"; then |
547 | - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
548 | + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
549 | fi |
550 | |
551 | # These three variables are undocumented and unsupported, |
552 | @@ -2719,7 +2728,7 @@ |
553 | |
554 | # Make sure we can run config.sub. |
555 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
556 | - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
557 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
558 | |
559 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
560 | $as_echo_n "checking build system type... " >&6; } |
561 | @@ -2730,16 +2739,16 @@ |
562 | test "x$ac_build_alias" = x && |
563 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
564 | test "x$ac_build_alias" = x && |
565 | - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
566 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
567 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
568 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
569 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
570 | |
571 | fi |
572 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
573 | $as_echo "$ac_cv_build" >&6; } |
574 | case $ac_cv_build in |
575 | *-*-*) ;; |
576 | -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
577 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; |
578 | esac |
579 | build=$ac_cv_build |
580 | ac_save_IFS=$IFS; IFS='-' |
581 | @@ -2764,7 +2773,7 @@ |
582 | ac_cv_host=$ac_cv_build |
583 | else |
584 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
585 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
586 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
587 | fi |
588 | |
589 | fi |
590 | @@ -2772,7 +2781,7 @@ |
591 | $as_echo "$ac_cv_host" >&6; } |
592 | case $ac_cv_host in |
593 | *-*-*) ;; |
594 | -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
595 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; |
596 | esac |
597 | host=$ac_cv_host |
598 | ac_save_IFS=$IFS; IFS='-' |
599 | @@ -3088,8 +3097,8 @@ |
600 | |
601 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
602 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
603 | -as_fn_error "no acceptable C compiler found in \$PATH |
604 | -See \`config.log' for more details." "$LINENO" 5; } |
605 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
606 | +See \`config.log' for more details" "$LINENO" 5 ; } |
607 | |
608 | # Provide some information about the compiler. |
609 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
610 | @@ -3110,32 +3119,30 @@ |
611 | ... rest of stderr output deleted ... |
612 | 10q' conftest.err >conftest.er1 |
613 | cat conftest.er1 >&5 |
614 | - rm -f conftest.er1 conftest.err |
615 | fi |
616 | + rm -f conftest.er1 conftest.err |
617 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
618 | test $ac_status = 0; } |
619 | done |
620 | |
621 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
622 | /* end confdefs.h. */ |
623 | -#include <stdio.h> |
624 | + |
625 | int |
626 | main () |
627 | { |
628 | -FILE *f = fopen ("conftest.out", "w"); |
629 | - return ferror (f) || fclose (f) != 0; |
630 | |
631 | ; |
632 | return 0; |
633 | } |
634 | _ACEOF |
635 | ac_clean_files_save=$ac_clean_files |
636 | -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" |
637 | +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" |
638 | # Try to create an executable without -o first, disregard a.out. |
639 | # It will help us diagnose broken compilers, and finding out an intuition |
640 | # of exeext. |
641 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
642 | -$as_echo_n "checking for C compiler default output file name... " >&6; } |
643 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
644 | +$as_echo_n "checking whether the C compiler works... " >&6; } |
645 | ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
646 | |
647 | # The possible output files: |
648 | @@ -3197,62 +3204,28 @@ |
649 | else |
650 | ac_file='' |
651 | fi |
652 | +if test -z "$ac_file"; then : |
653 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
654 | +$as_echo "no" >&6; } |
655 | +$as_echo "$as_me: failed program was:" >&5 |
656 | +sed 's/^/| /' conftest.$ac_ext >&5 |
657 | + |
658 | +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
659 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
660 | +as_fn_error 77 "C compiler cannot create executables |
661 | +See \`config.log' for more details" "$LINENO" 5 ; } |
662 | +else |
663 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
664 | +$as_echo "yes" >&6; } |
665 | +fi |
666 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
667 | +$as_echo_n "checking for C compiler default output file name... " >&6; } |
668 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
669 | $as_echo "$ac_file" >&6; } |
670 | -if test -z "$ac_file"; then : |
671 | - $as_echo "$as_me: failed program was:" >&5 |
672 | -sed 's/^/| /' conftest.$ac_ext >&5 |
673 | - |
674 | -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
675 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
676 | -{ as_fn_set_status 77 |
677 | -as_fn_error "C compiler cannot create executables |
678 | -See \`config.log' for more details." "$LINENO" 5; }; } |
679 | -fi |
680 | ac_exeext=$ac_cv_exeext |
681 | |
682 | -# Check that the compiler produces executables we can run. If not, either |
683 | -# the compiler is broken, or we cross compile. |
684 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
685 | -$as_echo_n "checking whether the C compiler works... " >&6; } |
686 | -# If not cross compiling, check that we can run a simple program. |
687 | -if test "$cross_compiling" != yes; then |
688 | - if { ac_try='./$ac_file' |
689 | - { { case "(($ac_try" in |
690 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
691 | - *) ac_try_echo=$ac_try;; |
692 | -esac |
693 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
694 | -$as_echo "$ac_try_echo"; } >&5 |
695 | - (eval "$ac_try") 2>&5 |
696 | - ac_status=$? |
697 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
698 | - test $ac_status = 0; }; }; then |
699 | - cross_compiling=no |
700 | - else |
701 | - if test "$cross_compiling" = maybe; then |
702 | - cross_compiling=yes |
703 | - else |
704 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
705 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
706 | -as_fn_error "cannot run C compiled programs. |
707 | -If you meant to cross compile, use \`--host'. |
708 | -See \`config.log' for more details." "$LINENO" 5; } |
709 | - fi |
710 | - fi |
711 | -fi |
712 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
713 | -$as_echo "yes" >&6; } |
714 | - |
715 | -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out |
716 | +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
717 | ac_clean_files=$ac_clean_files_save |
718 | -# Check that the compiler produces executables we can run. If not, either |
719 | -# the compiler is broken, or we cross compile. |
720 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
721 | -$as_echo_n "checking whether we are cross compiling... " >&6; } |
722 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
723 | -$as_echo "$cross_compiling" >&6; } |
724 | - |
725 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 |
726 | $as_echo_n "checking for suffix of executables... " >&6; } |
727 | if { { ac_try="$ac_link" |
728 | @@ -3282,16 +3255,75 @@ |
729 | else |
730 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
731 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
732 | -as_fn_error "cannot compute suffix of executables: cannot compile and link |
733 | -See \`config.log' for more details." "$LINENO" 5; } |
734 | +as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
735 | +See \`config.log' for more details" "$LINENO" 5 ; } |
736 | fi |
737 | -rm -f conftest$ac_cv_exeext |
738 | +rm -f conftest conftest$ac_cv_exeext |
739 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
740 | $as_echo "$ac_cv_exeext" >&6; } |
741 | |
742 | rm -f conftest.$ac_ext |
743 | EXEEXT=$ac_cv_exeext |
744 | ac_exeext=$EXEEXT |
745 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
746 | +/* end confdefs.h. */ |
747 | +#include <stdio.h> |
748 | +int |
749 | +main () |
750 | +{ |
751 | +FILE *f = fopen ("conftest.out", "w"); |
752 | + return ferror (f) || fclose (f) != 0; |
753 | + |
754 | + ; |
755 | + return 0; |
756 | +} |
757 | +_ACEOF |
758 | +ac_clean_files="$ac_clean_files conftest.out" |
759 | +# Check that the compiler produces executables we can run. If not, either |
760 | +# the compiler is broken, or we cross compile. |
761 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
762 | +$as_echo_n "checking whether we are cross compiling... " >&6; } |
763 | +if test "$cross_compiling" != yes; then |
764 | + { { ac_try="$ac_link" |
765 | +case "(($ac_try" in |
766 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
767 | + *) ac_try_echo=$ac_try;; |
768 | +esac |
769 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
770 | +$as_echo "$ac_try_echo"; } >&5 |
771 | + (eval "$ac_link") 2>&5 |
772 | + ac_status=$? |
773 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
774 | + test $ac_status = 0; } |
775 | + if { ac_try='./conftest$ac_cv_exeext' |
776 | + { { case "(($ac_try" in |
777 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
778 | + *) ac_try_echo=$ac_try;; |
779 | +esac |
780 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
781 | +$as_echo "$ac_try_echo"; } >&5 |
782 | + (eval "$ac_try") 2>&5 |
783 | + ac_status=$? |
784 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
785 | + test $ac_status = 0; }; }; then |
786 | + cross_compiling=no |
787 | + else |
788 | + if test "$cross_compiling" = maybe; then |
789 | + cross_compiling=yes |
790 | + else |
791 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
792 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
793 | +as_fn_error $? "cannot run C compiled programs. |
794 | +If you meant to cross compile, use \`--host'. |
795 | +See \`config.log' for more details" "$LINENO" 5 ; } |
796 | + fi |
797 | + fi |
798 | +fi |
799 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
800 | +$as_echo "$cross_compiling" >&6; } |
801 | + |
802 | +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out |
803 | +ac_clean_files=$ac_clean_files_save |
804 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
805 | $as_echo_n "checking for suffix of object files... " >&6; } |
806 | if test "${ac_cv_objext+set}" = set; then : |
807 | @@ -3334,8 +3366,8 @@ |
808 | |
809 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
810 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
811 | -as_fn_error "cannot compute suffix of object files: cannot compile |
812 | -See \`config.log' for more details." "$LINENO" 5; } |
813 | +as_fn_error $? "cannot compute suffix of object files: cannot compile |
814 | +See \`config.log' for more details" "$LINENO" 5 ; } |
815 | fi |
816 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
817 | fi |
818 | @@ -3612,7 +3644,7 @@ |
819 | done |
820 | IFS=$as_save_IFS |
821 | if test -z "$ac_cv_path_SED"; then |
822 | - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
823 | + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
824 | fi |
825 | else |
826 | ac_cv_path_SED=$SED |
827 | @@ -3688,7 +3720,7 @@ |
828 | done |
829 | IFS=$as_save_IFS |
830 | if test -z "$ac_cv_path_GREP"; then |
831 | - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
832 | + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
833 | fi |
834 | else |
835 | ac_cv_path_GREP=$GREP |
836 | @@ -3754,7 +3786,7 @@ |
837 | done |
838 | IFS=$as_save_IFS |
839 | if test -z "$ac_cv_path_EGREP"; then |
840 | - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
841 | + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
842 | fi |
843 | else |
844 | ac_cv_path_EGREP=$EGREP |
845 | @@ -3821,7 +3853,7 @@ |
846 | done |
847 | IFS=$as_save_IFS |
848 | if test -z "$ac_cv_path_FGREP"; then |
849 | - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
850 | + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
851 | fi |
852 | else |
853 | ac_cv_path_FGREP=$FGREP |
854 | @@ -3937,7 +3969,7 @@ |
855 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
856 | $as_echo "no" >&6; } |
857 | fi |
858 | -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 |
859 | +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
860 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
861 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
862 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
863 | @@ -4139,13 +4171,13 @@ |
864 | else |
865 | lt_cv_nm_interface="BSD nm" |
866 | echo "int some_variable = 0;" > conftest.$ac_ext |
867 | - (eval echo "\"\$as_me:4142: $ac_compile\"" >&5) |
868 | + (eval echo "\"\$as_me:4174: $ac_compile\"" >&5) |
869 | (eval "$ac_compile" 2>conftest.err) |
870 | cat conftest.err >&5 |
871 | - (eval echo "\"\$as_me:4145: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
872 | + (eval echo "\"\$as_me:4177: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
873 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
874 | cat conftest.err >&5 |
875 | - (eval echo "\"\$as_me:4148: output\"" >&5) |
876 | + (eval echo "\"\$as_me:4180: output\"" >&5) |
877 | cat conftest.out >&5 |
878 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
879 | lt_cv_nm_interface="MS dumpbin" |
880 | @@ -5351,7 +5383,7 @@ |
881 | ;; |
882 | *-*-irix6*) |
883 | # Find out which ABI we are using. |
884 | - echo '#line 5354 "configure"' > conftest.$ac_ext |
885 | + echo '#line 5386 "configure"' > conftest.$ac_ext |
886 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
887 | (eval $ac_compile) 2>&5 |
888 | ac_status=$? |
889 | @@ -6140,7 +6172,7 @@ |
890 | # Broken: fails on valid input. |
891 | continue |
892 | fi |
893 | -rm -f conftest.err conftest.$ac_ext |
894 | +rm -f conftest.err conftest.i conftest.$ac_ext |
895 | |
896 | # OK, works on sane cases. Now check whether nonexistent headers |
897 | # can be detected and how. |
898 | @@ -6156,11 +6188,11 @@ |
899 | ac_preproc_ok=: |
900 | break |
901 | fi |
902 | -rm -f conftest.err conftest.$ac_ext |
903 | +rm -f conftest.err conftest.i conftest.$ac_ext |
904 | |
905 | done |
906 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
907 | -rm -f conftest.err conftest.$ac_ext |
908 | +rm -f conftest.i conftest.err conftest.$ac_ext |
909 | if $ac_preproc_ok; then : |
910 | break |
911 | fi |
912 | @@ -6199,7 +6231,7 @@ |
913 | # Broken: fails on valid input. |
914 | continue |
915 | fi |
916 | -rm -f conftest.err conftest.$ac_ext |
917 | +rm -f conftest.err conftest.i conftest.$ac_ext |
918 | |
919 | # OK, works on sane cases. Now check whether nonexistent headers |
920 | # can be detected and how. |
921 | @@ -6215,18 +6247,18 @@ |
922 | ac_preproc_ok=: |
923 | break |
924 | fi |
925 | -rm -f conftest.err conftest.$ac_ext |
926 | +rm -f conftest.err conftest.i conftest.$ac_ext |
927 | |
928 | done |
929 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
930 | -rm -f conftest.err conftest.$ac_ext |
931 | +rm -f conftest.i conftest.err conftest.$ac_ext |
932 | if $ac_preproc_ok; then : |
933 | |
934 | else |
935 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
936 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
937 | -as_fn_error "C preprocessor \"$CPP\" fails sanity check |
938 | -See \`config.log' for more details." "$LINENO" 5; } |
939 | +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
940 | +See \`config.log' for more details" "$LINENO" 5 ; } |
941 | fi |
942 | |
943 | ac_ext=c |
944 | @@ -6355,8 +6387,7 @@ |
945 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
946 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
947 | " |
948 | -eval as_val=\$$as_ac_Header |
949 | - if test "x$as_val" = x""yes; then : |
950 | +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
951 | cat >>confdefs.h <<_ACEOF |
952 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
953 | _ACEOF |
954 | @@ -6881,11 +6912,11 @@ |
955 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
956 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
957 | -e 's:$: $lt_compiler_flag:'` |
958 | - (eval echo "\"\$as_me:6884: $lt_compile\"" >&5) |
959 | + (eval echo "\"\$as_me:6915: $lt_compile\"" >&5) |
960 | (eval "$lt_compile" 2>conftest.err) |
961 | ac_status=$? |
962 | cat conftest.err >&5 |
963 | - echo "$as_me:6888: \$? = $ac_status" >&5 |
964 | + echo "$as_me:6919: \$? = $ac_status" >&5 |
965 | if (exit $ac_status) && test -s "$ac_outfile"; then |
966 | # The compiler can only warn and ignore the option if not recognized |
967 | # So say no if there are warnings other than the usual output. |
968 | @@ -7220,11 +7251,11 @@ |
969 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
970 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
971 | -e 's:$: $lt_compiler_flag:'` |
972 | - (eval echo "\"\$as_me:7223: $lt_compile\"" >&5) |
973 | + (eval echo "\"\$as_me:7254: $lt_compile\"" >&5) |
974 | (eval "$lt_compile" 2>conftest.err) |
975 | ac_status=$? |
976 | cat conftest.err >&5 |
977 | - echo "$as_me:7227: \$? = $ac_status" >&5 |
978 | + echo "$as_me:7258: \$? = $ac_status" >&5 |
979 | if (exit $ac_status) && test -s "$ac_outfile"; then |
980 | # The compiler can only warn and ignore the option if not recognized |
981 | # So say no if there are warnings other than the usual output. |
982 | @@ -7325,11 +7356,11 @@ |
983 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
984 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
985 | -e 's:$: $lt_compiler_flag:'` |
986 | - (eval echo "\"\$as_me:7328: $lt_compile\"" >&5) |
987 | + (eval echo "\"\$as_me:7359: $lt_compile\"" >&5) |
988 | (eval "$lt_compile" 2>out/conftest.err) |
989 | ac_status=$? |
990 | cat out/conftest.err >&5 |
991 | - echo "$as_me:7332: \$? = $ac_status" >&5 |
992 | + echo "$as_me:7363: \$? = $ac_status" >&5 |
993 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
994 | then |
995 | # The compiler can only warn and ignore the option if not recognized |
996 | @@ -7380,11 +7411,11 @@ |
997 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
998 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
999 | -e 's:$: $lt_compiler_flag:'` |
1000 | - (eval echo "\"\$as_me:7383: $lt_compile\"" >&5) |
1001 | + (eval echo "\"\$as_me:7414: $lt_compile\"" >&5) |
1002 | (eval "$lt_compile" 2>out/conftest.err) |
1003 | ac_status=$? |
1004 | cat out/conftest.err >&5 |
1005 | - echo "$as_me:7387: \$? = $ac_status" >&5 |
1006 | + echo "$as_me:7418: \$? = $ac_status" >&5 |
1007 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1008 | then |
1009 | # The compiler can only warn and ignore the option if not recognized |
1010 | @@ -9763,7 +9794,7 @@ |
1011 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1012 | lt_status=$lt_dlunknown |
1013 | cat > conftest.$ac_ext <<_LT_EOF |
1014 | -#line 9766 "configure" |
1015 | +#line 9797 "configure" |
1016 | #include "confdefs.h" |
1017 | |
1018 | #if HAVE_DLFCN_H |
1019 | @@ -9859,7 +9890,7 @@ |
1020 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1021 | lt_status=$lt_dlunknown |
1022 | cat > conftest.$ac_ext <<_LT_EOF |
1023 | -#line 9862 "configure" |
1024 | +#line 9893 "configure" |
1025 | #include "confdefs.h" |
1026 | |
1027 | #if HAVE_DLFCN_H |
1028 | @@ -10218,8 +10249,8 @@ |
1029 | ... rest of stderr output deleted ... |
1030 | 10q' conftest.err >conftest.er1 |
1031 | cat conftest.er1 >&5 |
1032 | - rm -f conftest.er1 conftest.err |
1033 | fi |
1034 | + rm -f conftest.er1 conftest.err |
1035 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1036 | test $ac_status = 0; } |
1037 | done |
1038 | @@ -10386,7 +10417,7 @@ |
1039 | # Broken: fails on valid input. |
1040 | continue |
1041 | fi |
1042 | -rm -f conftest.err conftest.$ac_ext |
1043 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1044 | |
1045 | # OK, works on sane cases. Now check whether nonexistent headers |
1046 | # can be detected and how. |
1047 | @@ -10402,11 +10433,11 @@ |
1048 | ac_preproc_ok=: |
1049 | break |
1050 | fi |
1051 | -rm -f conftest.err conftest.$ac_ext |
1052 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1053 | |
1054 | done |
1055 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1056 | -rm -f conftest.err conftest.$ac_ext |
1057 | +rm -f conftest.i conftest.err conftest.$ac_ext |
1058 | if $ac_preproc_ok; then : |
1059 | break |
1060 | fi |
1061 | @@ -10445,7 +10476,7 @@ |
1062 | # Broken: fails on valid input. |
1063 | continue |
1064 | fi |
1065 | -rm -f conftest.err conftest.$ac_ext |
1066 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1067 | |
1068 | # OK, works on sane cases. Now check whether nonexistent headers |
1069 | # can be detected and how. |
1070 | @@ -10461,11 +10492,11 @@ |
1071 | ac_preproc_ok=: |
1072 | break |
1073 | fi |
1074 | -rm -f conftest.err conftest.$ac_ext |
1075 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1076 | |
1077 | done |
1078 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1079 | -rm -f conftest.err conftest.$ac_ext |
1080 | +rm -f conftest.i conftest.err conftest.$ac_ext |
1081 | if $ac_preproc_ok; then : |
1082 | |
1083 | else |
1084 | @@ -10694,7 +10725,7 @@ |
1085 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1086 | $as_echo "no" >&6; } |
1087 | fi |
1088 | -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 |
1089 | +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
1090 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
1091 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
1092 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
1093 | @@ -12235,11 +12266,11 @@ |
1094 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1095 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1096 | -e 's:$: $lt_compiler_flag:'` |
1097 | - (eval echo "\"\$as_me:12238: $lt_compile\"" >&5) |
1098 | + (eval echo "\"\$as_me:12269: $lt_compile\"" >&5) |
1099 | (eval "$lt_compile" 2>conftest.err) |
1100 | ac_status=$? |
1101 | cat conftest.err >&5 |
1102 | - echo "$as_me:12242: \$? = $ac_status" >&5 |
1103 | + echo "$as_me:12273: \$? = $ac_status" >&5 |
1104 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1105 | # The compiler can only warn and ignore the option if not recognized |
1106 | # So say no if there are warnings other than the usual output. |
1107 | @@ -12334,11 +12365,11 @@ |
1108 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1109 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1110 | -e 's:$: $lt_compiler_flag:'` |
1111 | - (eval echo "\"\$as_me:12337: $lt_compile\"" >&5) |
1112 | + (eval echo "\"\$as_me:12368: $lt_compile\"" >&5) |
1113 | (eval "$lt_compile" 2>out/conftest.err) |
1114 | ac_status=$? |
1115 | cat out/conftest.err >&5 |
1116 | - echo "$as_me:12341: \$? = $ac_status" >&5 |
1117 | + echo "$as_me:12372: \$? = $ac_status" >&5 |
1118 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1119 | then |
1120 | # The compiler can only warn and ignore the option if not recognized |
1121 | @@ -12386,11 +12417,11 @@ |
1122 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1123 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1124 | -e 's:$: $lt_compiler_flag:'` |
1125 | - (eval echo "\"\$as_me:12389: $lt_compile\"" >&5) |
1126 | + (eval echo "\"\$as_me:12420: $lt_compile\"" >&5) |
1127 | (eval "$lt_compile" 2>out/conftest.err) |
1128 | ac_status=$? |
1129 | cat out/conftest.err >&5 |
1130 | - echo "$as_me:12393: \$? = $ac_status" >&5 |
1131 | + echo "$as_me:12424: \$? = $ac_status" >&5 |
1132 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1133 | then |
1134 | # The compiler can only warn and ignore the option if not recognized |
1135 | @@ -13341,7 +13372,7 @@ |
1136 | ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' |
1137 | ac_compiler_gnu=$ac_cv_fc_compiler_gnu |
1138 | if test -n "$ac_tool_prefix"; then |
1139 | - for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 |
1140 | + for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 |
1141 | do |
1142 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
1143 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1144 | @@ -13385,7 +13416,7 @@ |
1145 | fi |
1146 | if test -z "$FC"; then |
1147 | ac_ct_FC=$FC |
1148 | - for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 |
1149 | + for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 |
1150 | do |
1151 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
1152 | set dummy $ac_prog; ac_word=$2 |
1153 | @@ -13460,8 +13491,8 @@ |
1154 | ... rest of stderr output deleted ... |
1155 | 10q' conftest.err >conftest.er1 |
1156 | cat conftest.er1 >&5 |
1157 | - rm -f conftest.er1 conftest.err |
1158 | fi |
1159 | + rm -f conftest.er1 conftest.err |
1160 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1161 | test $ac_status = 0; } |
1162 | done |
1163 | @@ -14121,11 +14152,11 @@ |
1164 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1165 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1166 | -e 's:$: $lt_compiler_flag:'` |
1167 | - (eval echo "\"\$as_me:14124: $lt_compile\"" >&5) |
1168 | + (eval echo "\"\$as_me:14155: $lt_compile\"" >&5) |
1169 | (eval "$lt_compile" 2>conftest.err) |
1170 | ac_status=$? |
1171 | cat conftest.err >&5 |
1172 | - echo "$as_me:14128: \$? = $ac_status" >&5 |
1173 | + echo "$as_me:14159: \$? = $ac_status" >&5 |
1174 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1175 | # The compiler can only warn and ignore the option if not recognized |
1176 | # So say no if there are warnings other than the usual output. |
1177 | @@ -14220,11 +14251,11 @@ |
1178 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1179 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1180 | -e 's:$: $lt_compiler_flag:'` |
1181 | - (eval echo "\"\$as_me:14223: $lt_compile\"" >&5) |
1182 | + (eval echo "\"\$as_me:14254: $lt_compile\"" >&5) |
1183 | (eval "$lt_compile" 2>out/conftest.err) |
1184 | ac_status=$? |
1185 | cat out/conftest.err >&5 |
1186 | - echo "$as_me:14227: \$? = $ac_status" >&5 |
1187 | + echo "$as_me:14258: \$? = $ac_status" >&5 |
1188 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1189 | then |
1190 | # The compiler can only warn and ignore the option if not recognized |
1191 | @@ -14272,11 +14303,11 @@ |
1192 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1193 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1194 | -e 's:$: $lt_compiler_flag:'` |
1195 | - (eval echo "\"\$as_me:14275: $lt_compile\"" >&5) |
1196 | + (eval echo "\"\$as_me:14306: $lt_compile\"" >&5) |
1197 | (eval "$lt_compile" 2>out/conftest.err) |
1198 | ac_status=$? |
1199 | cat out/conftest.err >&5 |
1200 | - echo "$as_me:14279: \$? = $ac_status" >&5 |
1201 | + echo "$as_me:14310: \$? = $ac_status" >&5 |
1202 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1203 | then |
1204 | # The compiler can only warn and ignore the option if not recognized |
1205 | @@ -16298,8 +16329,8 @@ |
1206 | ... rest of stderr output deleted ... |
1207 | 10q' conftest.err >conftest.er1 |
1208 | cat conftest.er1 >&5 |
1209 | - rm -f conftest.er1 conftest.err |
1210 | fi |
1211 | + rm -f conftest.er1 conftest.err |
1212 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1213 | test $ac_status = 0; } |
1214 | done |
1215 | @@ -16391,7 +16422,7 @@ |
1216 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1217 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu |
1218 | if test -n "$ac_tool_prefix"; then |
1219 | - 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 |
1220 | + 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 |
1221 | do |
1222 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
1223 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1224 | @@ -16435,7 +16466,7 @@ |
1225 | fi |
1226 | if test -z "$F77"; then |
1227 | ac_ct_F77=$F77 |
1228 | - 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 |
1229 | + 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 |
1230 | do |
1231 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
1232 | set dummy $ac_prog; ac_word=$2 |
1233 | @@ -16510,8 +16541,8 @@ |
1234 | ... rest of stderr output deleted ... |
1235 | 10q' conftest.err >conftest.er1 |
1236 | cat conftest.er1 >&5 |
1237 | - rm -f conftest.er1 conftest.err |
1238 | fi |
1239 | + rm -f conftest.er1 conftest.err |
1240 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1241 | test $ac_status = 0; } |
1242 | done |
1243 | @@ -17049,11 +17080,11 @@ |
1244 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1245 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1246 | -e 's:$: $lt_compiler_flag:'` |
1247 | - (eval echo "\"\$as_me:17052: $lt_compile\"" >&5) |
1248 | + (eval echo "\"\$as_me:17083: $lt_compile\"" >&5) |
1249 | (eval "$lt_compile" 2>conftest.err) |
1250 | ac_status=$? |
1251 | cat conftest.err >&5 |
1252 | - echo "$as_me:17056: \$? = $ac_status" >&5 |
1253 | + echo "$as_me:17087: \$? = $ac_status" >&5 |
1254 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1255 | # The compiler can only warn and ignore the option if not recognized |
1256 | # So say no if there are warnings other than the usual output. |
1257 | @@ -17148,11 +17179,11 @@ |
1258 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1259 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1260 | -e 's:$: $lt_compiler_flag:'` |
1261 | - (eval echo "\"\$as_me:17151: $lt_compile\"" >&5) |
1262 | + (eval echo "\"\$as_me:17182: $lt_compile\"" >&5) |
1263 | (eval "$lt_compile" 2>out/conftest.err) |
1264 | ac_status=$? |
1265 | cat out/conftest.err >&5 |
1266 | - echo "$as_me:17155: \$? = $ac_status" >&5 |
1267 | + echo "$as_me:17186: \$? = $ac_status" >&5 |
1268 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1269 | then |
1270 | # The compiler can only warn and ignore the option if not recognized |
1271 | @@ -17200,11 +17231,11 @@ |
1272 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1273 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1274 | -e 's:$: $lt_compiler_flag:'` |
1275 | - (eval echo "\"\$as_me:17203: $lt_compile\"" >&5) |
1276 | + (eval echo "\"\$as_me:17234: $lt_compile\"" >&5) |
1277 | (eval "$lt_compile" 2>out/conftest.err) |
1278 | ac_status=$? |
1279 | cat out/conftest.err >&5 |
1280 | - echo "$as_me:17207: \$? = $ac_status" >&5 |
1281 | + echo "$as_me:17238: \$? = $ac_status" >&5 |
1282 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1283 | then |
1284 | # The compiler can only warn and ignore the option if not recognized |
1285 | @@ -19299,7 +19330,7 @@ |
1286 | ;; |
1287 | # Ignore these flags. |
1288 | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ |
1289 | - |-LANG:=* | -LIST:* | -LNO:*) |
1290 | + |-LANG:=* | -LIST:* | -LNO:* | -link) |
1291 | ;; |
1292 | -lkernel32) |
1293 | test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" |
1294 | @@ -19518,8 +19549,8 @@ |
1295 | ... rest of stderr output deleted ... |
1296 | 10q' conftest.err >conftest.er1 |
1297 | cat conftest.er1 >&5 |
1298 | - rm -f conftest.er1 conftest.err |
1299 | fi |
1300 | + rm -f conftest.er1 conftest.err |
1301 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1302 | test $ac_status = 0; } |
1303 | done |
1304 | @@ -19816,7 +19847,7 @@ |
1305 | ;; |
1306 | # Ignore these flags. |
1307 | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ |
1308 | - |-LANG:=* | -LIST:* | -LNO:*) |
1309 | + |-LANG:=* | -LIST:* | -LNO:* | -link) |
1310 | ;; |
1311 | -lkernel32) |
1312 | test x"$CYGWIN" != xyes && ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg" |
1313 | @@ -20057,8 +20088,8 @@ |
1314 | ... rest of stderr output deleted ... |
1315 | 10q' conftest.err >conftest.er1 |
1316 | cat conftest.er1 >&5 |
1317 | - rm -f conftest.er1 conftest.err |
1318 | fi |
1319 | + rm -f conftest.er1 conftest.err |
1320 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1321 | test $ac_status = 0; } |
1322 | done |
1323 | @@ -20226,7 +20257,7 @@ |
1324 | # Broken: fails on valid input. |
1325 | continue |
1326 | fi |
1327 | -rm -f conftest.err conftest.$ac_ext |
1328 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1329 | |
1330 | # OK, works on sane cases. Now check whether nonexistent headers |
1331 | # can be detected and how. |
1332 | @@ -20242,11 +20273,11 @@ |
1333 | ac_preproc_ok=: |
1334 | break |
1335 | fi |
1336 | -rm -f conftest.err conftest.$ac_ext |
1337 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1338 | |
1339 | done |
1340 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1341 | -rm -f conftest.err conftest.$ac_ext |
1342 | +rm -f conftest.i conftest.err conftest.$ac_ext |
1343 | if $ac_preproc_ok; then : |
1344 | break |
1345 | fi |
1346 | @@ -20285,7 +20316,7 @@ |
1347 | # Broken: fails on valid input. |
1348 | continue |
1349 | fi |
1350 | -rm -f conftest.err conftest.$ac_ext |
1351 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1352 | |
1353 | # OK, works on sane cases. Now check whether nonexistent headers |
1354 | # can be detected and how. |
1355 | @@ -20301,18 +20332,18 @@ |
1356 | ac_preproc_ok=: |
1357 | break |
1358 | fi |
1359 | -rm -f conftest.err conftest.$ac_ext |
1360 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1361 | |
1362 | done |
1363 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1364 | -rm -f conftest.err conftest.$ac_ext |
1365 | +rm -f conftest.i conftest.err conftest.$ac_ext |
1366 | if $ac_preproc_ok; then : |
1367 | |
1368 | else |
1369 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1370 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1371 | -as_fn_error "C preprocessor \"$CPP\" fails sanity check |
1372 | -See \`config.log' for more details." "$LINENO" 5; } |
1373 | +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
1374 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1375 | fi |
1376 | |
1377 | ac_ext=c |
1378 | @@ -20338,9 +20369,8 @@ |
1379 | if test "$ac_cv_type_long_int" = yes; then |
1380 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1381 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1382 | -{ as_fn_set_status 77 |
1383 | -as_fn_error "cannot compute sizeof (long int) |
1384 | -See \`config.log' for more details." "$LINENO" 5; }; } |
1385 | +as_fn_error 77 "cannot compute sizeof (long int) |
1386 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1387 | else |
1388 | ac_cv_sizeof_long_int=0 |
1389 | fi |
1390 | @@ -20580,7 +20610,7 @@ |
1391 | ;; |
1392 | # Ignore these flags. |
1393 | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ |
1394 | - |-LANG:=* | -LIST:* | -LNO:*) |
1395 | + |-LANG:=* | -LIST:* | -LNO:* | -link) |
1396 | ;; |
1397 | -lkernel32) |
1398 | test x"$CYGWIN" != xyes && ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg" |
1399 | @@ -20775,8 +20805,8 @@ |
1400 | else |
1401 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1402 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1403 | -as_fn_error "linking to Fortran libraries from C fails |
1404 | -See \`config.log' for more details." "$LINENO" 5; } |
1405 | +as_fn_error $? "linking to Fortran libraries from C fails |
1406 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1407 | fi |
1408 | |
1409 | ac_ext=c |
1410 | @@ -20937,8 +20967,8 @@ |
1411 | else |
1412 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1413 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1414 | -as_fn_error "cannot compile a simple Fortran program |
1415 | -See \`config.log' for more details." "$LINENO" 5; } |
1416 | +as_fn_error $? "cannot compile a simple Fortran program |
1417 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1418 | fi |
1419 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1420 | |
1421 | @@ -21797,10 +21827,47 @@ |
1422 | # Let make expand exec_prefix. |
1423 | test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' |
1424 | |
1425 | -DEFS=-DHAVE_CONFIG_H |
1426 | +# Transform confdefs.h into DEFS. |
1427 | +# Protect against shell expansion while executing Makefile rules. |
1428 | +# Protect against Makefile macro expansion. |
1429 | +# |
1430 | +# If the first sed substitution is executed (which looks for macros that |
1431 | +# take arguments), then branch to the quote section. Otherwise, |
1432 | +# look for a macro that doesn't take arguments. |
1433 | +ac_script=' |
1434 | +:mline |
1435 | +/\\$/{ |
1436 | + N |
1437 | + s,\\\n,, |
1438 | + b mline |
1439 | +} |
1440 | +t clear |
1441 | +:clear |
1442 | +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g |
1443 | +t quote |
1444 | +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g |
1445 | +t quote |
1446 | +b any |
1447 | +:quote |
1448 | +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g |
1449 | +s/\[/\\&/g |
1450 | +s/\]/\\&/g |
1451 | +s/\$/$$/g |
1452 | +H |
1453 | +:any |
1454 | +${ |
1455 | + g |
1456 | + s/^\n// |
1457 | + s/\n/ /g |
1458 | + p |
1459 | +} |
1460 | +' |
1461 | +DEFS=`sed -n "$ac_script" confdefs.h` |
1462 | + |
1463 | |
1464 | ac_libobjs= |
1465 | ac_ltlibobjs= |
1466 | +U= |
1467 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
1468 | # 1. Remove the extension, and $U if already installed. |
1469 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' |
1470 | @@ -21962,19 +22029,19 @@ |
1471 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1472 | |
1473 | |
1474 | -# as_fn_error ERROR [LINENO LOG_FD] |
1475 | -# --------------------------------- |
1476 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
1477 | +# ---------------------------------------- |
1478 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
1479 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
1480 | -# script with status $?, using 1 if that was 0. |
1481 | +# script with STATUS, using 1 if that was 0. |
1482 | as_fn_error () |
1483 | { |
1484 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
1485 | - if test "$3"; then |
1486 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1487 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
1488 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
1489 | + if test "$4"; then |
1490 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1491 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
1492 | fi |
1493 | - $as_echo "$as_me: error: $1" >&2 |
1494 | + $as_echo "$as_me: error: $2" >&2 |
1495 | as_fn_exit $as_status |
1496 | } # as_fn_error |
1497 | |
1498 | @@ -22170,7 +22237,7 @@ |
1499 | test -d "$as_dir" && break |
1500 | done |
1501 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
1502 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
1503 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
1504 | |
1505 | |
1506 | } # as_fn_mkdir_p |
1507 | @@ -22224,7 +22291,7 @@ |
1508 | # values after options handling. |
1509 | ac_log=" |
1510 | This file was extended by $as_me, which was |
1511 | -generated by GNU Autoconf 2.64. Invocation command line was |
1512 | +generated by GNU Autoconf 2.67. Invocation command line was |
1513 | |
1514 | CONFIG_FILES = $CONFIG_FILES |
1515 | CONFIG_HEADERS = $CONFIG_HEADERS |
1516 | @@ -22241,15 +22308,11 @@ |
1517 | "*) set x $ac_config_files; shift; ac_config_files=$*;; |
1518 | esac |
1519 | |
1520 | -case $ac_config_headers in *" |
1521 | -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; |
1522 | -esac |
1523 | |
1524 | |
1525 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1526 | # Files that config.status was made for. |
1527 | config_files="$ac_config_files" |
1528 | -config_headers="$ac_config_headers" |
1529 | config_commands="$ac_config_commands" |
1530 | |
1531 | _ACEOF |
1532 | @@ -22264,21 +22327,17 @@ |
1533 | |
1534 | -h, --help print this help, then exit |
1535 | -V, --version print version number and configuration settings, then exit |
1536 | + --config print configuration, then exit |
1537 | -q, --quiet, --silent |
1538 | do not print progress messages |
1539 | -d, --debug don't remove temporary files |
1540 | --recheck update $as_me by reconfiguring in the same conditions |
1541 | --file=FILE[:TEMPLATE] |
1542 | instantiate the configuration file FILE |
1543 | - --header=FILE[:TEMPLATE] |
1544 | - instantiate the configuration header FILE |
1545 | |
1546 | Configuration files: |
1547 | $config_files |
1548 | |
1549 | -Configuration headers: |
1550 | -$config_headers |
1551 | - |
1552 | Configuration commands: |
1553 | $config_commands |
1554 | |
1555 | @@ -22286,12 +22345,13 @@ |
1556 | |
1557 | _ACEOF |
1558 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1559 | +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1560 | ac_cs_version="\\ |
1561 | config.status |
1562 | -configured by $0, generated by GNU Autoconf 2.64, |
1563 | - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
1564 | +configured by $0, generated by GNU Autoconf 2.67, |
1565 | + with options \\"\$ac_cs_config\\" |
1566 | |
1567 | -Copyright (C) 2009 Free Software Foundation, Inc. |
1568 | +Copyright (C) 2010 Free Software Foundation, Inc. |
1569 | This config.status script is free software; the Free Software Foundation |
1570 | gives unlimited permission to copy, distribute and modify it." |
1571 | |
1572 | @@ -22307,11 +22367,16 @@ |
1573 | while test $# != 0 |
1574 | do |
1575 | case $1 in |
1576 | - --*=*) |
1577 | + --*=?*) |
1578 | ac_option=`expr "X$1" : 'X\([^=]*\)='` |
1579 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` |
1580 | ac_shift=: |
1581 | ;; |
1582 | + --*=) |
1583 | + ac_option=`expr "X$1" : 'X\([^=]*\)='` |
1584 | + ac_optarg= |
1585 | + ac_shift=: |
1586 | + ;; |
1587 | *) |
1588 | ac_option=$1 |
1589 | ac_optarg=$2 |
1590 | @@ -22325,34 +22390,26 @@ |
1591 | ac_cs_recheck=: ;; |
1592 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) |
1593 | $as_echo "$ac_cs_version"; exit ;; |
1594 | + --config | --confi | --conf | --con | --co | --c ) |
1595 | + $as_echo "$ac_cs_config"; exit ;; |
1596 | --debug | --debu | --deb | --de | --d | -d ) |
1597 | debug=: ;; |
1598 | --file | --fil | --fi | --f ) |
1599 | $ac_shift |
1600 | case $ac_optarg in |
1601 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
1602 | + '') as_fn_error $? "missing file argument" ;; |
1603 | esac |
1604 | as_fn_append CONFIG_FILES " '$ac_optarg'" |
1605 | ac_need_defaults=false;; |
1606 | - --header | --heade | --head | --hea ) |
1607 | - $ac_shift |
1608 | - case $ac_optarg in |
1609 | - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
1610 | - esac |
1611 | - as_fn_append CONFIG_HEADERS " '$ac_optarg'" |
1612 | - ac_need_defaults=false;; |
1613 | - --he | --h) |
1614 | - # Conflict between --help and --header |
1615 | - as_fn_error "ambiguous option: \`$1' |
1616 | -Try \`$0 --help' for more information.";; |
1617 | - --help | --hel | -h ) |
1618 | + --he | --h | --help | --hel | -h ) |
1619 | $as_echo "$ac_cs_usage"; exit ;; |
1620 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
1621 | | -silent | --silent | --silen | --sile | --sil | --si | --s) |
1622 | ac_cs_silent=: ;; |
1623 | |
1624 | # This is an error. |
1625 | - -*) as_fn_error "unrecognized option: \`$1' |
1626 | + -*) as_fn_error $? "unrecognized option: \`$1' |
1627 | Try \`$0 --help' for more information." ;; |
1628 | |
1629 | *) as_fn_append ac_config_targets " $1" |
1630 | @@ -22924,7 +22981,6 @@ |
1631 | for ac_config_target in $ac_config_targets |
1632 | do |
1633 | case $ac_config_target in |
1634 | - "include/spud_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/spud_config.h" ;; |
1635 | "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |
1636 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
1637 | "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;; |
1638 | @@ -22935,7 +22991,7 @@ |
1639 | "diamond/diamond/plugins.py") CONFIG_FILES="$CONFIG_FILES diamond/diamond/plugins.py" ;; |
1640 | "diamond/diamond/preprocess.py") CONFIG_FILES="$CONFIG_FILES diamond/diamond/preprocess.py" ;; |
1641 | |
1642 | - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
1643 | + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; |
1644 | esac |
1645 | done |
1646 | |
1647 | @@ -22946,7 +23002,6 @@ |
1648 | # bizarre bug on SunOS 4.1.3. |
1649 | if $ac_need_defaults; then |
1650 | test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files |
1651 | - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers |
1652 | test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands |
1653 | fi |
1654 | |
1655 | @@ -22973,7 +23028,7 @@ |
1656 | { |
1657 | tmp=./conf$$-$RANDOM |
1658 | (umask 077 && mkdir "$tmp") |
1659 | -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 |
1660 | +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
1661 | |
1662 | # Set up the scripts for CONFIG_FILES section. |
1663 | # No need to generate them if there are no CONFIG_FILES. |
1664 | @@ -22990,7 +23045,7 @@ |
1665 | fi |
1666 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
1667 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
1668 | - ac_cs_awk_cr='\r' |
1669 | + ac_cs_awk_cr='\\r' |
1670 | else |
1671 | ac_cs_awk_cr=$ac_cr |
1672 | fi |
1673 | @@ -23004,18 +23059,18 @@ |
1674 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && |
1675 | echo "_ACEOF" |
1676 | } >conf$$subs.sh || |
1677 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
1678 | -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` |
1679 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1680 | +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` |
1681 | ac_delim='%!_!# ' |
1682 | for ac_last_try in false false false false false :; do |
1683 | . ./conf$$subs.sh || |
1684 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
1685 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1686 | |
1687 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
1688 | if test $ac_delim_n = $ac_delim_num; then |
1689 | break |
1690 | elif $ac_last_try; then |
1691 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
1692 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1693 | else |
1694 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
1695 | fi |
1696 | @@ -23037,7 +23092,7 @@ |
1697 | t delim |
1698 | :nl |
1699 | h |
1700 | -s/\(.\{148\}\).*/\1/ |
1701 | +s/\(.\{148\}\)..*/\1/ |
1702 | t more1 |
1703 | s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ |
1704 | p |
1705 | @@ -23051,7 +23106,7 @@ |
1706 | t nl |
1707 | :delim |
1708 | h |
1709 | -s/\(.\{148\}\).*/\1/ |
1710 | +s/\(.\{148\}\)..*/\1/ |
1711 | t more2 |
1712 | s/["\\]/\\&/g; s/^/"/; s/$/"/ |
1713 | p |
1714 | @@ -23104,20 +23159,28 @@ |
1715 | else |
1716 | cat |
1717 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
1718 | - || as_fn_error "could not setup config files machinery" "$LINENO" 5 |
1719 | + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
1720 | _ACEOF |
1721 | |
1722 | -# VPATH may cause trouble with some makes, so we remove $(srcdir), |
1723 | -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and |
1724 | +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), |
1725 | +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and |
1726 | # trailing colons and then remove the whole line if VPATH becomes empty |
1727 | # (actually we leave an empty line to preserve line numbers). |
1728 | if test "x$srcdir" = x.; then |
1729 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ |
1730 | -s/:*\$(srcdir):*/:/ |
1731 | -s/:*\${srcdir}:*/:/ |
1732 | -s/:*@srcdir@:*/:/ |
1733 | -s/^\([^=]*=[ ]*\):*/\1/ |
1734 | + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ |
1735 | +h |
1736 | +s/// |
1737 | +s/^/:/ |
1738 | +s/[ ]*$/:/ |
1739 | +s/:\$(srcdir):/:/g |
1740 | +s/:\${srcdir}:/:/g |
1741 | +s/:@srcdir@:/:/g |
1742 | +s/^:*// |
1743 | s/:*$// |
1744 | +x |
1745 | +s/\(=[ ]*\).*/\1/ |
1746 | +G |
1747 | +s/\n// |
1748 | s/^[^=]*=[ ]*$// |
1749 | }' |
1750 | fi |
1751 | @@ -23125,116 +23188,8 @@ |
1752 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
1753 | fi # test -n "$CONFIG_FILES" |
1754 | |
1755 | -# Set up the scripts for CONFIG_HEADERS section. |
1756 | -# No need to generate them if there are no CONFIG_HEADERS. |
1757 | -# This happens for instance with `./config.status Makefile'. |
1758 | -if test -n "$CONFIG_HEADERS"; then |
1759 | -cat >"$tmp/defines.awk" <<\_ACAWK || |
1760 | -BEGIN { |
1761 | -_ACEOF |
1762 | - |
1763 | -# Transform confdefs.h into an awk script `defines.awk', embedded as |
1764 | -# here-document in config.status, that substitutes the proper values into |
1765 | -# config.h.in to produce config.h. |
1766 | - |
1767 | -# Create a delimiter string that does not exist in confdefs.h, to ease |
1768 | -# handling of long lines. |
1769 | -ac_delim='%!_!# ' |
1770 | -for ac_last_try in false false :; do |
1771 | - ac_t=`sed -n "/$ac_delim/p" confdefs.h` |
1772 | - if test -z "$ac_t"; then |
1773 | - break |
1774 | - elif $ac_last_try; then |
1775 | - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 |
1776 | - else |
1777 | - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
1778 | - fi |
1779 | -done |
1780 | - |
1781 | -# For the awk script, D is an array of macro values keyed by name, |
1782 | -# likewise P contains macro parameters if any. Preserve backslash |
1783 | -# newline sequences. |
1784 | - |
1785 | -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* |
1786 | -sed -n ' |
1787 | -s/.\{148\}/&'"$ac_delim"'/g |
1788 | -t rset |
1789 | -:rset |
1790 | -s/^[ ]*#[ ]*define[ ][ ]*/ / |
1791 | -t def |
1792 | -d |
1793 | -:def |
1794 | -s/\\$// |
1795 | -t bsnl |
1796 | -s/["\\]/\\&/g |
1797 | -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ |
1798 | -D["\1"]=" \3"/p |
1799 | -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p |
1800 | -d |
1801 | -:bsnl |
1802 | -s/["\\]/\\&/g |
1803 | -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ |
1804 | -D["\1"]=" \3\\\\\\n"\\/p |
1805 | -t cont |
1806 | -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p |
1807 | -t cont |
1808 | -d |
1809 | -:cont |
1810 | -n |
1811 | -s/.\{148\}/&'"$ac_delim"'/g |
1812 | -t clear |
1813 | -:clear |
1814 | -s/\\$// |
1815 | -t bsnlc |
1816 | -s/["\\]/\\&/g; s/^/"/; s/$/"/p |
1817 | -d |
1818 | -:bsnlc |
1819 | -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p |
1820 | -b cont |
1821 | -' <confdefs.h | sed ' |
1822 | -s/'"$ac_delim"'/"\\\ |
1823 | -"/g' >>$CONFIG_STATUS || ac_write_fail=1 |
1824 | - |
1825 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1826 | - for (key in D) D_is_set[key] = 1 |
1827 | - FS = "" |
1828 | -} |
1829 | -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { |
1830 | - line = \$ 0 |
1831 | - split(line, arg, " ") |
1832 | - if (arg[1] == "#") { |
1833 | - defundef = arg[2] |
1834 | - mac1 = arg[3] |
1835 | - } else { |
1836 | - defundef = substr(arg[1], 2) |
1837 | - mac1 = arg[2] |
1838 | - } |
1839 | - split(mac1, mac2, "(") #) |
1840 | - macro = mac2[1] |
1841 | - prefix = substr(line, 1, index(line, defundef) - 1) |
1842 | - if (D_is_set[macro]) { |
1843 | - # Preserve the white space surrounding the "#". |
1844 | - print prefix "define", macro P[macro] D[macro] |
1845 | - next |
1846 | - } else { |
1847 | - # Replace #undef with comments. This is necessary, for example, |
1848 | - # in the case of _POSIX_SOURCE, which is predefined and required |
1849 | - # on some systems where configure will not decide to define it. |
1850 | - if (defundef == "undef") { |
1851 | - print "/*", prefix defundef, macro, "*/" |
1852 | - next |
1853 | - } |
1854 | - } |
1855 | -} |
1856 | -{ print } |
1857 | -_ACAWK |
1858 | -_ACEOF |
1859 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
1860 | - as_fn_error "could not setup config headers machinery" "$LINENO" 5 |
1861 | -fi # test -n "$CONFIG_HEADERS" |
1862 | - |
1863 | - |
1864 | -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" |
1865 | + |
1866 | +eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" |
1867 | shift |
1868 | for ac_tag |
1869 | do |
1870 | @@ -23243,7 +23198,7 @@ |
1871 | esac |
1872 | case $ac_mode$ac_tag in |
1873 | :[FHL]*:*);; |
1874 | - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; |
1875 | + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; |
1876 | :[FH]-) ac_tag=-:-;; |
1877 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
1878 | esac |
1879 | @@ -23271,7 +23226,7 @@ |
1880 | [\\/$]*) false;; |
1881 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
1882 | esac || |
1883 | - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; |
1884 | + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; |
1885 | esac |
1886 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
1887 | as_fn_append ac_file_inputs " '$ac_f'" |
1888 | @@ -23298,7 +23253,7 @@ |
1889 | |
1890 | case $ac_tag in |
1891 | *:-:* | *:-) cat >"$tmp/stdin" \ |
1892 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; |
1893 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
1894 | esac |
1895 | ;; |
1896 | esac |
1897 | @@ -23429,47 +23384,24 @@ |
1898 | $ac_datarootdir_hack |
1899 | " |
1900 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
1901 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1902 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1903 | |
1904 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
1905 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
1906 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
1907 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
1908 | -which seems to be undefined. Please make sure it is defined." >&5 |
1909 | +which seems to be undefined. Please make sure it is defined" >&5 |
1910 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
1911 | -which seems to be undefined. Please make sure it is defined." >&2;} |
1912 | +which seems to be undefined. Please make sure it is defined" >&2;} |
1913 | |
1914 | rm -f "$tmp/stdin" |
1915 | case $ac_file in |
1916 | -) cat "$tmp/out" && rm -f "$tmp/out";; |
1917 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
1918 | esac \ |
1919 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1920 | - ;; |
1921 | - :H) |
1922 | - # |
1923 | - # CONFIG_HEADER |
1924 | - # |
1925 | - if test x"$ac_file" != x-; then |
1926 | - { |
1927 | - $as_echo "/* $configure_input */" \ |
1928 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
1929 | - } >"$tmp/config.h" \ |
1930 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1931 | - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
1932 | - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
1933 | -$as_echo "$as_me: $ac_file is unchanged" >&6;} |
1934 | - else |
1935 | - rm -f "$ac_file" |
1936 | - mv "$tmp/config.h" "$ac_file" \ |
1937 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1938 | - fi |
1939 | - else |
1940 | - $as_echo "/* $configure_input */" \ |
1941 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
1942 | - || as_fn_error "could not create -" "$LINENO" 5 |
1943 | - fi |
1944 | - ;; |
1945 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1946 | + ;; |
1947 | + |
1948 | |
1949 | :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 |
1950 | $as_echo "$as_me: executing $ac_file commands" >&6;} |
1951 | @@ -24596,7 +24528,7 @@ |
1952 | ac_clean_files=$ac_clean_files_save |
1953 | |
1954 | test $ac_write_fail = 0 || |
1955 | - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
1956 | + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
1957 | |
1958 | |
1959 | # configure is writing to config.log, and then calls config.status. |
1960 | @@ -24617,7 +24549,7 @@ |
1961 | exec 5>>config.log |
1962 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which |
1963 | # would make configure fail if this is the last instruction. |
1964 | - $ac_cs_success || as_fn_exit $? |
1965 | + $ac_cs_success || as_fn_exit 1 |
1966 | fi |
1967 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
1968 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
1969 | |
1970 | === modified file 'configure.in' |
1971 | --- configure.in 2010-01-18 14:19:00 +0000 |
1972 | +++ configure.in 2011-07-11 16:34:27 +0000 |
1973 | @@ -27,7 +27,6 @@ |
1974 | |
1975 | dnl Process this file with autoconf to produce a configure script. |
1976 | AC_INIT(include/spud.h) |
1977 | -AC_CONFIG_HEADERS(include/spud_config.h) |
1978 | |
1979 | LT_INIT |
1980 | LT_LANG([CXX]) |
1981 | |
1982 | === modified file 'doc/spud_manual.pdf' |
1983 | --- doc/spud_manual.pdf 2011-07-08 13:24:24 +0000 |
1984 | +++ doc/spud_manual.pdf 2011-07-11 16:34:27 +0000 |
1985 | @@ -208,7 +208,7 @@ |
1986 | << /S /GoTo /D (subsection.3.5.7) >> |
1987 | endobj |
1988 | 140 0 obj |
1989 | -(number\137of\137children) |
1990 | +(get\137number\137of\137children) |
1991 | endobj |
1992 | 141 0 obj |
1993 | << /S /GoTo /D (subsection.3.5.8) >> |
1994 | @@ -350,8 +350,7 @@ |
1995 | /Filter /FlateDecode |
1996 | >> |
1997 | stream |
1998 | -xÚuŽ» |
1999 | -ÂPûû§LÀlv7Ù<ZA…€•Û‰E ˜&ˆÍ-ò÷&ÞR¬æ43 |
2000 | Æ |
2001 | Æ%ð |
2002 | =”gí -©X |
2003 | BU·ÝÂTHXàîÙí |
2004 | §¼PãLˆI-íëøŠã’?|H¡ÞL÷HmTU |
2005 | о!ÞZ߯—5yÝ!QYd·n�<| YW'Þ |
2006 | +xÚ3PHW0Ppç2ÀA;…pé»Y(šëšš(„¤)™é™* ±ž¡�¡BHŠB´FpAiЦ®‘©�PPÏ ÂôMÌ+MÌÑŒ |
2007 | ñ‚˜a¨gijj2ÃØBÏÀÄXA×ÒLÏÀÐ |
2008 | b„WiN%ÔC |
2009 | ÃÈÀФ |
2010 | ÃY®!\ YÎ'Ñ |
2011 | endstream |
2012 | endobj |
2013 | 230 0 obj << |
2014 | @@ -634,15 +633,17 @@ |
2015 | /ProcSet [ /PDF /Text ] |
2016 | >> endobj |
2017 | 306 0 obj << |
2018 | -/Length 1305 |
2019 | +/Length 1313 |
2020 | /Filter /FlateDecode |
2021 | >> |
2022 | stream |
2023 | -xÚíšMsÛ6†ïú8Ê!ÀØ®Í×43M§±nNŒÄØšJ”*QIýï»ü°-‰°b‹t/–M“ |
2024 | ’ï£Ýw(q-”x?øm<xõ¼ÐJ´%#¼²2㩸ڋ/ã¯Þ™°{¢-ÑŽSžóúÏ�ã·Ç—Å©UÇWR)QÿpN¬¯ÅÁ‘Oï702^I€À¿(IÎWá�tÒ\Œ4(5œÌÓd]Žóv<øg y(%´Ð|뤽 ²Ò“Åàê‹Sþç |
2025 | Í/~”§.„‘@Å�ÏÅåà¯Ø[Ð.ðãë2˜ú |
2026 | –«|¶Ì6{O(®FÝP^Œ |
2027 | ßÙ¯õaCxÖïE[°CMÏBŒPKoi/Áâ ¶`¾L¦1ýYAÌ�fíÚéÏC˱ |
2028 | s Gõ7„¿¦þ'Ó |
2029 | ü·§&®ÆàÇz–§1‚TÄÚ’Áºv |
2030 | Hc©ŒEw÷ðdùJþRy€“o-?=È�µü×i |
2031 | ßz¾œ‹€\ÇBË$ÀyÈè2?gu“›Ù<–|¨¨›Ð͸ÄÅÝþ¸Y²HÄ9<sâ:CͳÔì |
2032 | ¹†jزíâk3 |
2033 | T0¼)-3-uwRk]ÆŽU%›o‘A=›!g»Ô{‰@ûƒ–�¯/´¦YÃî„p>>'Ê—?�¯ ¤�àåk¼ª’Q�ì³%(lYÊ83(c)UçÓÉr›åM…©74qõÍiêkå]SþPË“|Oã |
2034 | MPF ƶ¥øJr‰*Cê]sø”pæö ) œâf@ª¢=„@« |
2035 | äç9Àíí&p,§]uùíªé,|ßÓü4„3�ÖOƒ ¼´è»�€cÖör�d7 ЮWÿ… ž�.&È ø˜‚Úömn’f*zù“T[ùw[m*ù�6¶.h;il‹XDxÔ |
2036 | :×ÂÿܩΓXpF¢�Luj[±�L£3� -;BGFRËöÏq�ËE ußrFI ÂÞ>‘} |
2037 | - Ä}8DHp ›xV ¶œXFëÛ¢P\ ËXÀL |
2038 | a�‰éÕI€ˆe| |
2039 | - |
2040 | †$´^ÿªYàXjý+6 |
2041 | ÒÛÍÀÞI�´?p’çëÙ×mÞð&Ï�¼Î ó$)–o¨blšÎÓèò |
2042 | -÷±Ä©Æñ…¡í2¢TËX´¿ÌvøœÞ˜¾ü<ª?œ2A… |Àb�”BÅŽ… |
2043 | ƒR’Z¯®™rŶˆå, |
2044 | wý"ûËPÀùVÇzÑPQ0Y®nc”k |
2045 | ·�ÖC¹DÕvnÒ*WÆ:ê@Qé~…=¼l7œo6¤PÏL®Ö³,�C€œ½m±NÛvŠ!ÊXj¿i,´{êÝçã ˜v`±iÛÝ�¥U±ë Å·înçaßÌ’Å2›în‰/÷ún3¸êß§lÿ²ÎJÔÛ>¬ÔÅðN |
2046 | Ï6y2Ÿ'±Á—ö½iuÄ=?‡¨C½ Öëõ2û¬\oוd#àƒÅ‘yÚÜI§{q^B |
2047 | pòÐè±@åWªX}¼œÜ¤‹¤¡¢é'~ŸW|[|qèA¨uù´Í²Yv]}e¢i—E |
2048 | -¡ï€ŠW�]ä¬û-Æon³d1›T¯þ{2ŸM£' õ¯½Û°Å&&»o6\m6þ˜m&)Wû,]n7•ùr9oîÁ`t²íÐ( |
2049 | |
2050 | ̸¹{Óq¹ÚNGw“n»ó Á÷“Ý•6:±´é†n÷µíßU’ß4|"¹^¡…:øä&ñ?qÓÛr |
2051 | +xÚíšËvÛ6†÷z |
2052 | +,å…` Ì Û&qNsNÓÓX;' |
2053 | Fbl�J¤ªKR¿}‡_$Š,Ò]ØÜX6-Hþgþ Ä•PâÃà·ñàÍ9x¡• |
2054 | *h1þ. |
2055 | J |
2056 | Fxee(ÆSq9´g_Çßœ›ðð‹´Do8Nù�·~¿ÿ4¾(¾:Pu|%•õçÄêJì |
2057 | ùü¡q#ã•ü‹’ä|ÞH'ÍÙHƒRÃÉ<MVå8ïǃš‡RB |
2058 | Í—NÚ |
2059 | "+!1Y |
2060 | .¿*1å~äÑLðâgùÕ…0¨¸ò¹¸ü{ |
2061 | +Ú¾}]ÆS_C¾ÜÌòl½s‡ârÐ |
2062 | åÙÈñ•½¬Â“NØ{.Ú‚ |
2063 | jz2b„ZzkÅH{ ï°5 ó<™Æôgd1šµk§?m,ÇrÌ |
2064 | Ôß¾LýO¦; |
2065 | øoOM |
2066 | \�ÁÏÕl“Æ8RkgHëÚq€ �¥2Ý^Ã# |
2067 | � |
2068 | ¯Uò#ò€? N¾µüt/?Öò_¥›ˆøÖóé\tà:Z&ÎCF—±ø>«+˜\Ïæ±äCEÝ„nÆ%.>èvÇÍ’EÚ Îá+'®3Ô<KÍÞ¡‘kè(Ø”–Ö™n`ãXÀ±*Ñ·‹oiÌê%QC7#½w»çß›ƒ[B |
2069 | ÝÜ-(’VíÝmùjδ¦Yuò/™ê&Çæ4޵ |
2070 | +ü@#ÞÉ× WÅ+‚: (ØÑKPزhòka Œ¥T�¹'ù6Û4¬s Þ:=ª8AbøenÈjù¯“i¼u |
2071 | +ÊÄÂB·_I.†e(BýÐ1íß%¼r«|„o:6ªh ÷!ÐêŒùu°E#m»É |
2072 | ËiW]ÃæfÙô0¾ïž~• @u˜ ´>ðÒ¢ïŽXÙU’ýÝ€@»^ýÿ8]LÅA7ð1µÕ[_'ÍT4ôò?ŸüZhm*ùv5.h;éjŠXDxÐ |
2073 | z…ÿ©“ª O`Á‰>Òh[±�L£sª -;BGFRÛ—»i.E¨»63Jö†ð9I ÉÖ;B‚«HXdz±uà¬À2Zß…â]Æfò |
2074 | LL¯þ‘,À), 3Ë |
2075 | +x |
2076 | |
2077 | †$´^i«YàXjw¥-2°é‚íf`ï¤GÚ |
2078 | 8ÙlV³oÛMÛ|}äu™'I±|CcÓtžFr¸�%N5ŽO |
2079 | mô¥rXƢݽýûôÆôåçQýÍ)óTèÀW ,òè¤*v,l”’Ôz |
2080 | Ï”kÃE,gñ°ûè—óŸ‡Î·:Ö‹†Š‚I¾¼‰9P®5Ü>ZåbXÛ¹I«\ë E¥ûµüð |
2081 | |
2082 | °Ýp¾Ù�B=3¹\ͲM |
2083 | äìm‹á¶ë] |
2084 | A€PÆR»�HcIßSï>»àÍ9›¶‡{½´*öW¡AàöÃÝn7ãã<ì»Y²È³éîà–øt¯o·��«þ}ÊF3ë¬D½·ÁÄJ] |
2085 | ïÔð÷l½Iæó$– øÔ¾7í Ž¸§çµ¯Ôz½Í³/JÁÕvUI6>X |
2086 | ™§Í={ºç9Ä'÷� |
2087 | |
2088 | T¾RÅêãÅä:]$ |
2089 | 5M?ñû´âÛâÅ¡{] Öåó6ËfÙUõÊDÓ.‹Bß� |
2090 | »ÈYw›™ßÝdÉb6© |
2091 | ý�d>›F |
2092 | N@ê{[·a‹�Kv×l¸Úlü1[OR®öYšoו›<Ÿ7wû‚ |
2093 | 0:Ùvh”÷fÜÜ�é¸Xn§£ÛI·‡ó Á÷“Ý•6:±´é†nwµíße²¹nøDr½B |
2094 | |
2095 | +µ÷ÉMâi‰ò |
2096 | |
2097 | endstream |
2098 | endobj |
2099 | 305 0 obj << |
2100 | @@ -685,7 +686,7 @@ |
2101 | /Type /Annot |
2102 | /Subtype /Link |
2103 | /Border[0 0 0]/H/I/C[1 0 0] |
2104 | -/Rect [97.151 700.083 229.517 710.197] |
2105 | +/Rect [97.151 697.181 248.291 710.197] |
2106 | /A << /S /GoTo /D (subsection.3.5.7) >> |
2107 | >> endobj |
2108 | 282 0 obj << |
2109 | @@ -1607,18 +1608,12 @@ |
2110 | /ProcSet [ /PDF /Text ] |
2111 | >> endobj |
2112 | 473 0 obj << |
2113 | -/Length 1879 |
2114 | +/Length 1489 |
2115 | /Filter /FlateDecode |
2116 | >> |
2117 | stream |
2118 | -xÚÍXYoã8~ϯðÛ:è¶Z$uö[&ãôdg�ƒ�AÀØ´-´,•cýV±HYRÔY§{€Ý«X¼êüªh²™ø“O'?-N>\ðdÂ|/õS6Y¬'aäE©˜$~à¥i4Y¬&ÿš²èô¯Å??\ˆ´»RD‘‡¤O‹Î9»^ÌoNg<ô§Â;�…‘?ýíò§Ûë߯í'¾½Î‰'Œyir<gæš ß‹Ã„ŽžðØéŒù¾?½(+]É‚„è‹ëOf<òÎi×YžŸÎÓr�_>Õ[E |
2119 | w†ì«S–LË¥Z5†R5–5Í?*wެçr§VD.Ë¢Ö²Ðvɺ¬ˆ¯*:¾rËVîü?ýÐ'[x¾?±?a8©6“çæÓ‰1BFè˜p³ÂV’•ÔÒÊù¼‡Ë`Z†Áþ %Ë|ÏÕ|üjt°$»Ñ@K¹¯›\j4 |
2120 | r²‚¾h6ãµ îz�¡—Ä¡ |
2121 | �z߬zW |
2122 | B¥ïmž é¶íÊU“+Ïh;cqàÅI DâñÀî—rr |
2123 | -?ž¢�ühJÞitVX>ÑMUÔ´ÂÄ Lt= lôä{ 93 |
2124 | -"ëV°\o3{ }áÆå6S&`€û�I·P§Üë¬,dNF |
2125 | -YWÙÀç^‰ÖHZê㌔z!omKŽÚ4;Uhkª@p�%I?>.×c2 é |
2126 | övÐO�Û†ÆÀ`(J |
2127 | D�ÚôS5ˆd£ g¤�›Žá‘�†§‰R£K |
2128 | So |
2129 | $ôƒ‹û±§Ýî®>ßÍon>ß |
2130 | %}{ CéA¢NÙtÕÆ·“øI- |
2131 | 3àOâ<fyN" |
Looks good. This is certainly a cleaner way to do it.
Aside: the main reason why the C interface takes pointers to /everything/, even when it is very unCish, is because Fortran used to only be able to pass over pointers. Now that we have the value keyword, do you think it is worth cleaning up the C api?
The other thing: how heavily have you tested this? Have you ran fluidity's test suite with this version of libspud? I know from bitter experience that it is very easy to make a mistake while writing F2003 iso_c_binding interfaces by hand -- and these mistakes show up as mysterious stack smashes later on.