Root/octave/patches/010-configure.patch

1Index: octave-3.2.4/aclocal.m4
2===================================================================
3--- octave-3.2.4.orig/aclocal.m4 2011-01-02 13:17:05.000000000 +0100
4+++ octave-3.2.4/aclocal.m4 2011-01-02 13:25:56.000000000 +0100
5@@ -109,7 +109,8 @@
6 struct tm t;
7 char *q = strptime ("09/13", "%m/%d/%y", &t);
8 return q ? 1 : 0;
9-]])], [octave_cv_strptime_broken=no], [octave_cv_strptime_broken=yes])])
10+]])], [octave_cv_strptime_broken=no], [octave_cv_strptime_broken=yes],
11+[octave_cv_strptime_broken=yes])])
12 if test $octave_cv_strptime_broken = yes; then
13 AC_DEFINE(OCTAVE_HAVE_BROKEN_STRPTIME, 1, [Define if strptime is broken on your system])
14 fi
15@@ -1386,7 +1387,8 @@
16 ]])],
17 [AC_MSG_RESULT([yes])
18  AC_DEFINE(HAVE_FAST_INT_OPS,1,[Define if signed integers use two's complement])],
19-[AC_MSG_RESULT([no])])
20+[AC_MSG_RESULT([no])],
21+[AC_MSG_RESULT([guessing no])])
22 AC_LANG_POP(C++)])
23 dnl
24 dnl Check to see if the compiler and the linker can handle the flags
25Index: octave-3.2.4/configure
26===================================================================
27--- octave-3.2.4.orig/configure 2011-01-02 13:17:12.000000000 +0100
28+++ octave-3.2.4/configure 2011-01-02 13:26:05.000000000 +0100
29@@ -1,12 +1,14 @@
30 #! /bin/sh
31 # From configure.in Revision: 1.603 .
32 # Guess values for system-dependent variables and create Makefiles.
33-# Generated by GNU Autoconf 2.64.
34+# Generated by GNU Autoconf 2.67.
35+#
36 #
37 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
38-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
39+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
40 # Foundation, Inc.
41 #
42+#
43 # This configure script is free software; the Free Software Foundation
44 # gives unlimited permission to copy, distribute and modify it.
45 ## -------------------- ##
46@@ -315,7 +317,7 @@
47       test -d "$as_dir" && break
48     done
49     test -z "$as_dirs" || eval "mkdir $as_dirs"
50- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
51+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
52 
53 
54 } # as_fn_mkdir_p
55@@ -355,19 +357,19 @@
56 fi # as_fn_arith
57 
58 
59-# as_fn_error ERROR [LINENO LOG_FD]
60-# ---------------------------------
61+# as_fn_error STATUS ERROR [LINENO LOG_FD]
62+# ----------------------------------------
63 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
64 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
65-# script with status $?, using 1 if that was 0.
66+# script with STATUS, using 1 if that was 0.
67 as_fn_error ()
68 {
69- as_status=$?; test $as_status -eq 0 && as_status=1
70- if test "$3"; then
71- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
72- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
73+ as_status=$1; test $as_status -eq 0 && as_status=1
74+ if test "$4"; then
75+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
76+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
77   fi
78- $as_echo "$as_me: error: $1" >&2
79+ $as_echo "$as_me: error: $2" >&2
80   as_fn_exit $as_status
81 } # as_fn_error
82 
83@@ -525,10 +527,11 @@
84 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
85 
86 
87-exec 7<&0 </dev/null 6>&1
88+test -n "$DJDIR" || exec 7<&0 </dev/null
89+exec 6>&1
90 
91 # Name of the host.
92-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
93+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
94 # so uname gets run too.
95 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
96 
97@@ -937,8 +940,9 @@
98   fi
99 
100   case $ac_option in
101- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
102- *) ac_optarg=yes ;;
103+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
104+ *=) ac_optarg= ;;
105+ *) ac_optarg=yes ;;
106   esac
107 
108   # Accept the important Cygnus configure options, so we can diagnose typos.
109@@ -983,7 +987,7 @@
110     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
111     # Reject names that are not valid shell variable names.
112     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
113- as_fn_error "invalid feature name: $ac_useropt"
114+ as_fn_error $? "invalid feature name: $ac_useropt"
115     ac_useropt_orig=$ac_useropt
116     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
117     case $ac_user_opts in
118@@ -1009,7 +1013,7 @@
119     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
120     # Reject names that are not valid shell variable names.
121     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
122- as_fn_error "invalid feature name: $ac_useropt"
123+ as_fn_error $? "invalid feature name: $ac_useropt"
124     ac_useropt_orig=$ac_useropt
125     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
126     case $ac_user_opts in
127@@ -1213,7 +1217,7 @@
128     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
129     # Reject names that are not valid shell variable names.
130     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
131- as_fn_error "invalid package name: $ac_useropt"
132+ as_fn_error $? "invalid package name: $ac_useropt"
133     ac_useropt_orig=$ac_useropt
134     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
135     case $ac_user_opts in
136@@ -1229,7 +1233,7 @@
137     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
138     # Reject names that are not valid shell variable names.
139     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
140- as_fn_error "invalid package name: $ac_useropt"
141+ as_fn_error $? "invalid package name: $ac_useropt"
142     ac_useropt_orig=$ac_useropt
143     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
144     case $ac_user_opts in
145@@ -1259,8 +1263,8 @@
146   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
147     x_libraries=$ac_optarg ;;
148 
149- -*) as_fn_error "unrecognized option: \`$ac_option'
150-Try \`$0 --help' for more information."
151+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
152+Try \`$0 --help' for more information"
153     ;;
154 
155   *=*)
156@@ -1268,7 +1272,7 @@
157     # Reject names that are not valid shell variable names.
158     case $ac_envvar in #(
159       '' | [0-9]* | *[!_$as_cr_alnum]* )
160- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
161+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
162     esac
163     eval $ac_envvar=\$ac_optarg
164     export $ac_envvar ;;
165@@ -1286,13 +1290,13 @@
166 
167 if test -n "$ac_prev"; then
168   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
169- as_fn_error "missing argument to $ac_option"
170+ as_fn_error $? "missing argument to $ac_option"
171 fi
172 
173 if test -n "$ac_unrecognized_opts"; then
174   case $enable_option_checking in
175     no) ;;
176- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
177+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
178     *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
179   esac
180 fi
181@@ -1315,7 +1319,7 @@
182     [\\/$]* | ?:[\\/]* ) continue;;
183     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
184   esac
185- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
186+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
187 done
188 
189 # There might be people who depend on the old broken behavior: `$host'
190@@ -1329,8 +1333,8 @@
191 if test "x$host_alias" != x; then
192   if test "x$build_alias" = x; then
193     cross_compiling=maybe
194- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
195- If a cross compiler is detected then cross compile mode will be used." >&2
196+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
197+ If a cross compiler is detected then cross compile mode will be used" >&2
198   elif test "x$build_alias" != "x$host_alias"; then
199     cross_compiling=yes
200   fi
201@@ -1345,9 +1349,9 @@
202 ac_pwd=`pwd` && test -n "$ac_pwd" &&
203 ac_ls_di=`ls -di .` &&
204 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
205- as_fn_error "working directory cannot be determined"
206+ as_fn_error $? "working directory cannot be determined"
207 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
208- as_fn_error "pwd does not report name of working directory"
209+ as_fn_error $? "pwd does not report name of working directory"
210 
211 
212 # Find the source files, if location was not specified.
213@@ -1386,11 +1390,11 @@
214 fi
215 if test ! -r "$srcdir/$ac_unique_file"; then
216   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
217- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
218+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
219 fi
220 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
221 ac_abs_confdir=`(
222- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
223+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
224     pwd)`
225 # When building in place, set srcdir=.
226 if test "$ac_abs_confdir" = "$ac_pwd"; then
227@@ -1430,7 +1434,7 @@
228       --help=short display options specific to this package
229       --help=recursive display the short help of all the included packages
230   -V, --version display version information and exit
231- -q, --quiet, --silent do not print \`checking...' messages
232+ -q, --quiet, --silent do not print \`checking ...' messages
233       --cache-file=FILE cache test results in FILE [disabled]
234   -C, --config-cache alias for \`--cache-file=config.cache'
235   -n, --no-create do not create output files
236@@ -1549,7 +1553,7 @@
237   LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
238               nonstandard directory <lib dir>
239   LIBS libraries to pass to the linker, e.g. -l<library>
240- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
241+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
242               you have headers in a nonstandard directory <include dir>
243   CPP C preprocessor
244   CXX C++ compiler command
245@@ -1641,9 +1645,9 @@
246 if $ac_init_version; then
247   cat <<\_ACEOF
248 configure
249-generated by GNU Autoconf 2.64
250+generated by GNU Autoconf 2.67
251 
252-Copyright (C) 2009 Free Software Foundation, Inc.
253+Copyright (C) 2010 Free Software Foundation, Inc.
254 This configure script is free software; the Free Software Foundation
255 gives unlimited permission to copy, distribute and modify it.
256 _ACEOF
257@@ -1688,7 +1692,7 @@
258     ac_retval=1
259 fi
260   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
261- return $ac_retval
262+ as_fn_set_status $ac_retval
263 
264 } # ac_fn_c_try_compile
265 
266@@ -1713,7 +1717,7 @@
267     mv -f conftest.er1 conftest.err
268   fi
269   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
270- test $ac_status = 0; } >/dev/null && {
271+ test $ac_status = 0; } > conftest.i && {
272      test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
273      test ! -s conftest.err
274        }; then :
275@@ -1725,7 +1729,7 @@
276     ac_retval=1
277 fi
278   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
279- return $ac_retval
280+ as_fn_set_status $ac_retval
281 
282 } # ac_fn_c_try_cpp
283 
284@@ -1737,10 +1741,10 @@
285 ac_fn_c_check_header_mongrel ()
286 {
287   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
288- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
289+ if eval "test \"\${$3+set}\"" = set; then :
290   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
291 $as_echo_n "checking for $2... " >&6; }
292-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
293+if eval "test \"\${$3+set}\"" = set; then :
294   $as_echo_n "(cached) " >&6
295 fi
296 eval ac_res=\$$3
297@@ -1776,7 +1780,7 @@
298 else
299   ac_header_preproc=no
300 fi
301-rm -f conftest.err conftest.$ac_ext
302+rm -f conftest.err conftest.i conftest.$ac_ext
303 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
304 $as_echo "$ac_header_preproc" >&6; }
305 
306@@ -1803,7 +1807,7 @@
307 esac
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   eval "$3=\$ac_header_compiler"
315@@ -1854,7 +1858,7 @@
316 fi
317   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
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_c_try_run
323 
324@@ -1867,7 +1871,7 @@
325   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
326   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
327 $as_echo_n "checking for $2... " >&6; }
328-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
329+if eval "test \"\${$3+set}\"" = set; then :
330   $as_echo_n "(cached) " >&6
331 else
332   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
333@@ -2063,7 +2067,7 @@
334 
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_c_compute_int
341 
342@@ -2101,7 +2105,7 @@
343     ac_retval=1
344 fi
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_compile
350 
351@@ -2126,7 +2130,7 @@
352     mv -f conftest.er1 conftest.err
353   fi
354   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
355- test $ac_status = 0; } >/dev/null && {
356+ test $ac_status = 0; } > conftest.i && {
357      test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
358      test ! -s conftest.err
359        }; then :
360@@ -2138,7 +2142,7 @@
361     ac_retval=1
362 fi
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_cxx_try_cpp
368 
369@@ -2184,7 +2188,7 @@
370   # left behind by Apple's compiler. We do this before executing the actions.
371   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
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_cxx_try_link
377 
378@@ -2230,7 +2234,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_c_try_link
386 
387@@ -2242,7 +2246,7 @@
388   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
389   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
390 $as_echo_n "checking for $2... " >&6; }
391-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
392+if eval "test \"\${$3+set}\"" = set; then :
393   $as_echo_n "(cached) " >&6
394 else
395   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
396@@ -2309,10 +2313,10 @@
397 ac_fn_cxx_check_header_mongrel ()
398 {
399   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
400- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
401+ if eval "test \"\${$3+set}\"" = set; then :
402   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
403 $as_echo_n "checking for $2... " >&6; }
404-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
405+if eval "test \"\${$3+set}\"" = set; then :
406   $as_echo_n "(cached) " >&6
407 fi
408 eval ac_res=\$$3
409@@ -2348,7 +2352,7 @@
410 else
411   ac_header_preproc=no
412 fi
413-rm -f conftest.err conftest.$ac_ext
414+rm -f conftest.err conftest.i conftest.$ac_ext
415 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
416 $as_echo "$ac_header_preproc" >&6; }
417 
418@@ -2375,7 +2379,7 @@
419 esac
420   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
421 $as_echo_n "checking for $2... " >&6; }
422-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
423+if eval "test \"\${$3+set}\"" = set; then :
424   $as_echo_n "(cached) " >&6
425 else
426   eval "$3=\$ac_header_compiler"
427@@ -2422,7 +2426,7 @@
428     ac_retval=1
429 fi
430   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
431- return $ac_retval
432+ as_fn_set_status $ac_retval
433 
434 } # ac_fn_f77_try_compile
435 
436@@ -2468,7 +2472,7 @@
437   # left behind by Apple's compiler. We do this before executing the actions.
438   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
439   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
440- return $ac_retval
441+ as_fn_set_status $ac_retval
442 
443 } # ac_fn_f77_try_link
444 
445@@ -2510,7 +2514,7 @@
446 fi
447   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
448   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
449- return $ac_retval
450+ as_fn_set_status $ac_retval
451 
452 } # ac_fn_f77_try_run
453 
454@@ -2523,7 +2527,7 @@
455   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
456   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
457 $as_echo_n "checking for $2... " >&6; }
458-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
459+if eval "test \"\${$3+set}\"" = set; then :
460   $as_echo_n "(cached) " >&6
461 else
462   eval "$3=no"
463@@ -2622,19 +2626,22 @@
464 fi
465   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
466   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
467- return $ac_retval
468+ as_fn_set_status $ac_retval
469 
470 } # ac_fn_cxx_try_run
471 
472-# ac_fn_cxx_check_decl LINENO SYMBOL VAR
473-# --------------------------------------
474-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
475+# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES
476+# -----------------------------------------------
477+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
478+# accordingly.
479 ac_fn_cxx_check_decl ()
480 {
481   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
482- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
483-$as_echo_n "checking whether $2 is declared... " >&6; }
484-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
485+ as_decl_name=`echo $2|sed 's/ *(.*//'`
486+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
487+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
488+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
489+if eval "test \"\${$3+set}\"" = set; then :
490   $as_echo_n "(cached) " >&6
491 else
492   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
493@@ -2651,8 +2658,12 @@
494 int
495 main ()
496 {
497-#ifndef $2
498- (void) $2;
499+#ifndef $as_decl_name
500+#ifdef __cplusplus
501+ (void) $as_decl_use;
502+#else
503+ (void) $as_decl_name;
504+#endif
505 #endif
506 
507   ;
508@@ -2681,7 +2692,7 @@
509   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
510   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
511 $as_echo_n "checking for $2... " >&6; }
512-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
513+if eval "test \"\${$3+set}\"" = set; then :
514   $as_echo_n "(cached) " >&6
515 else
516   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
517@@ -2748,15 +2759,18 @@
518 
519 } # ac_fn_cxx_check_func
520 
521-# ac_fn_c_check_decl LINENO SYMBOL VAR
522-# ------------------------------------
523-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
524+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
525+# ---------------------------------------------
526+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
527+# accordingly.
528 ac_fn_c_check_decl ()
529 {
530   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
531- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
532-$as_echo_n "checking whether $2 is declared... " >&6; }
533-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
534+ as_decl_name=`echo $2|sed 's/ *(.*//'`
535+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
536+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
537+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
538+if eval "test \"\${$3+set}\"" = set; then :
539   $as_echo_n "(cached) " >&6
540 else
541   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
542@@ -2773,8 +2787,12 @@
543 int
544 main ()
545 {
546-#ifndef $2
547- (void) $2;
548+#ifndef $as_decl_name
549+#ifdef __cplusplus
550+ (void) $as_decl_use;
551+#else
552+ (void) $as_decl_name;
553+#endif
554 #endif
555 
556   ;
557@@ -2804,7 +2822,7 @@
558   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
559   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
560 $as_echo_n "checking for $2.$3... " >&6; }
561-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
562+if eval "test \"\${$4+set}\"" = set; then :
563   $as_echo_n "(cached) " >&6
564 else
565   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
566@@ -2872,7 +2890,7 @@
567 running configure, to aid debugging if configure makes a mistake.
568 
569 It was created by $as_me, which was
570-generated by GNU Autoconf 2.64. Invocation command line was
571+generated by GNU Autoconf 2.67. Invocation command line was
572 
573   $ $0 $@
574 
575@@ -2982,11 +3000,9 @@
576   {
577     echo
578 
579- cat <<\_ASBOX
580-## ---------------- ##
581+ $as_echo "## ---------------- ##
582 ## Cache variables. ##
583-## ---------------- ##
584-_ASBOX
585+## ---------------- ##"
586     echo
587     # The following way of writing the cache mishandles newlines in values,
588 (
589@@ -3020,11 +3036,9 @@
590 )
591     echo
592 
593- cat <<\_ASBOX
594-## ----------------- ##
595+ $as_echo "## ----------------- ##
596 ## Output variables. ##
597-## ----------------- ##
598-_ASBOX
599+## ----------------- ##"
600     echo
601     for ac_var in $ac_subst_vars
602     do
603@@ -3037,11 +3051,9 @@
604     echo
605 
606     if test -n "$ac_subst_files"; then
607- cat <<\_ASBOX
608-## ------------------- ##
609+ $as_echo "## ------------------- ##
610 ## File substitutions. ##
611-## ------------------- ##
612-_ASBOX
613+## ------------------- ##"
614       echo
615       for ac_var in $ac_subst_files
616       do
617@@ -3055,11 +3067,9 @@
618     fi
619 
620     if test -s confdefs.h; then
621- cat <<\_ASBOX
622-## ----------- ##
623+ $as_echo "## ----------- ##
624 ## confdefs.h. ##
625-## ----------- ##
626-_ASBOX
627+## ----------- ##"
628       echo
629       cat confdefs.h
630       echo
631@@ -3114,7 +3124,12 @@
632 ac_site_file1=NONE
633 ac_site_file2=NONE
634 if test -n "$CONFIG_SITE"; then
635- ac_site_file1=$CONFIG_SITE
636+ # We do not want a PATH search for config.site.
637+ case $CONFIG_SITE in #((
638+ -*) ac_site_file1=./$CONFIG_SITE;;
639+ */*) ac_site_file1=$CONFIG_SITE;;
640+ *) ac_site_file1=./$CONFIG_SITE;;
641+ esac
642 elif test "x$prefix" != xNONE; then
643   ac_site_file1=$prefix/share/config.site
644   ac_site_file2=$prefix/etc/config.site
645@@ -3125,18 +3140,22 @@
646 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
647 do
648   test "x$ac_site_file" = xNONE && continue
649- if test -r "$ac_site_file"; then
650+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
651     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
652 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
653     sed 's/^/| /' "$ac_site_file" >&5
654- . "$ac_site_file"
655+ . "$ac_site_file" \
656+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
657+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
658+as_fn_error $? "failed to load site script $ac_site_file
659+See \`config.log' for more details" "$LINENO" 5 ; }
660   fi
661 done
662 
663 if test -r "$cache_file"; then
664- # Some versions of bash will fail to source /dev/null (special
665- # files actually), so we avoid doing that.
666- if test -f "$cache_file"; then
667+ # Some versions of bash will fail to source /dev/null (special files
668+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
669+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
670     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
671 $as_echo "$as_me: loading cache $cache_file" >&6;}
672     case $cache_file in
673@@ -3205,7 +3224,7 @@
674 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
675   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
676 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
677- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
678+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
679 fi
680 ## -------------------- ##
681 ## Main body of script. ##
682@@ -3226,16 +3245,22 @@
683 
684 ac_aux_dir=
685 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
686- for ac_t in install-sh install.sh shtool; do
687- if test -f "$ac_dir/$ac_t"; then
688- ac_aux_dir=$ac_dir
689- ac_install_sh="$ac_aux_dir/$ac_t -c"
690- break 2
691- fi
692- done
693+ if test -f "$ac_dir/install-sh"; then
694+ ac_aux_dir=$ac_dir
695+ ac_install_sh="$ac_aux_dir/install-sh -c"
696+ break
697+ elif test -f "$ac_dir/install.sh"; then
698+ ac_aux_dir=$ac_dir
699+ ac_install_sh="$ac_aux_dir/install.sh -c"
700+ break
701+ elif test -f "$ac_dir/shtool"; then
702+ ac_aux_dir=$ac_dir
703+ ac_install_sh="$ac_aux_dir/shtool install -c"
704+ break
705+ fi
706 done
707 if test -z "$ac_aux_dir"; then
708- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
709+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
710 fi
711 
712 # These three variables are undocumented and unsupported,
713@@ -3249,7 +3274,7 @@
714 
715 # Make sure we can run config.sub.
716 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
717- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
718+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
719 
720 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
721 $as_echo_n "checking build system type... " >&6; }
722@@ -3260,16 +3285,16 @@
723 test "x$ac_build_alias" = x &&
724   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
725 test "x$ac_build_alias" = x &&
726- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
727+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
728 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
729- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
730+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
731 
732 fi
733 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
734 $as_echo "$ac_cv_build" >&6; }
735 case $ac_cv_build in
736 *-*-*) ;;
737-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
738+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
739 esac
740 build=$ac_cv_build
741 ac_save_IFS=$IFS; IFS='-'
742@@ -3294,7 +3319,7 @@
743   ac_cv_host=$ac_cv_build
744 else
745   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
746- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
747+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
748 fi
749 
750 fi
751@@ -3302,7 +3327,7 @@
752 $as_echo "$ac_cv_host" >&6; }
753 case $ac_cv_host in
754 *-*-*) ;;
755-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
756+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
757 esac
758 host=$ac_cv_host
759 ac_save_IFS=$IFS; IFS='-'
760@@ -3651,8 +3676,8 @@
761 
762 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
763 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
764-as_fn_error "no acceptable C compiler found in \$PATH
765-See \`config.log' for more details." "$LINENO" 5; }
766+as_fn_error $? "no acceptable C compiler found in \$PATH
767+See \`config.log' for more details" "$LINENO" 5 ; }
768 
769 # Provide some information about the compiler.
770 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
771@@ -3673,32 +3698,30 @@
772 ... rest of stderr output deleted ...
773          10q' conftest.err >conftest.er1
774     cat conftest.er1 >&5
775- rm -f conftest.er1 conftest.err
776   fi
777+ rm -f conftest.er1 conftest.err
778   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
779   test $ac_status = 0; }
780 done
781 
782 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
783 /* end confdefs.h. */
784-#include <stdio.h>
785+
786 int
787 main ()
788 {
789-FILE *f = fopen ("conftest.out", "w");
790- return ferror (f) || fclose (f) != 0;
791 
792   ;
793   return 0;
794 }
795 _ACEOF
796 ac_clean_files_save=$ac_clean_files
797-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
798+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
799 # Try to create an executable without -o first, disregard a.out.
800 # It will help us diagnose broken compilers, and finding out an intuition
801 # of exeext.
802-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
803-$as_echo_n "checking for C compiler default output file name... " >&6; }
804+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
805+$as_echo_n "checking whether the C compiler works... " >&6; }
806 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
807 
808 # The possible output files:
809@@ -3760,62 +3783,28 @@
810 else
811   ac_file=''
812 fi
813-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
814-$as_echo "$ac_file" >&6; }
815 if test -z "$ac_file"; then :
816- $as_echo "$as_me: failed program was:" >&5
817+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
818+$as_echo "no" >&6; }
819+$as_echo "$as_me: failed program was:" >&5
820 sed 's/^/| /' conftest.$ac_ext >&5
821 
822 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
823 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
824-{ as_fn_set_status 77
825-as_fn_error "C compiler cannot create executables
826-See \`config.log' for more details." "$LINENO" 5; }; }
827+as_fn_error 77 "C compiler cannot create executables
828+See \`config.log' for more details" "$LINENO" 5 ; }
829+else
830+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
831+$as_echo "yes" >&6; }
832 fi
833+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
834+$as_echo_n "checking for C compiler default output file name... " >&6; }
835+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
836+$as_echo "$ac_file" >&6; }
837 ac_exeext=$ac_cv_exeext
838 
839-# Check that the compiler produces executables we can run. If not, either
840-# the compiler is broken, or we cross compile.
841-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
842-$as_echo_n "checking whether the C compiler works... " >&6; }
843-# If not cross compiling, check that we can run a simple program.
844-if test "$cross_compiling" != yes; then
845- if { ac_try='./$ac_file'
846- { { case "(($ac_try" in
847- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
848- *) ac_try_echo=$ac_try;;
849-esac
850-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
851-$as_echo "$ac_try_echo"; } >&5
852- (eval "$ac_try") 2>&5
853- ac_status=$?
854- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
855- test $ac_status = 0; }; }; then
856- cross_compiling=no
857- else
858- if test "$cross_compiling" = maybe; then
859- cross_compiling=yes
860- else
861- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
862-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
863-as_fn_error "cannot run C compiled programs.
864-If you meant to cross compile, use \`--host'.
865-See \`config.log' for more details." "$LINENO" 5; }
866- fi
867- fi
868-fi
869-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
870-$as_echo "yes" >&6; }
871-
872-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
873+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
874 ac_clean_files=$ac_clean_files_save
875-# Check that the compiler produces executables we can run. If not, either
876-# the compiler is broken, or we cross compile.
877-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
878-$as_echo_n "checking whether we are cross compiling... " >&6; }
879-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
880-$as_echo "$cross_compiling" >&6; }
881-
882 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
883 $as_echo_n "checking for suffix of executables... " >&6; }
884 if { { ac_try="$ac_link"
885@@ -3845,16 +3834,75 @@
886 else
887   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
888 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
889-as_fn_error "cannot compute suffix of executables: cannot compile and link
890-See \`config.log' for more details." "$LINENO" 5; }
891+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
892+See \`config.log' for more details" "$LINENO" 5 ; }
893 fi
894-rm -f conftest$ac_cv_exeext
895+rm -f conftest conftest$ac_cv_exeext
896 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
897 $as_echo "$ac_cv_exeext" >&6; }
898 
899 rm -f conftest.$ac_ext
900 EXEEXT=$ac_cv_exeext
901 ac_exeext=$EXEEXT
902+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
903+/* end confdefs.h. */
904+#include <stdio.h>
905+int
906+main ()
907+{
908+FILE *f = fopen ("conftest.out", "w");
909+ return ferror (f) || fclose (f) != 0;
910+
911+ ;
912+ return 0;
913+}
914+_ACEOF
915+ac_clean_files="$ac_clean_files conftest.out"
916+# Check that the compiler produces executables we can run. If not, either
917+# the compiler is broken, or we cross compile.
918+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
919+$as_echo_n "checking whether we are cross compiling... " >&6; }
920+if test "$cross_compiling" != yes; then
921+ { { ac_try="$ac_link"
922+case "(($ac_try" in
923+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
924+ *) ac_try_echo=$ac_try;;
925+esac
926+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
927+$as_echo "$ac_try_echo"; } >&5
928+ (eval "$ac_link") 2>&5
929+ ac_status=$?
930+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
931+ test $ac_status = 0; }
932+ if { ac_try='./conftest$ac_cv_exeext'
933+ { { case "(($ac_try" in
934+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
935+ *) ac_try_echo=$ac_try;;
936+esac
937+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
938+$as_echo "$ac_try_echo"; } >&5
939+ (eval "$ac_try") 2>&5
940+ ac_status=$?
941+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
942+ test $ac_status = 0; }; }; then
943+ cross_compiling=no
944+ else
945+ if test "$cross_compiling" = maybe; then
946+ cross_compiling=yes
947+ else
948+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
949+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
950+as_fn_error $? "cannot run C compiled programs.
951+If you meant to cross compile, use \`--host'.
952+See \`config.log' for more details" "$LINENO" 5 ; }
953+ fi
954+ fi
955+fi
956+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
957+$as_echo "$cross_compiling" >&6; }
958+
959+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
960+ac_clean_files=$ac_clean_files_save
961 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
962 $as_echo_n "checking for suffix of object files... " >&6; }
963 if test "${ac_cv_objext+set}" = set; then :
964@@ -3897,8 +3945,8 @@
965 
966 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
967 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
968-as_fn_error "cannot compute suffix of object files: cannot compile
969-See \`config.log' for more details." "$LINENO" 5; }
970+as_fn_error $? "cannot compute suffix of object files: cannot compile
971+See \`config.log' for more details" "$LINENO" 5 ; }
972 fi
973 rm -f conftest.$ac_cv_objext conftest.$ac_ext
974 fi
975@@ -4161,7 +4209,7 @@
976   # Broken: fails on valid input.
977 continue
978 fi
979-rm -f conftest.err conftest.$ac_ext
980+rm -f conftest.err conftest.i conftest.$ac_ext
981 
982   # OK, works on sane cases. Now check whether nonexistent headers
983   # can be detected and how.
984@@ -4177,11 +4225,11 @@
985 ac_preproc_ok=:
986 break
987 fi
988-rm -f conftest.err conftest.$ac_ext
989+rm -f conftest.err conftest.i conftest.$ac_ext
990 
991 done
992 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
993-rm -f conftest.err conftest.$ac_ext
994+rm -f conftest.i conftest.err conftest.$ac_ext
995 if $ac_preproc_ok; then :
996   break
997 fi
998@@ -4220,7 +4268,7 @@
999   # Broken: fails on valid input.
1000 continue
1001 fi
1002-rm -f conftest.err conftest.$ac_ext
1003+rm -f conftest.err conftest.i conftest.$ac_ext
1004 
1005   # OK, works on sane cases. Now check whether nonexistent headers
1006   # can be detected and how.
1007@@ -4236,18 +4284,18 @@
1008 ac_preproc_ok=:
1009 break
1010 fi
1011-rm -f conftest.err conftest.$ac_ext
1012+rm -f conftest.err conftest.i conftest.$ac_ext
1013 
1014 done
1015 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1016-rm -f conftest.err conftest.$ac_ext
1017+rm -f conftest.i conftest.err conftest.$ac_ext
1018 if $ac_preproc_ok; then :
1019 
1020 else
1021   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1022 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1023-as_fn_error "C preprocessor \"$CPP\" fails sanity check
1024-See \`config.log' for more details." "$LINENO" 5; }
1025+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1026+See \`config.log' for more details" "$LINENO" 5 ; }
1027 fi
1028 
1029 ac_ext=c
1030@@ -4308,7 +4356,7 @@
1031   done
1032 IFS=$as_save_IFS
1033   if test -z "$ac_cv_path_GREP"; then
1034- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1035+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1036   fi
1037 else
1038   ac_cv_path_GREP=$GREP
1039@@ -4374,7 +4422,7 @@
1040   done
1041 IFS=$as_save_IFS
1042   if test -z "$ac_cv_path_EGREP"; then
1043- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1044+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1045   fi
1046 else
1047   ac_cv_path_EGREP=$EGREP
1048@@ -4506,8 +4554,7 @@
1049   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1050 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
1051 "
1052-eval as_val=\$$as_ac_Header
1053- if test "x$as_val" = x""yes; then :
1054+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1055   cat >>confdefs.h <<_ACEOF
1056 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1057 _ACEOF
1058@@ -4596,7 +4643,7 @@
1059       esac
1060     ;;
1061   no)
1062- as_fn_error "You are required to define a path separation character" "$LINENO" 5
1063+ as_fn_error $? "You are required to define a path separation character" "$LINENO" 5
1064     ;;
1065   *)
1066     sepchar=$with_sepchar
1067@@ -4743,9 +4790,8 @@
1068   if test "$ac_cv_type_void_p" = yes; then
1069      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1070 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1071-{ as_fn_set_status 77
1072-as_fn_error "cannot compute sizeof (void *)
1073-See \`config.log' for more details." "$LINENO" 5; }; }
1074+as_fn_error 77 "cannot compute sizeof (void *)
1075+See \`config.log' for more details" "$LINENO" 5 ; }
1076    else
1077      ac_cv_sizeof_void_p=0
1078    fi
1079@@ -4777,9 +4823,8 @@
1080   if test "$ac_cv_type_int" = yes; then
1081      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1082 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1083-{ as_fn_set_status 77
1084-as_fn_error "cannot compute sizeof (int)
1085-See \`config.log' for more details." "$LINENO" 5; }; }
1086+as_fn_error 77 "cannot compute sizeof (int)
1087+See \`config.log' for more details" "$LINENO" 5 ; }
1088    else
1089      ac_cv_sizeof_int=0
1090    fi
1091@@ -4811,9 +4856,8 @@
1092   if test "$ac_cv_type_long" = yes; then
1093      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1094 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1095-{ as_fn_set_status 77
1096-as_fn_error "cannot compute sizeof (long)
1097-See \`config.log' for more details." "$LINENO" 5; }; }
1098+as_fn_error 77 "cannot compute sizeof (long)
1099+See \`config.log' for more details" "$LINENO" 5 ; }
1100    else
1101      ac_cv_sizeof_long=0
1102    fi
1103@@ -5001,8 +5045,8 @@
1104 ... rest of stderr output deleted ...
1105          10q' conftest.err >conftest.er1
1106     cat conftest.er1 >&5
1107- rm -f conftest.er1 conftest.err
1108   fi
1109+ rm -f conftest.er1 conftest.err
1110   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1111   test $ac_status = 0; }
1112 done
1113@@ -5166,7 +5210,7 @@
1114   # Broken: fails on valid input.
1115 continue
1116 fi
1117-rm -f conftest.err conftest.$ac_ext
1118+rm -f conftest.err conftest.i conftest.$ac_ext
1119 
1120   # OK, works on sane cases. Now check whether nonexistent headers
1121   # can be detected and how.
1122@@ -5182,11 +5226,11 @@
1123 ac_preproc_ok=:
1124 break
1125 fi
1126-rm -f conftest.err conftest.$ac_ext
1127+rm -f conftest.err conftest.i conftest.$ac_ext
1128 
1129 done
1130 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1131-rm -f conftest.err conftest.$ac_ext
1132+rm -f conftest.i conftest.err conftest.$ac_ext
1133 if $ac_preproc_ok; then :
1134   break
1135 fi
1136@@ -5225,7 +5269,7 @@
1137   # Broken: fails on valid input.
1138 continue
1139 fi
1140-rm -f conftest.err conftest.$ac_ext
1141+rm -f conftest.err conftest.i conftest.$ac_ext
1142 
1143   # OK, works on sane cases. Now check whether nonexistent headers
1144   # can be detected and how.
1145@@ -5241,18 +5285,18 @@
1146 ac_preproc_ok=:
1147 break
1148 fi
1149-rm -f conftest.err conftest.$ac_ext
1150+rm -f conftest.err conftest.i conftest.$ac_ext
1151 
1152 done
1153 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1154-rm -f conftest.err conftest.$ac_ext
1155+rm -f conftest.i conftest.err conftest.$ac_ext
1156 if $ac_preproc_ok; then :
1157 
1158 else
1159   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1160 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1161-as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
1162-See \`config.log' for more details." "$LINENO" 5; }
1163+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
1164+See \`config.log' for more details" "$LINENO" 5 ; }
1165 fi
1166 
1167 ac_ext=c
1168@@ -5269,7 +5313,7 @@
1169 
1170 case "$gxx_version" in
1171   1.* | 2.[0123456789].* | 3.[01234].*)
1172- as_fn_error "g++ version $gxx_version will probably fail to compile Octave
1173+ as_fn_error $? "g++ version $gxx_version will probably fail to compile Octave
1174 " "$LINENO" 5
1175   ;;
1176 esac
1177@@ -5760,8 +5804,8 @@
1178 
1179 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1180 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1181-as_fn_error "no acceptable C compiler found in \$PATH
1182-See \`config.log' for more details." "$LINENO" 5; }
1183+as_fn_error $? "no acceptable C compiler found in \$PATH
1184+See \`config.log' for more details" "$LINENO" 5 ; }
1185 
1186 # Provide some information about the compiler.
1187 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
1188@@ -5782,8 +5826,8 @@
1189 ... rest of stderr output deleted ...
1190          10q' conftest.err >conftest.er1
1191     cat conftest.er1 >&5
1192- rm -f conftest.er1 conftest.err
1193   fi
1194+ rm -f conftest.er1 conftest.err
1195   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1196   test $ac_status = 0; }
1197 done
1198@@ -6042,7 +6086,7 @@
1199   # Broken: fails on valid input.
1200 continue
1201 fi
1202-rm -f conftest.err conftest.$ac_ext
1203+rm -f conftest.err conftest.i conftest.$ac_ext
1204 
1205   # OK, works on sane cases. Now check whether nonexistent headers
1206   # can be detected and how.
1207@@ -6058,11 +6102,11 @@
1208 ac_preproc_ok=:
1209 break
1210 fi
1211-rm -f conftest.err conftest.$ac_ext
1212+rm -f conftest.err conftest.i conftest.$ac_ext
1213 
1214 done
1215 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1216-rm -f conftest.err conftest.$ac_ext
1217+rm -f conftest.i conftest.err conftest.$ac_ext
1218 if $ac_preproc_ok; then :
1219   break
1220 fi
1221@@ -6101,7 +6145,7 @@
1222   # Broken: fails on valid input.
1223 continue
1224 fi
1225-rm -f conftest.err conftest.$ac_ext
1226+rm -f conftest.err conftest.i conftest.$ac_ext
1227 
1228   # OK, works on sane cases. Now check whether nonexistent headers
1229   # can be detected and how.
1230@@ -6117,18 +6161,18 @@
1231 ac_preproc_ok=:
1232 break
1233 fi
1234-rm -f conftest.err conftest.$ac_ext
1235+rm -f conftest.err conftest.i conftest.$ac_ext
1236 
1237 done
1238 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1239-rm -f conftest.err conftest.$ac_ext
1240+rm -f conftest.i conftest.err conftest.$ac_ext
1241 if $ac_preproc_ok; then :
1242 
1243 else
1244   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1245 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1246-as_fn_error "C preprocessor \"$CPP\" fails sanity check
1247-See \`config.log' for more details." "$LINENO" 5; }
1248+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1249+See \`config.log' for more details" "$LINENO" 5 ; }
1250 fi
1251 
1252 ac_ext=c
1253@@ -6670,7 +6714,7 @@
1254   have_x=disabled
1255 else
1256   case $x_includes,$x_libraries in #(
1257- *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
1258+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
1259     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
1260   $as_echo_n "(cached) " >&6
1261 else
1262@@ -6688,7 +6732,7 @@
1263     @echo libdir='${LIBDIR}'
1264 _ACEOF
1265   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
1266- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
1267+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
1268     for ac_var in incroot usrlibdir libdir; do
1269       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
1270     done
1271@@ -6774,7 +6818,7 @@
1272   fi
1273 done
1274 fi
1275-rm -f conftest.err conftest.$ac_ext
1276+rm -f conftest.err conftest.i conftest.$ac_ext
1277 fi # $ac_x_includes = no
1278 
1279 if test "$ac_x_libraries" = no; then
1280@@ -7045,7 +7089,7 @@
1281   ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'`
1282   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mieee-fp" >&5
1283 $as_echo_n "checking whether ${CC-cc} accepts -mieee-fp... " >&6; }
1284- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1285+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
1286   $as_echo_n "(cached) " >&6
1287 else
1288 
1289@@ -7110,7 +7154,7 @@
1290   ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'`
1291   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mieee-fp" >&5
1292 $as_echo_n "checking whether ${CXX-g++} accepts -mieee-fp... " >&6; }
1293- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1294+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
1295   $as_echo_n "(cached) " >&6
1296 else
1297 
1298@@ -7177,7 +7221,7 @@
1299   ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'`
1300   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mieee" >&5
1301 $as_echo_n "checking whether ${CC-cc} accepts -mieee... " >&6; }
1302- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1303+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
1304   $as_echo_n "(cached) " >&6
1305 else
1306 
1307@@ -7236,7 +7280,7 @@
1308   ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'`
1309   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -ieee" >&5
1310 $as_echo_n "checking whether ${CC-cc} accepts -ieee... " >&6; }
1311- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1312+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
1313   $as_echo_n "(cached) " >&6
1314 else
1315 
1316@@ -7296,7 +7340,7 @@
1317   ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'`
1318   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mieee" >&5
1319 $as_echo_n "checking whether ${CXX-g++} accepts -mieee... " >&6; }
1320- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1321+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
1322   $as_echo_n "(cached) " >&6
1323 else
1324 
1325@@ -7355,7 +7399,7 @@
1326   ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'`
1327   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -ieee" >&5
1328 $as_echo_n "checking whether ${CXX-g++} accepts -ieee... " >&6; }
1329- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1330+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
1331   $as_echo_n "(cached) " >&6
1332 else
1333 
1334@@ -7416,7 +7460,7 @@
1335   ac_safe=`echo "-mminimal-toc" | sed 'y%./+-:=%__p___%'`
1336   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mminimal-toc" >&5
1337 $as_echo_n "checking whether ${CC-cc} accepts -mminimal-toc... " >&6; }
1338- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1339+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
1340   $as_echo_n "(cached) " >&6
1341 else
1342 
1343@@ -7472,7 +7516,7 @@
1344   ac_safe=`echo "-mminimal-toc" | sed 'y%./+-:=%__p___%'`
1345   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mminimal-toc" >&5
1346 $as_echo_n "checking whether ${CXX-g++} accepts -mminimal-toc... " >&6; }
1347- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1348+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
1349   $as_echo_n "(cached) " >&6
1350 else
1351 
1352@@ -8064,7 +8108,7 @@
1353   as_ac_Lib=`$as_echo "ac_cv_lib_$zlib_lib''_gzclearerr" | $as_tr_sh`
1354 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzclearerr in -l$zlib_lib" >&5
1355 $as_echo_n "checking for gzclearerr in -l$zlib_lib... " >&6; }
1356-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1357+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1358   $as_echo_n "(cached) " >&6
1359 else
1360   ac_check_lib_save_LIBS=$LIBS
1361@@ -8099,8 +8143,7 @@
1362 eval ac_res=\$$as_ac_Lib
1363            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1364 $as_echo "$ac_res" >&6; }
1365-eval as_val=\$$as_ac_Lib
1366- if test "x$as_val" = x""yes; then :
1367+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1368 
1369       for ac_header in zlib.h
1370 do :
1371@@ -8150,7 +8193,7 @@
1372     as_ac_Lib=`$as_echo "ac_cv_lib_$hdf5_lib''_H5Pcreate" | $as_tr_sh`
1373 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Pcreate in -l$hdf5_lib" >&5
1374 $as_echo_n "checking for H5Pcreate in -l$hdf5_lib... " >&6; }
1375-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1376+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1377   $as_echo_n "(cached) " >&6
1378 else
1379   ac_check_lib_save_LIBS=$LIBS
1380@@ -8185,8 +8228,7 @@
1381 eval ac_res=\$$as_ac_Lib
1382            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1383 $as_echo "$ac_res" >&6; }
1384-eval as_val=\$$as_ac_Lib
1385- if test "x$as_val" = x""yes; then :
1386+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1387 
1388       for ac_header in hdf5.h
1389 do :
1390@@ -8202,7 +8244,7 @@
1391     as_ac_Lib=`$as_echo "ac_cv_lib_$hdf5_lib''_H5Gget_num_objs" | $as_tr_sh`
1392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Gget_num_objs in -l$hdf5_lib" >&5
1393 $as_echo_n "checking for H5Gget_num_objs in -l$hdf5_lib... " >&6; }
1394-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1395+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1396   $as_echo_n "(cached) " >&6
1397 else
1398   ac_check_lib_save_LIBS=$LIBS
1399@@ -8237,8 +8279,7 @@
1400 eval ac_res=\$$as_ac_Lib
1401            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1402 $as_echo "$ac_res" >&6; }
1403-eval as_val=\$$as_ac_Lib
1404- if test "x$as_val" = x""yes; then :
1405+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1406 
1407 
1408   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HDF5 library has required API" >&5
1409@@ -8514,8 +8555,7 @@
1410 do :
1411   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1412 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1413-eval as_val=\$$as_ac_Header
1414- if test "x$as_val" = x""yes; then :
1415+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1416   cat >>confdefs.h <<_ACEOF
1417 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1418 _ACEOF
1419@@ -8523,7 +8563,7 @@
1420     as_ac_Lib=`$as_echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
1421 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glp_lpx_simplex in -l$glpk_lib" >&5
1422 $as_echo_n "checking for glp_lpx_simplex in -l$glpk_lib... " >&6; }
1423-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1424+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1425   $as_echo_n "(cached) " >&6
1426 else
1427   ac_check_lib_save_LIBS=$LIBS
1428@@ -8558,8 +8598,7 @@
1429 eval ac_res=\$$as_ac_Lib
1430            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1431 $as_echo "$ac_res" >&6; }
1432-eval as_val=\$$as_ac_Lib
1433- if test "x$as_val" = x""yes; then :
1434+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1435 
1436       GLPK_LIBS="-l$glpk_lib"
1437 
1438@@ -8570,7 +8609,7 @@
1439         as_ac_Lib=`$as_echo "ac_cv_lib_$glpk_lib''__glp_lpx_simplex" | $as_tr_sh`
1440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _glp_lpx_simplex in -l$glpk_lib" >&5
1441 $as_echo_n "checking for _glp_lpx_simplex in -l$glpk_lib... " >&6; }
1442-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1443+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1444   $as_echo_n "(cached) " >&6
1445 else
1446   ac_check_lib_save_LIBS=$LIBS
1447@@ -8605,8 +8644,7 @@
1448 eval ac_res=\$$as_ac_Lib
1449            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1450 $as_echo "$ac_res" >&6; }
1451-eval as_val=\$$as_ac_Lib
1452- if test "x$as_val" = x""yes; then :
1453+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1454 
1455           GLPK_LIBS="-l$glpk_lib"
1456 fi
1457@@ -8655,7 +8693,7 @@
1458   as_ac_Lib=`$as_echo "ac_cv_lib_$curl_lib''_curl_easy_escape" | $as_tr_sh`
1459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_escape in -l$curl_lib" >&5
1460 $as_echo_n "checking for curl_easy_escape in -l$curl_lib... " >&6; }
1461-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1462+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1463   $as_echo_n "(cached) " >&6
1464 else
1465   ac_check_lib_save_LIBS=$LIBS
1466@@ -8690,8 +8728,7 @@
1467 eval ac_res=\$$as_ac_Lib
1468            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1469 $as_echo "$ac_res" >&6; }
1470-eval as_val=\$$as_ac_Lib
1471- if test "x$as_val" = x""yes; then :
1472+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1473 
1474     for ac_header in curl/curl.h
1475 do :
1476@@ -8936,8 +8973,7 @@
1477 #endif
1478 
1479 "
1480-eval as_val=\$$as_ac_Header
1481- if test "x$as_val" = x""yes; then :
1482+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1483   cat >>confdefs.h <<_ACEOF
1484 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1485 _ACEOF
1486@@ -8951,8 +8987,7 @@
1487 #endif
1488 
1489 "
1490-eval as_val=\$$as_ac_Header
1491- if test "x$as_val" = x""yes; then :
1492+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1493   cat >>confdefs.h <<_ACEOF
1494 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1495 _ACEOF
1496@@ -9324,8 +9359,7 @@
1497 do :
1498   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1499 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1500-eval as_val=\$$as_ac_Header
1501- if test "x$as_val" = x""yes; then :
1502+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1503   cat >>confdefs.h <<_ACEOF
1504 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1505 _ACEOF
1506@@ -9336,8 +9370,7 @@
1507 do :
1508   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1509 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1510-eval as_val=\$$as_ac_Header
1511- if test "x$as_val" = x""yes; then :
1512+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1513   cat >>confdefs.h <<_ACEOF
1514 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1515 _ACEOF
1516@@ -9699,7 +9732,7 @@
1517 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1518 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
1519 if test -n "$ac_tool_prefix"; then
1520- 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
1521+ 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
1522   do
1523     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1524 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1525@@ -9743,7 +9776,7 @@
1526 fi
1527 if test -z "$F77"; then
1528   ac_ct_F77=$F77
1529- 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
1530+ 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
1531 do
1532   # Extract the first word of "$ac_prog", so it can be a program name with args.
1533 set dummy $ac_prog; ac_word=$2
1534@@ -9818,8 +9851,8 @@
1535 ... rest of stderr output deleted ...
1536          10q' conftest.err >conftest.er1
1537     cat conftest.er1 >&5
1538- rm -f conftest.er1 conftest.err
1539   fi
1540+ rm -f conftest.er1 conftest.err
1541   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1542   test $ac_status = 0; }
1543 done
1544@@ -10122,7 +10155,7 @@
1545       ;;
1546       # Ignore these flags.
1547     -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
1548- |-LANG:=* | -LIST:* | -LNO:*)
1549+ |-LANG:=* | -LIST:* | -LNO:* | -link)
1550       ;;
1551     -lkernel32)
1552       test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
1553@@ -10316,8 +10349,8 @@
1554 else
1555   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1556 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1557-as_fn_error "linking to Fortran libraries from C fails
1558-See \`config.log' for more details." "$LINENO" 5; }
1559+as_fn_error $? "linking to Fortran libraries from C fails
1560+See \`config.log' for more details" "$LINENO" 5 ; }
1561 fi
1562 
1563 ac_ext=c
1564@@ -10478,8 +10511,8 @@
1565 else
1566   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1567 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1568-as_fn_error "cannot compile a simple Fortran program
1569-See \`config.log' for more details." "$LINENO" 5; }
1570+as_fn_error $? "cannot compile a simple Fortran program
1571+See \`config.log' for more details" "$LINENO" 5 ; }
1572 fi
1573 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1574 
1575@@ -10572,7 +10605,7 @@
1576   ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'`
1577   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -mieee-fp" >&5
1578 $as_echo_n "checking whether ${F77-g77} accepts -mieee-fp... " >&6; }
1579- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1580+ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then :
1581   $as_echo_n "(cached) " >&6
1582 else
1583 
1584@@ -10627,7 +10660,7 @@
1585   ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'`
1586   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -mieee" >&5
1587 $as_echo_n "checking whether ${F77-g77} accepts -mieee... " >&6; }
1588- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1589+ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then :
1590   $as_echo_n "(cached) " >&6
1591 else
1592 
1593@@ -10678,7 +10711,7 @@
1594   ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'`
1595   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -ieee" >&5
1596 $as_echo_n "checking whether ${F77-g77} accepts -ieee... " >&6; }
1597- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1598+ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then :
1599   $as_echo_n "(cached) " >&6
1600 else
1601 
1602@@ -10728,7 +10761,7 @@
1603   ac_safe=`echo "-fpe1" | sed 'y%./+-:=%__p___%'`
1604   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -fpe1" >&5
1605 $as_echo_n "checking whether ${F77-g77} accepts -fpe1... " >&6; }
1606- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1607+ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then :
1608   $as_echo_n "(cached) " >&6
1609 else
1610 
1611@@ -10797,7 +10830,7 @@
1612 $as_echo "$as_me: WARNING: Fortran compiler or wrapper script for f2c that functions" >&2;}
1613   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: as a Fortran compiler installed and in your path." >&5
1614 $as_echo "$as_me: WARNING: as a Fortran compiler installed and in your path." >&2;}
1615- as_fn_error "See the file INSTALL for more information." "$LINENO" 5
1616+ as_fn_error $? "See the file INSTALL for more information." "$LINENO" 5
1617 fi
1618 
1619 XTRA_CRUFT_SH_LDFLAGS=
1620@@ -10816,7 +10849,7 @@
1621   ac_safe=`echo "-ffloat-store" | sed 'y%./+-:=%__p___%'`
1622   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -ffloat-store" >&5
1623 $as_echo_n "checking whether ${F77-g77} accepts -ffloat-store... " >&6; }
1624- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
1625+ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then :
1626   $as_echo_n "(cached) " >&6
1627 else
1628 
1629@@ -11117,8 +11150,7 @@
1630     save_LIBS="$LIBS"; LIBS="$LIBS"
1631     as_ac_var=`$as_echo "ac_cv_func_$sgemm" | $as_tr_sh`
1632 ac_fn_c_check_func "$LINENO" "$sgemm" "$as_ac_var"
1633-eval as_val=\$$as_ac_var
1634- if test "x$as_val" = x""yes; then :
1635+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1636   acx_blas_ok=yes
1637 fi
1638 
1639@@ -11175,7 +11207,7 @@
1640   as_ac_Lib=`$as_echo "ac_cv_lib_f77blas_$sgemm" | $as_tr_sh`
1641 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lf77blas" >&5
1642 $as_echo_n "checking for $sgemm in -lf77blas... " >&6; }
1643-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1644+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1645   $as_echo_n "(cached) " >&6
1646 else
1647   ac_check_lib_save_LIBS=$LIBS
1648@@ -11218,8 +11250,7 @@
1649 eval ac_res=\$$as_ac_Lib
1650            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1651 $as_echo "$ac_res" >&6; }
1652-eval as_val=\$$as_ac_Lib
1653- if test "x$as_val" = x""yes; then :
1654+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1655   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5
1656 $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; }
1657 if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then :
1658@@ -11324,7 +11355,7 @@
1659     as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh`
1660 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5
1661 $as_echo_n "checking for $sgemm in -lblas... " >&6; }
1662-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1663+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1664   $as_echo_n "(cached) " >&6
1665 else
1666   ac_check_lib_save_LIBS=$LIBS
1667@@ -11367,12 +11398,11 @@
1668 eval ac_res=\$$as_ac_Lib
1669            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1670 $as_echo "$ac_res" >&6; }
1671-eval as_val=\$$as_ac_Lib
1672- if test "x$as_val" = x""yes; then :
1673+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1674   as_ac_Lib=`$as_echo "ac_cv_lib_dgemm_$dgemm" | $as_tr_sh`
1675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dgemm in -ldgemm" >&5
1676 $as_echo_n "checking for $dgemm in -ldgemm... " >&6; }
1677-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1678+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1679   $as_echo_n "(cached) " >&6
1680 else
1681   ac_check_lib_save_LIBS=$LIBS
1682@@ -11415,12 +11445,11 @@
1683 eval ac_res=\$$as_ac_Lib
1684            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1685 $as_echo "$ac_res" >&6; }
1686-eval as_val=\$$as_ac_Lib
1687- if test "x$as_val" = x""yes; then :
1688+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1689   as_ac_Lib=`$as_echo "ac_cv_lib_sgemm_$sgemm" | $as_tr_sh`
1690 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsgemm" >&5
1691 $as_echo_n "checking for $sgemm in -lsgemm... " >&6; }
1692-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1693+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1694   $as_echo_n "(cached) " >&6
1695 else
1696   ac_check_lib_save_LIBS=$LIBS
1697@@ -11463,8 +11492,7 @@
1698 eval ac_res=\$$as_ac_Lib
1699            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1700 $as_echo "$ac_res" >&6; }
1701-eval as_val=\$$as_ac_Lib
1702- if test "x$as_val" = x""yes; then :
1703+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1704   acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"
1705 fi
1706 
1707@@ -11479,7 +11507,7 @@
1708     as_ac_Lib=`$as_echo "ac_cv_lib_cxml_$sgemm" | $as_tr_sh`
1709 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcxml" >&5
1710 $as_echo_n "checking for $sgemm in -lcxml... " >&6; }
1711-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1712+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1713   $as_echo_n "(cached) " >&6
1714 else
1715   ac_check_lib_save_LIBS=$LIBS
1716@@ -11522,8 +11550,7 @@
1717 eval ac_res=\$$as_ac_Lib
1718            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1719 $as_echo "$ac_res" >&6; }
1720-eval as_val=\$$as_ac_Lib
1721- if test "x$as_val" = x""yes; then :
1722+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1723   acx_blas_ok=yes;BLAS_LIBS="-lcxml"
1724 fi
1725 
1726@@ -11534,7 +11561,7 @@
1727     as_ac_Lib=`$as_echo "ac_cv_lib_dxml_$sgemm" | $as_tr_sh`
1728 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -ldxml" >&5
1729 $as_echo_n "checking for $sgemm in -ldxml... " >&6; }
1730-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1731+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1732   $as_echo_n "(cached) " >&6
1733 else
1734   ac_check_lib_save_LIBS=$LIBS
1735@@ -11577,8 +11604,7 @@
1736 eval ac_res=\$$as_ac_Lib
1737            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1738 $as_echo "$ac_res" >&6; }
1739-eval as_val=\$$as_ac_Lib
1740- if test "x$as_val" = x""yes; then :
1741+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1742   acx_blas_ok=yes;BLAS_LIBS="-ldxml"
1743 fi
1744 
1745@@ -11635,7 +11661,7 @@
1746   as_ac_Lib=`$as_echo "ac_cv_lib_sunperf_$sgemm" | $as_tr_sh`
1747 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsunperf" >&5
1748 $as_echo_n "checking for $sgemm in -lsunperf... " >&6; }
1749-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1750+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1751   $as_echo_n "(cached) " >&6
1752 else
1753   ac_check_lib_save_LIBS=$LIBS
1754@@ -11678,8 +11704,7 @@
1755 eval ac_res=\$$as_ac_Lib
1756            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1757 $as_echo "$ac_res" >&6; }
1758-eval as_val=\$$as_ac_Lib
1759- if test "x$as_val" = x""yes; then :
1760+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1761   BLAS_LIBS="-lsunperf -lsunmath"
1762                                  acx_blas_ok=yes
1763 fi
1764@@ -11694,7 +11719,7 @@
1765     as_ac_Lib=`$as_echo "ac_cv_lib_scs_$sgemm" | $as_tr_sh`
1766 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lscs" >&5
1767 $as_echo_n "checking for $sgemm in -lscs... " >&6; }
1768-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1769+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1770   $as_echo_n "(cached) " >&6
1771 else
1772   ac_check_lib_save_LIBS=$LIBS
1773@@ -11737,8 +11762,7 @@
1774 eval ac_res=\$$as_ac_Lib
1775            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1776 $as_echo "$ac_res" >&6; }
1777-eval as_val=\$$as_ac_Lib
1778- if test "x$as_val" = x""yes; then :
1779+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1780   acx_blas_ok=yes; BLAS_LIBS="-lscs"
1781 fi
1782 
1783@@ -11749,7 +11773,7 @@
1784     as_ac_Lib=`$as_echo "ac_cv_lib_complib.sgimath_$sgemm" | $as_tr_sh`
1785 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcomplib.sgimath" >&5
1786 $as_echo_n "checking for $sgemm in -lcomplib.sgimath... " >&6; }
1787-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1788+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1789   $as_echo_n "(cached) " >&6
1790 else
1791   ac_check_lib_save_LIBS=$LIBS
1792@@ -11792,8 +11816,7 @@
1793 eval ac_res=\$$as_ac_Lib
1794            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1795 $as_echo "$ac_res" >&6; }
1796-eval as_val=\$$as_ac_Lib
1797- if test "x$as_val" = x""yes; then :
1798+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1799   acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"
1800 fi
1801 
1802@@ -11804,7 +11827,7 @@
1803     as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh`
1804 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5
1805 $as_echo_n "checking for $sgemm in -lblas... " >&6; }
1806-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1807+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1808   $as_echo_n "(cached) " >&6
1809 else
1810   ac_check_lib_save_LIBS=$LIBS
1811@@ -11847,12 +11870,11 @@
1812 eval ac_res=\$$as_ac_Lib
1813            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1814 $as_echo "$ac_res" >&6; }
1815-eval as_val=\$$as_ac_Lib
1816- if test "x$as_val" = x""yes; then :
1817+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1818   as_ac_Lib=`$as_echo "ac_cv_lib_essl_$sgemm" | $as_tr_sh`
1819 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lessl" >&5
1820 $as_echo_n "checking for $sgemm in -lessl... " >&6; }
1821-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1822+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1823   $as_echo_n "(cached) " >&6
1824 else
1825   ac_check_lib_save_LIBS=$LIBS
1826@@ -11895,8 +11917,7 @@
1827 eval ac_res=\$$as_ac_Lib
1828            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1829 $as_echo "$ac_res" >&6; }
1830-eval as_val=\$$as_ac_Lib
1831- if test "x$as_val" = x""yes; then :
1832+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1833   acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"
1834 fi
1835 
1836@@ -11909,7 +11930,7 @@
1837     as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh`
1838 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5
1839 $as_echo_n "checking for $sgemm in -lblas... " >&6; }
1840-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1841+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1842   $as_echo_n "(cached) " >&6
1843 else
1844   ac_check_lib_save_LIBS=$LIBS
1845@@ -11952,8 +11973,7 @@
1846 eval ac_res=\$$as_ac_Lib
1847            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1848 $as_echo "$ac_res" >&6; }
1849-eval as_val=\$$as_ac_Lib
1850- if test "x$as_val" = x""yes; then :
1851+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1852   acx_blas_ok=yes; BLAS_LIBS="-lblas"
1853 fi
1854 
1855@@ -11996,8 +12016,8 @@
1856     if test "$cross_compiling" = yes; then :
1857   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1858 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1859-as_fn_error "cannot run test program while cross compiling
1860-See \`config.log' for more details." "$LINENO" 5; }
1861+as_fn_error $? "cannot run test program while cross compiling
1862+See \`config.log' for more details" "$LINENO" 5 ; }
1863 else
1864   cat > conftest.$ac_ext <<_ACEOF
1865       program main
1866@@ -12031,8 +12051,8 @@
1867     if test "$cross_compiling" = yes; then :
1868   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1869 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1870-as_fn_error "cannot run test program while cross compiling
1871-See \`config.log' for more details." "$LINENO" 5; }
1872+as_fn_error $? "cannot run test program while cross compiling
1873+See \`config.log' for more details" "$LINENO" 5 ; }
1874 else
1875   cat > conftest.$ac_ext <<_ACEOF
1876       program main
1877@@ -12064,8 +12084,8 @@
1878     if test "$cross_compiling" = yes; then :
1879   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1880 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1881-as_fn_error "cannot run test program while cross compiling
1882-See \`config.log' for more details." "$LINENO" 5; }
1883+as_fn_error $? "cannot run test program while cross compiling
1884+See \`config.log' for more details" "$LINENO" 5 ; }
1885 else
1886   cat > conftest.$ac_ext <<_ACEOF
1887       program main
1888@@ -12096,8 +12116,8 @@
1889     if test "$cross_compiling" = yes; then :
1890   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1891 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1892-as_fn_error "cannot run test program while cross compiling
1893-See \`config.log' for more details." "$LINENO" 5; }
1894+as_fn_error $? "cannot run test program while cross compiling
1895+See \`config.log' for more details" "$LINENO" 5 ; }
1896 else
1897   cat > conftest.$ac_ext <<_ACEOF
1898       program main
1899@@ -12128,8 +12148,8 @@
1900     if test "$cross_compiling" = yes; then :
1901   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1902 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1903-as_fn_error "cannot run test program while cross compiling
1904-See \`config.log' for more details." "$LINENO" 5; }
1905+as_fn_error $? "cannot run test program while cross compiling
1906+See \`config.log' for more details" "$LINENO" 5 ; }
1907 else
1908   cat > conftest.$ac_ext <<_ACEOF
1909       program main
1910@@ -12160,8 +12180,8 @@
1911     if test "$cross_compiling" = yes; then :
1912   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1913 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1914-as_fn_error "cannot run test program while cross compiling
1915-See \`config.log' for more details." "$LINENO" 5; }
1916+as_fn_error $? "cannot run test program while cross compiling
1917+See \`config.log' for more details" "$LINENO" 5 ; }
1918 else
1919   cat > conftest.$ac_ext <<_ACEOF
1920       program main
1921@@ -12312,8 +12332,7 @@
1922         save_LIBS="$LIBS"; LIBS="$LIBS $BLAS_LIBS $FLIBS"
1923         as_ac_var=`$as_echo "ac_cv_func_$cheev" | $as_tr_sh`
1924 ac_fn_c_check_func "$LINENO" "$cheev" "$as_ac_var"
1925-eval as_val=\$$as_ac_var
1926- if test "x$as_val" = x""yes; then :
1927+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1928   acx_lapack_ok=yes
1929 fi
1930 
1931@@ -12327,7 +12346,7 @@
1932                 as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
1933 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cheev in -l$lapack" >&5
1934 $as_echo_n "checking for $cheev in -l$lapack... " >&6; }
1935-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1936+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1937   $as_echo_n "(cached) " >&6
1938 else
1939   ac_check_lib_save_LIBS=$LIBS
1940@@ -12370,8 +12389,7 @@
1941 eval ac_res=\$$as_ac_Lib
1942            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1943 $as_echo "$ac_res" >&6; }
1944-eval as_val=\$$as_ac_Lib
1945- if test "x$as_val" = x""yes; then :
1946+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1947   acx_lapack_ok=yes; LAPACK_LIBS="-l$lapack"
1948 fi
1949 
1950@@ -12441,7 +12459,7 @@
1951   as_ac_Lib=`$as_echo "ac_cv_lib_qrupdate_$sqr1up" | $as_tr_sh`
1952 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sqr1up in -lqrupdate" >&5
1953 $as_echo_n "checking for $sqr1up in -lqrupdate... " >&6; }
1954-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1955+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1956   $as_echo_n "(cached) " >&6
1957 else
1958   ac_check_lib_save_LIBS=$LIBS
1959@@ -12484,8 +12502,7 @@
1960 eval ac_res=\$$as_ac_Lib
1961            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1962 $as_echo "$ac_res" >&6; }
1963-eval as_val=\$$as_ac_Lib
1964- if test "x$as_val" = x""yes; then :
1965+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1966   QRUPDATE_LIBS="-lqrupdate"; with_qrupdate=yes
1967 fi
1968 
1969@@ -12521,8 +12538,7 @@
1970 do :
1971   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1972 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1973-eval as_val=\$$as_ac_Header
1974- if test "x$as_val" = x""yes; then :
1975+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1976   cat >>confdefs.h <<_ACEOF
1977 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1978 _ACEOF
1979@@ -12667,8 +12683,7 @@
1980 do :
1981   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1982 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1983-eval as_val=\$$as_ac_Header
1984- if test "x$as_val" = x""yes; then :
1985+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1986   cat >>confdefs.h <<_ACEOF
1987 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1988 _ACEOF
1989@@ -12941,8 +12956,7 @@
1990 do :
1991   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1992 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1993-eval as_val=\$$as_ac_Header
1994- if test "x$as_val" = x""yes; then :
1995+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1996   cat >>confdefs.h <<_ACEOF
1997 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1998 _ACEOF
1999@@ -13034,8 +13048,7 @@
2000 do :
2001   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
2002 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
2003-eval as_val=\$$as_ac_Header
2004- if test "x$as_val" = x""yes; then :
2005+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
2006   cat >>confdefs.h <<_ACEOF
2007 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
2008 _ACEOF
2009@@ -13125,8 +13138,7 @@
2010 do :
2011   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
2012 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
2013-eval as_val=\$$as_ac_Header
2014- if test "x$as_val" = x""yes; then :
2015+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
2016   cat >>confdefs.h <<_ACEOF
2017 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
2018 _ACEOF
2019@@ -13277,8 +13289,7 @@
2020 do :
2021   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
2022 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
2023-eval as_val=\$$as_ac_Header
2024- if test "x$as_val" = x""yes; then :
2025+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
2026   cat >>confdefs.h <<_ACEOF
2027 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
2028 _ACEOF
2029@@ -13369,9 +13380,10 @@
2030 warn_arpack="arpack not found. This will result in a lack of the eigs function."
2031 if test "$with_arpack" = yes; then
2032   with_arpack=no
2033- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for F77_FUNC(dseupd,DSEUPD) in -larpack" >&5
2034+ as_ac_Lib=`$as_echo "ac_cv_lib_arpack_F77_FUNC(dseupd,DSEUPD)" | $as_tr_sh`
2035+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for F77_FUNC(dseupd,DSEUPD) in -larpack" >&5
2036 $as_echo_n "checking for F77_FUNC(dseupd,DSEUPD) in -larpack... " >&6; }
2037-if test "${ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_+set}" = set; then :
2038+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
2039   $as_echo_n "(cached) " >&6
2040 else
2041   ac_check_lib_save_LIBS=$LIBS
2042@@ -13403,17 +13415,18 @@
2043 }
2044 _ACEOF
2045 if ac_fn_c_try_link "$LINENO"; then :
2046- ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_=yes
2047+ eval "$as_ac_Lib=yes"
2048 else
2049- ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_=no
2050+ eval "$as_ac_Lib=no"
2051 fi
2052 rm -f core conftest.err conftest.$ac_objext \
2053     conftest$ac_exeext conftest.$ac_ext
2054 LIBS=$ac_check_lib_save_LIBS
2055 fi
2056-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" >&5
2057-$as_echo "$ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" >&6; }
2058-if test "x$ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" = x""yes; then :
2059+eval ac_res=\$$as_ac_Lib
2060+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2061+$as_echo "$ac_res" >&6; }
2062+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2063   ARPACK_LIBS="-larpack"; with_arpack=yes
2064 fi
2065 
2066@@ -13473,7 +13486,7 @@
2067 if $STATIC_LIBS || $SHARED_LIBS; then
2068   true
2069 else
2070- as_fn_error "You can't disable building static AND shared libraries!" "$LINENO" 5
2071+ as_fn_error $? "You can't disable building static AND shared libraries!" "$LINENO" 5
2072 fi
2073 
2074 # Check whether --enable-rpath was given.
2075@@ -14168,9 +14181,8 @@
2076   if test "$ac_cv_type_short" = yes; then
2077      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2078 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2079-{ as_fn_set_status 77
2080-as_fn_error "cannot compute sizeof (short)
2081-See \`config.log' for more details." "$LINENO" 5; }; }
2082+as_fn_error 77 "cannot compute sizeof (short)
2083+See \`config.log' for more details" "$LINENO" 5 ; }
2084    else
2085      ac_cv_sizeof_short=0
2086    fi
2087@@ -14202,9 +14214,8 @@
2088   if test "$ac_cv_type_int" = yes; then
2089      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2090 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2091-{ as_fn_set_status 77
2092-as_fn_error "cannot compute sizeof (int)
2093-See \`config.log' for more details." "$LINENO" 5; }; }
2094+as_fn_error 77 "cannot compute sizeof (int)
2095+See \`config.log' for more details" "$LINENO" 5 ; }
2096    else
2097      ac_cv_sizeof_int=0
2098    fi
2099@@ -14236,9 +14247,8 @@
2100   if test "$ac_cv_type_long" = yes; then
2101      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2102 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2103-{ as_fn_set_status 77
2104-as_fn_error "cannot compute sizeof (long)
2105-See \`config.log' for more details." "$LINENO" 5; }; }
2106+as_fn_error 77 "cannot compute sizeof (long)
2107+See \`config.log' for more details" "$LINENO" 5 ; }
2108    else
2109      ac_cv_sizeof_long=0
2110    fi
2111@@ -14270,9 +14280,8 @@
2112   if test "$ac_cv_type_long_long" = yes; then
2113      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2114 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2115-{ as_fn_set_status 77
2116-as_fn_error "cannot compute sizeof (long long)
2117-See \`config.log' for more details." "$LINENO" 5; }; }
2118+as_fn_error 77 "cannot compute sizeof (long long)
2119+See \`config.log' for more details" "$LINENO" 5 ; }
2120    else
2121      ac_cv_sizeof_long_long=0
2122    fi
2123@@ -14435,8 +14444,7 @@
2124   for ac_func in _getb67 GETB67 getb67; do
2125     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2126 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2127-eval as_val=\$$as_ac_var
2128- if test "x$as_val" = x""yes; then :
2129+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2130 
2131 cat >>confdefs.h <<_ACEOF
2132 #define CRAY_STACKSEG_END $ac_func
2133@@ -14707,10 +14715,8 @@
2134 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2135 
2136 if test "$cross_compiling" = yes; then :
2137- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2138-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2139-as_fn_error "cannot run test program while cross compiling
2140-See \`config.log' for more details." "$LINENO" 5; }
2141+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: guessing no" >&5
2142+$as_echo "guessing no" >&6; }
2143 else
2144   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2145 /* end confdefs.h. */
2146@@ -14811,9 +14817,8 @@
2147   if test "$ac_cv_type_long_double" = yes; then
2148      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2149 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2150-{ as_fn_set_status 77
2151-as_fn_error "cannot compute sizeof (long double)
2152-See \`config.log' for more details." "$LINENO" 5; }; }
2153+as_fn_error 77 "cannot compute sizeof (long double)
2154+See \`config.log' for more details" "$LINENO" 5 ; }
2155    else
2156      ac_cv_sizeof_long_double=0
2157    fi
2158@@ -14958,7 +14963,7 @@
2159   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
2160 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
2161 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
2162-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
2163+if eval "test \"\${$as_ac_Header+set}\"" = set; then :
2164   $as_echo_n "(cached) " >&6
2165 else
2166   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2167@@ -14993,8 +14998,7 @@
2168 eval ac_res=\$$as_ac_Header
2169            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2170 $as_echo "$ac_res" >&6; }
2171-eval as_val=\$$as_ac_Header
2172- if test "x$as_val" = x""yes; then :
2173+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
2174   cat >>confdefs.h <<_ACEOF
2175 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
2176 _ACEOF
2177@@ -15240,8 +15244,7 @@
2178 do :
2179   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
2180 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
2181-eval as_val=\$$as_ac_Header
2182- if test "x$as_val" = x""yes; then :
2183+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
2184   cat >>confdefs.h <<_ACEOF
2185 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
2186 _ACEOF
2187@@ -15514,10 +15517,10 @@
2188 
2189 
2190   if test "$have_fnmatch" != yes || test "$have_glob" != yes; then
2191- as_fn_error "You are required to have fnmatch and glob" "$LINENO" 5
2192+ as_fn_error $? "You are required to have fnmatch and glob" "$LINENO" 5
2193   fi
2194 else
2195- as_fn_error "You are required to have fnmatch.h and glob.h" "$LINENO" 5
2196+ as_fn_error $? "You are required to have fnmatch.h and glob.h" "$LINENO" 5
2197 fi
2198 
2199 ### Checks for functions and variables.
2200@@ -15537,8 +15540,7 @@
2201 do :
2202   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2203 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2204-eval as_val=\$$as_ac_var
2205- if test "x$as_val" = x""yes; then :
2206+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2207   cat >>confdefs.h <<_ACEOF
2208 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2209 _ACEOF
2210@@ -15591,8 +15593,7 @@
2211 do :
2212   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2213 ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
2214-eval as_val=\$$as_ac_var
2215- if test "x$as_val" = x""yes; then :
2216+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2217   cat >>confdefs.h <<_ACEOF
2218 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2219 _ACEOF
2220@@ -15760,10 +15761,7 @@
2221 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2222 
2223 if test "$cross_compiling" = yes; then :
2224- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2225-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2226-as_fn_error "cannot run test program while cross compiling
2227-See \`config.log' for more details." "$LINENO" 5; }
2228+ octave_cv_strptime_broken=yes
2229 else
2230   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2231 /* end confdefs.h. */
2232@@ -16057,8 +16055,7 @@
2233 do :
2234   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2235 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2236-eval as_val=\$$as_ac_var
2237- if test "x$as_val" = x""yes; then :
2238+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2239   cat >>confdefs.h <<_ACEOF
2240 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2241 _ACEOF
2242@@ -16194,8 +16191,7 @@
2243 do :
2244   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2245 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2246-eval as_val=\$$as_ac_var
2247- if test "x$as_val" = x""yes; then :
2248+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2249   cat >>confdefs.h <<_ACEOF
2250 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2251 _ACEOF
2252@@ -16240,7 +16236,7 @@
2253   ac_safe=`echo "-rdynamic" | sed 'y%./+-:=%__p___%'`
2254   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -rdynamic" >&5
2255 $as_echo_n "checking whether ${CXX-g++} accepts -rdynamic... " >&6; }
2256- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2257+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
2258   $as_echo_n "(cached) " >&6
2259 else
2260 
2261@@ -16743,8 +16739,7 @@
2262 do :
2263   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2264 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2265-eval as_val=\$$as_ac_var
2266- if test "x$as_val" = x""yes; then :
2267+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2268   cat >>confdefs.h <<_ACEOF
2269 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2270 _ACEOF
2271@@ -16756,8 +16751,7 @@
2272 do :
2273   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2274 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2275-eval as_val=\$$as_ac_var
2276- if test "x$as_val" = x""yes; then :
2277+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2278   cat >>confdefs.h <<_ACEOF
2279 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2280 _ACEOF
2281@@ -16786,8 +16780,7 @@
2282 do :
2283   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2284 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2285-eval as_val=\$$as_ac_var
2286- if test "x$as_val" = x""yes; then :
2287+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2288   cat >>confdefs.h <<_ACEOF
2289 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2290 _ACEOF
2291@@ -16799,8 +16792,7 @@
2292 do :
2293   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2294 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2295-eval as_val=\$$as_ac_var
2296- if test "x$as_val" = x""yes; then :
2297+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2298   cat >>confdefs.h <<_ACEOF
2299 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2300 _ACEOF
2301@@ -17088,7 +17080,7 @@
2302   as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh`
2303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -l${termlib}" >&5
2304 $as_echo_n "checking for tputs in -l${termlib}... " >&6; }
2305-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
2306+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
2307   $as_echo_n "(cached) " >&6
2308 else
2309   ac_check_lib_save_LIBS=$LIBS
2310@@ -17131,8 +17123,7 @@
2311 eval ac_res=\$$as_ac_Lib
2312            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2313 $as_echo "$ac_res" >&6; }
2314-eval as_val=\$$as_ac_Lib
2315- if test "x$as_val" = x""yes; then :
2316+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2317   TERMLIBS="${TERMLIBS} -l${termlib}"
2318 fi
2319 
2320@@ -17221,7 +17212,7 @@
2321 
2322       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I need GNU Readline 4.2 or later" >&5
2323 $as_echo "$as_me: WARNING: I need GNU Readline 4.2 or later" >&2;}
2324- as_fn_error "this is fatal unless you specify --disable-readline" "$LINENO" 5
2325+ as_fn_error $? "this is fatal unless you specify --disable-readline" "$LINENO" 5
2326 
2327 fi
2328 
2329@@ -17529,8 +17520,7 @@
2330 do :
2331   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2332 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
2333-eval as_val=\$$as_ac_var
2334- if test "x$as_val" = x""yes; then :
2335+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2336   cat >>confdefs.h <<_ACEOF
2337 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
2338 _ACEOF
2339@@ -17667,7 +17657,7 @@
2340 {
2341   tmp=$TMPDIR/sed$$-$RANDOM
2342   (umask 077 && mkdir "$tmp")
2343-} || as_fn_error "cannot create a temporary directory in $TMPDIR" "$LINENO" 5
2344+} || as_fn_error $? "cannot create a temporary directory in $TMPDIR" "$LINENO" 5
2345     _max=0
2346     _count=0
2347     # Add /usr/xpg4/bin/sed as it is typically found on Solaris
2348@@ -17708,7 +17698,7 @@
2349 
2350   SED=$octave_cv_path_sed
2351   if test -z "$SED"; then
2352- as_fn_error "no usable version of sed found" "$LINENO" 5
2353+ as_fn_error $? "no usable version of sed found" "$LINENO" 5
2354   fi
2355 fi
2356 
2357@@ -17879,7 +17869,7 @@
2358 elif test -f lexyy.c; then
2359   ac_cv_prog_lex_root=lexyy
2360 else
2361- as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
2362+ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
2363 fi
2364 fi
2365 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
2366@@ -18655,7 +18645,7 @@
2367   ac_safe=`echo "-Wall" | sed 'y%./+-:=%__p___%'`
2368   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wall" >&5
2369 $as_echo_n "checking whether ${CC-cc} accepts -Wall... " >&6; }
2370- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2371+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
2372   $as_echo_n "(cached) " >&6
2373 else
2374 
2375@@ -18720,7 +18710,7 @@
2376   ac_safe=`echo "-W" | sed 'y%./+-:=%__p___%'`
2377   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -W" >&5
2378 $as_echo_n "checking whether ${CC-cc} accepts -W... " >&6; }
2379- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2380+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
2381   $as_echo_n "(cached) " >&6
2382 else
2383 
2384@@ -18785,7 +18775,7 @@
2385   ac_safe=`echo "-Wshadow" | sed 'y%./+-:=%__p___%'`
2386   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wshadow" >&5
2387 $as_echo_n "checking whether ${CC-cc} accepts -Wshadow... " >&6; }
2388- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2389+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
2390   $as_echo_n "(cached) " >&6
2391 else
2392 
2393@@ -18850,7 +18840,7 @@
2394   ac_safe=`echo "-Wformat" | sed 'y%./+-:=%__p___%'`
2395   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wformat" >&5
2396 $as_echo_n "checking whether ${CC-cc} accepts -Wformat... " >&6; }
2397- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2398+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
2399   $as_echo_n "(cached) " >&6
2400 else
2401 
2402@@ -18916,7 +18906,7 @@
2403   ac_safe=`echo "-Wall" | sed 'y%./+-:=%__p___%'`
2404   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wall" >&5
2405 $as_echo_n "checking whether ${CXX-g++} accepts -Wall... " >&6; }
2406- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2407+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
2408   $as_echo_n "(cached) " >&6
2409 else
2410 
2411@@ -18981,7 +18971,7 @@
2412   ac_safe=`echo "-W" | sed 'y%./+-:=%__p___%'`
2413   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -W" >&5
2414 $as_echo_n "checking whether ${CXX-g++} accepts -W... " >&6; }
2415- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2416+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
2417   $as_echo_n "(cached) " >&6
2418 else
2419 
2420@@ -19046,7 +19036,7 @@
2421   ac_safe=`echo "-Wshadow" | sed 'y%./+-:=%__p___%'`
2422   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wshadow" >&5
2423 $as_echo_n "checking whether ${CXX-g++} accepts -Wshadow... " >&6; }
2424- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2425+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
2426   $as_echo_n "(cached) " >&6
2427 else
2428 
2429@@ -19111,7 +19101,7 @@
2430   ac_safe=`echo "-Wold-style-cast" | sed 'y%./+-:=%__p___%'`
2431   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wold-style-cast" >&5
2432 $as_echo_n "checking whether ${CXX-g++} accepts -Wold-style-cast... " >&6; }
2433- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2434+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
2435   $as_echo_n "(cached) " >&6
2436 else
2437 
2438@@ -19176,7 +19166,7 @@
2439   ac_safe=`echo "-Wformat" | sed 'y%./+-:=%__p___%'`
2440   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wformat" >&5
2441 $as_echo_n "checking whether ${CXX-g++} accepts -Wformat... " >&6; }
2442- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2443+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
2444   $as_echo_n "(cached) " >&6
2445 else
2446 
2447@@ -19261,7 +19251,7 @@
2448   ac_safe=`echo "$flag" | sed 'y%./+-:=%__p___%'`
2449   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts $flag" >&5
2450 $as_echo_n "checking whether ${CC-cc} accepts $flag... " >&6; }
2451- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2452+ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then :
2453   $as_echo_n "(cached) " >&6
2454 else
2455 
2456@@ -19328,7 +19318,7 @@
2457   ac_safe=`echo "$flag" | sed 'y%./+-:=%__p___%'`
2458   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts $flag" >&5
2459 $as_echo_n "checking whether ${CXX-g++} accepts $flag... " >&6; }
2460- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then :
2461+ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then :
2462   $as_echo_n "(cached) " >&6
2463 else
2464 
2465@@ -19503,6 +19493,7 @@
2466 
2467 ac_libobjs=
2468 ac_ltlibobjs=
2469+U=
2470 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
2471   # 1. Remove the extension, and $U if already installed.
2472   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
2473@@ -19664,19 +19655,19 @@
2474 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2475 
2476 
2477-# as_fn_error ERROR [LINENO LOG_FD]
2478-# ---------------------------------
2479+# as_fn_error STATUS ERROR [LINENO LOG_FD]
2480+# ----------------------------------------
2481 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
2482 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
2483-# script with status $?, using 1 if that was 0.
2484+# script with STATUS, using 1 if that was 0.
2485 as_fn_error ()
2486 {
2487- as_status=$?; test $as_status -eq 0 && as_status=1
2488- if test "$3"; then
2489- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2490- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
2491+ as_status=$1; test $as_status -eq 0 && as_status=1
2492+ if test "$4"; then
2493+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2494+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
2495   fi
2496- $as_echo "$as_me: error: $1" >&2
2497+ $as_echo "$as_me: error: $2" >&2
2498   as_fn_exit $as_status
2499 } # as_fn_error
2500 
2501@@ -19872,7 +19863,7 @@
2502       test -d "$as_dir" && break
2503     done
2504     test -z "$as_dirs" || eval "mkdir $as_dirs"
2505- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
2506+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
2507 
2508 
2509 } # as_fn_mkdir_p
2510@@ -19926,7 +19917,7 @@
2511 # values after options handling.
2512 ac_log="
2513 This file was extended by $as_me, which was
2514-generated by GNU Autoconf 2.64. Invocation command line was
2515+generated by GNU Autoconf 2.67. Invocation command line was
2516 
2517   CONFIG_FILES = $CONFIG_FILES
2518   CONFIG_HEADERS = $CONFIG_HEADERS
2519@@ -19966,6 +19957,7 @@
2520 
2521   -h, --help print this help, then exit
2522   -V, --version print version number and configuration settings, then exit
2523+ --config print configuration, then exit
2524   -q, --quiet, --silent
2525                    do not print progress messages
2526   -d, --debug don't remove temporary files
2527@@ -19988,12 +19980,13 @@
2528 
2529 _ACEOF
2530 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2531+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2532 ac_cs_version="\\
2533 config.status
2534-configured by $0, generated by GNU Autoconf 2.64,
2535- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
2536+configured by $0, generated by GNU Autoconf 2.67,
2537+ with options \\"\$ac_cs_config\\"
2538 
2539-Copyright (C) 2009 Free Software Foundation, Inc.
2540+Copyright (C) 2010 Free Software Foundation, Inc.
2541 This config.status script is free software; the Free Software Foundation
2542 gives unlimited permission to copy, distribute and modify it."
2543 
2544@@ -20010,11 +20003,16 @@
2545 while test $# != 0
2546 do
2547   case $1 in
2548- --*=*)
2549+ --*=?*)
2550     ac_option=`expr "X$1" : 'X\([^=]*\)='`
2551     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
2552     ac_shift=:
2553     ;;
2554+ --*=)
2555+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
2556+ ac_optarg=
2557+ ac_shift=:
2558+ ;;
2559   *)
2560     ac_option=$1
2561     ac_optarg=$2
2562@@ -20028,12 +20026,15 @@
2563     ac_cs_recheck=: ;;
2564   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
2565     $as_echo "$ac_cs_version"; exit ;;
2566+ --config | --confi | --conf | --con | --co | --c )
2567+ $as_echo "$ac_cs_config"; exit ;;
2568   --debug | --debu | --deb | --de | --d | -d )
2569     debug=: ;;
2570   --file | --fil | --fi | --f )
2571     $ac_shift
2572     case $ac_optarg in
2573     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
2574+ '') as_fn_error $? "missing file argument" ;;
2575     esac
2576     as_fn_append CONFIG_FILES " '$ac_optarg'"
2577     ac_need_defaults=false;;
2578@@ -20046,7 +20047,7 @@
2579     ac_need_defaults=false;;
2580   --he | --h)
2581     # Conflict between --help and --header
2582- as_fn_error "ambiguous option: \`$1'
2583+ as_fn_error $? "ambiguous option: \`$1'
2584 Try \`$0 --help' for more information.";;
2585   --help | --hel | -h )
2586     $as_echo "$ac_cs_usage"; exit ;;
2587@@ -20055,7 +20056,7 @@
2588     ac_cs_silent=: ;;
2589 
2590   # This is an error.
2591- -*) as_fn_error "unrecognized option: \`$1'
2592+ -*) as_fn_error $? "unrecognized option: \`$1'
2593 Try \`$0 --help' for more information." ;;
2594 
2595   *) as_fn_append ac_config_targets " $1"
2596@@ -20142,7 +20143,7 @@
2597     "libcruft/blas-xtra/Makefile") CONFIG_FILES="$CONFIG_FILES libcruft/blas-xtra/Makefile" ;;
2598     "libcruft/lapack-xtra/Makefile") CONFIG_FILES="$CONFIG_FILES libcruft/lapack-xtra/Makefile" ;;
2599 
2600- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
2601+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
2602   esac
2603 done
2604 
2605@@ -20180,7 +20181,7 @@
2606 {
2607   tmp=./conf$$-$RANDOM
2608   (umask 077 && mkdir "$tmp")
2609-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
2610+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
2611 
2612 # Set up the scripts for CONFIG_FILES section.
2613 # No need to generate them if there are no CONFIG_FILES.
2614@@ -20197,7 +20198,7 @@
2615 fi
2616 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
2617 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
2618- ac_cs_awk_cr='\r'
2619+ ac_cs_awk_cr='\\r'
2620 else
2621   ac_cs_awk_cr=$ac_cr
2622 fi
2623@@ -20211,18 +20212,18 @@
2624   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
2625   echo "_ACEOF"
2626 } >conf$$subs.sh ||
2627- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2628-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
2629+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
2630+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
2631 ac_delim='%!_!# '
2632 for ac_last_try in false false false false false :; do
2633   . ./conf$$subs.sh ||
2634- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2635+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
2636 
2637   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
2638   if test $ac_delim_n = $ac_delim_num; then
2639     break
2640   elif $ac_last_try; then
2641- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2642+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
2643   else
2644     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
2645   fi
2646@@ -20244,7 +20245,7 @@
2647 t delim
2648 :nl
2649 h
2650-s/\(.\{148\}\).*/\1/
2651+s/\(.\{148\}\)..*/\1/
2652 t more1
2653 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
2654 p
2655@@ -20258,7 +20259,7 @@
2656 t nl
2657 :delim
2658 h
2659-s/\(.\{148\}\).*/\1/
2660+s/\(.\{148\}\)..*/\1/
2661 t more2
2662 s/["\\]/\\&/g; s/^/"/; s/$/"/
2663 p
2664@@ -20311,20 +20312,28 @@
2665 else
2666   cat
2667 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
2668- || as_fn_error "could not setup config files machinery" "$LINENO" 5
2669+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
2670 _ACEOF
2671 
2672-# VPATH may cause trouble with some makes, so we remove $(srcdir),
2673-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
2674+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
2675+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
2676 # trailing colons and then remove the whole line if VPATH becomes empty
2677 # (actually we leave an empty line to preserve line numbers).
2678 if test "x$srcdir" = x.; then
2679- ac_vpsub='/^[ ]*VPATH[ ]*=/{
2680-s/:*\$(srcdir):*/:/
2681-s/:*\${srcdir}:*/:/
2682-s/:*@srcdir@:*/:/
2683-s/^\([^=]*=[ ]*\):*/\1/
2684+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
2685+h
2686+s///
2687+s/^/:/
2688+s/[ ]*$/:/
2689+s/:\$(srcdir):/:/g
2690+s/:\${srcdir}:/:/g
2691+s/:@srcdir@:/:/g
2692+s/^:*//
2693 s/:*$//
2694+x
2695+s/\(=[ ]*\).*/\1/
2696+G
2697+s/\n//
2698 s/^[^=]*=[ ]*$//
2699 }'
2700 fi
2701@@ -20352,7 +20361,7 @@
2702   if test -z "$ac_t"; then
2703     break
2704   elif $ac_last_try; then
2705- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
2706+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
2707   else
2708     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
2709   fi
2710@@ -20437,7 +20446,7 @@
2711 _ACAWK
2712 _ACEOF
2713 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2714- as_fn_error "could not setup config headers machinery" "$LINENO" 5
2715+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
2716 fi # test -n "$CONFIG_HEADERS"
2717 
2718 
2719@@ -20450,7 +20459,7 @@
2720   esac
2721   case $ac_mode$ac_tag in
2722   :[FHL]*:*);;
2723- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
2724+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
2725   :[FH]-) ac_tag=-:-;;
2726   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
2727   esac
2728@@ -20478,7 +20487,7 @@
2729        [\\/$]*) false;;
2730        *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
2731        esac ||
2732- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
2733+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
2734       esac
2735       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
2736       as_fn_append ac_file_inputs " '$ac_f'"
2737@@ -20505,7 +20514,7 @@
2738 
2739     case $ac_tag in
2740     *:-:* | *:-) cat >"$tmp/stdin" \
2741- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
2742+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
2743     esac
2744     ;;
2745   esac
2746@@ -20636,22 +20645,22 @@
2747 $ac_datarootdir_hack
2748 "
2749 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
2750- || as_fn_error "could not create $ac_file" "$LINENO" 5
2751+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
2752 
2753 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
2754   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
2755   { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
2756   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
2757-which seems to be undefined. Please make sure it is defined." >&5
2758+which seems to be undefined. Please make sure it is defined" >&5
2759 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
2760-which seems to be undefined. Please make sure it is defined." >&2;}
2761+which seems to be undefined. Please make sure it is defined" >&2;}
2762 
2763   rm -f "$tmp/stdin"
2764   case $ac_file in
2765   -) cat "$tmp/out" && rm -f "$tmp/out";;
2766   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
2767   esac \
2768- || as_fn_error "could not create $ac_file" "$LINENO" 5
2769+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
2770  ;;
2771   :H)
2772   #
2773@@ -20662,19 +20671,19 @@
2774       $as_echo "/* $configure_input */" \
2775       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
2776     } >"$tmp/config.h" \
2777- || as_fn_error "could not create $ac_file" "$LINENO" 5
2778+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
2779     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
2780       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
2781 $as_echo "$as_me: $ac_file is unchanged" >&6;}
2782     else
2783       rm -f "$ac_file"
2784       mv "$tmp/config.h" "$ac_file" \
2785- || as_fn_error "could not create $ac_file" "$LINENO" 5
2786+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
2787     fi
2788   else
2789     $as_echo "/* $configure_input */" \
2790       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
2791- || as_fn_error "could not create -" "$LINENO" 5
2792+ || as_fn_error $? "could not create -" "$LINENO" 5
2793   fi
2794  ;;
2795 
2796@@ -20698,7 +20707,7 @@
2797 ac_clean_files=$ac_clean_files_save
2798 
2799 test $ac_write_fail = 0 ||
2800- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
2801+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
2802 
2803 
2804 # configure is writing to config.log, and then calls config.status.
2805@@ -20719,7 +20728,7 @@
2806   exec 5>>config.log
2807   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
2808   # would make configure fail if this is the last instruction.
2809- $ac_cs_success || as_fn_exit $?
2810+ $ac_cs_success || as_fn_exit 1
2811 fi
2812 
2813 #
2814@@ -20860,7 +20869,7 @@
2815       # The eval makes quoting arguments work.
2816       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
2817        --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
2818- as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
2819+ as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
2820     fi
2821 
2822     cd "$ac_popdir"
2823

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive