diff --git a/octave/Makefile b/octave/Makefile new file mode 100644 index 0000000..89e3ec9 --- /dev/null +++ b/octave/Makefile @@ -0,0 +1,107 @@ +# +# Copyright (C) 2011 David Kuehling +# +# License GPLv2 or later. NO WARRANTY. +# +# OpenWRT package for the GNU Octave + +include $(TOPDIR)/rules.mk + +PKG_NAME:=octave +PKG_VERSION:=3.2.4 +PKG_RELEASE:=1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.octave.org/pub/octave/ +PKG_MD5SUM:=90c39fa9e241ad2e978bcee4682a2ba9 +PKG_INSTALL:=1 +PKG_FIXUP:=libtool + +PKG_BUILD_DEPENDS:= libtool/host @INSTALL_GFORTRAN + +#include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +# todo: graphicsmagick package from multimedia feed is not complete. We need +# the Magick++ library and the Magick++-config script installed. +define Package/octave/Default + SUBMENU:=Octave + SECTION:=lang + CATEGORY:=Languages + DEPENDS:= +libltdl +zlib +libpcre +libncurses +libreadline \ + +octave-data +#+fftw3 +#+GraphicsMagick + + TITLE:=GNU Octave + URL:=http://www.gnu.org/software/octave/ + SUBMENU:=Octave +endef + +define Package/octave/Default/description +GNU Octave is a high-level language, primarily intended for numerical +computations. It provides a convenient command line interface for solving +linear and nonlinear problems numerically, and for performing other numerical +experiments using a language that is mostly compatible with Matlab. It may +also be used as a batch-oriented language. +endef + +define Package/octave +$(call Package/octave/Default) + DEPENDS:=+octave-data + TITLE+= (executable) +endef + +define Package/octave/description +$(call Package/octave/Default/description) + This package contains the Octave executable files +endef + +define Package/octave-data +$(call Package/octave/Default) + TITLE+= (function files) +endef + +define Package/octave-data/description +$(call Package/octave/Default/description) + This package contains the platform-independant .m-files. +endef + +# fftw contains a lots of code. not much use for soft-float anyways. try to +# keep memory low and go without fftw (using smaller fftpack instead). +# todo: verify how much RAM that actually safes +CONFIGURE_ARGS += --without-x --without-fftw +#MAKE_FLAGS += "LD=$(TARGET_CROSS)gcc -nostdlib" + +define Build/Configure + $(call Build/Configure/Default) +endef + +define Build/Compile + $(call Build/Compile/Default,-j3) +endef + +define Build/Install + $(call Build/Install/Default) +# $(INSTALL_DATA) ./files/... $(PKG_INSTALL_DIR)/usr/share/octave/ +endef + +define Package/octave/install + $(INSTALL_DIR) $(1)/usr + cp -r $(PKG_INSTALL_DIR)/usr/{bin,lib} $(1)/usr +endef + +define Package/octave-data/install + $(INSTALL_DIR) $(1)/ + (cd $(PKG_INSTALL_DIR)/ && tar -cf - usr/share) \ + | (cd $(1)/ && tar -xvf -) +endef + +#$(eval $(call HostBuild)) +$(eval $(call BuildPackage,octave)) +$(eval $(call BuildPackage,octave-data)) + + +# The following comments configure the Emacs editor. Just ignore them. +# Local Variables: +# compile-command: "make -C ~/h/src/qi/openwrt-xburst package/octave/compile -j2 V=99" +# End: diff --git a/octave/patches/010-configure.patch b/octave/patches/010-configure.patch new file mode 100644 index 0000000..e824986 --- /dev/null +++ b/octave/patches/010-configure.patch @@ -0,0 +1,2822 @@ +Index: octave-3.2.4/aclocal.m4 +=================================================================== +--- octave-3.2.4.orig/aclocal.m4 2011-01-02 13:17:05.000000000 +0100 ++++ octave-3.2.4/aclocal.m4 2011-01-02 13:25:56.000000000 +0100 +@@ -109,7 +109,8 @@ + struct tm t; + char *q = strptime ("09/13", "%m/%d/%y", &t); + return q ? 1 : 0; +-]])], [octave_cv_strptime_broken=no], [octave_cv_strptime_broken=yes])]) ++]])], [octave_cv_strptime_broken=no], [octave_cv_strptime_broken=yes], ++[octave_cv_strptime_broken=yes])]) + if test $octave_cv_strptime_broken = yes; then + AC_DEFINE(OCTAVE_HAVE_BROKEN_STRPTIME, 1, [Define if strptime is broken on your system]) + fi +@@ -1386,7 +1387,8 @@ + ]])], + [AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FAST_INT_OPS,1,[Define if signed integers use two's complement])], +-[AC_MSG_RESULT([no])]) ++[AC_MSG_RESULT([no])], ++[AC_MSG_RESULT([guessing no])]) + AC_LANG_POP(C++)]) + dnl + dnl Check to see if the compiler and the linker can handle the flags +Index: octave-3.2.4/configure +=================================================================== +--- octave-3.2.4.orig/configure 2011-01-02 13:17:12.000000000 +0100 ++++ octave-3.2.4/configure 2011-01-02 13:26:05.000000000 +0100 +@@ -1,12 +1,14 @@ + #! /bin/sh + # From configure.in Revision: 1.603 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64. ++# Generated by GNU Autoconf 2.67. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software + # Foundation, Inc. + # ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## -------------------- ## +@@ -315,7 +317,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -355,19 +357,19 @@ + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -525,10 +527,11 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -937,8 +940,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -983,7 +987,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1009,7 +1013,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1213,7 +1217,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1229,7 +1233,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1259,8 +1263,8 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) as_fn_error "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1268,7 +1272,7 @@ + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1286,13 +1290,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1315,7 +1319,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1329,8 +1333,8 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1345,9 +1349,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1386,11 +1390,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1430,7 +1434,7 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1549,7 +1553,7 @@ + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + CXX C++ compiler command +@@ -1641,9 +1645,9 @@ + if $ac_init_version; then + cat <<\_ACEOF + configure +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.67 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1688,7 +1692,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +@@ -1713,7 +1717,7 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1725,7 +1729,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + +@@ -1737,10 +1741,10 @@ + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1776,7 +1780,7 @@ + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -1803,7 +1807,7 @@ + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1854,7 +1858,7 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + +@@ -1867,7 +1871,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2063,7 +2067,7 @@ + + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int + +@@ -2101,7 +2105,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_compile + +@@ -2126,7 +2130,7 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : +@@ -2138,7 +2142,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_cpp + +@@ -2184,7 +2188,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_link + +@@ -2230,7 +2234,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link + +@@ -2242,7 +2246,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2309,10 +2313,10 @@ + ac_fn_cxx_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -2348,7 +2352,7 @@ + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -2375,7 +2379,7 @@ + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -2422,7 +2426,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_f77_try_compile + +@@ -2468,7 +2472,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_f77_try_link + +@@ -2510,7 +2514,7 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_f77_try_run + +@@ -2523,7 +2527,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -2622,19 +2626,22 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_run + +-# ac_fn_cxx_check_decl LINENO SYMBOL VAR +-# -------------------------------------- +-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ++# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES ++# ----------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. + ac_fn_cxx_check_decl () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +-$as_echo_n "checking whether $2 is declared... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2651,8 +2658,12 @@ + int + main () + { +-#ifndef $2 +- (void) $2; ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif + #endif + + ; +@@ -2681,7 +2692,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2748,15 +2759,18 @@ + + } # ac_fn_cxx_check_func + +-# ac_fn_c_check_decl LINENO SYMBOL VAR +-# ------------------------------------ +-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES ++# --------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. + ac_fn_c_check_decl () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +-$as_echo_n "checking whether $2 is declared... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2773,8 +2787,12 @@ + int + main () + { +-#ifndef $2 +- (void) $2; ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif + #endif + + ; +@@ -2804,7 +2822,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 + $as_echo_n "checking for $2.$3... " >&6; } +-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$4+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2872,7 +2890,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +@@ -2982,11 +3000,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -3020,11 +3036,9 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -3037,11 +3051,9 @@ + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -3055,11 +3067,9 @@ + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -3114,7 +3124,12 @@ + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -3125,18 +3140,22 @@ + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -3205,7 +3224,7 @@ + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -3226,16 +3245,22 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi + done + if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -3249,7 +3274,7 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +@@ -3260,16 +3285,16 @@ + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -3294,7 +3319,7 @@ + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +@@ -3302,7 +3327,7 @@ + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -3651,8 +3676,8 @@ + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -3673,32 +3698,30 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3760,62 +3783,28 @@ + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5 ; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -3845,16 +3834,75 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5 ; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5 ; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : +@@ -3897,8 +3945,8 @@ + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -4161,7 +4209,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4177,11 +4225,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -4220,7 +4268,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4236,18 +4284,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -4308,7 +4356,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP +@@ -4374,7 +4422,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4506,8 +4554,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -4596,7 +4643,7 @@ + esac + ;; + no) +- as_fn_error "You are required to define a path separation character" "$LINENO" 5 ++ as_fn_error $? "You are required to define a path separation character" "$LINENO" 5 + ;; + *) + sepchar=$with_sepchar +@@ -4743,9 +4790,8 @@ + if test "$ac_cv_type_void_p" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (void *) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (void *) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_void_p=0 + fi +@@ -4777,9 +4823,8 @@ + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (int) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (int) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_int=0 + fi +@@ -4811,9 +4856,8 @@ + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long=0 + fi +@@ -5001,8 +5045,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -5166,7 +5210,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5182,11 +5226,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -5225,7 +5269,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5241,18 +5285,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -5269,7 +5313,7 @@ + + case "$gxx_version" in + 1.* | 2.[0123456789].* | 3.[01234].*) +- as_fn_error "g++ version $gxx_version will probably fail to compile Octave ++ as_fn_error $? "g++ version $gxx_version will probably fail to compile Octave + " "$LINENO" 5 + ;; + esac +@@ -5760,8 +5804,8 @@ + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -5782,8 +5826,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -6042,7 +6086,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -6058,11 +6102,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -6101,7 +6145,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -6117,18 +6161,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -6670,7 +6714,7 @@ + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( ++ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +@@ -6688,7 +6732,7 @@ + @echo libdir='${LIBDIR}' + _ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done +@@ -6774,7 +6818,7 @@ + fi + done + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + fi # $ac_x_includes = no + + if test "$ac_x_libraries" = no; then +@@ -7045,7 +7089,7 @@ + ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mieee-fp" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -mieee-fp... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7110,7 +7154,7 @@ + ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mieee-fp" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -mieee-fp... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7177,7 +7221,7 @@ + ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mieee" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -mieee... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7236,7 +7280,7 @@ + ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -ieee" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -ieee... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7296,7 +7340,7 @@ + ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mieee" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -mieee... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7355,7 +7399,7 @@ + ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -ieee" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -ieee... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7416,7 +7460,7 @@ + ac_safe=`echo "-mminimal-toc" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mminimal-toc" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -mminimal-toc... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7472,7 +7516,7 @@ + ac_safe=`echo "-mminimal-toc" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mminimal-toc" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -mminimal-toc... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -8064,7 +8108,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$zlib_lib''_gzclearerr" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzclearerr in -l$zlib_lib" >&5 + $as_echo_n "checking for gzclearerr in -l$zlib_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8099,8 +8143,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + for ac_header in zlib.h + do : +@@ -8150,7 +8193,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$hdf5_lib''_H5Pcreate" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Pcreate in -l$hdf5_lib" >&5 + $as_echo_n "checking for H5Pcreate in -l$hdf5_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8185,8 +8228,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + for ac_header in hdf5.h + do : +@@ -8202,7 +8244,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$hdf5_lib''_H5Gget_num_objs" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Gget_num_objs in -l$hdf5_lib" >&5 + $as_echo_n "checking for H5Gget_num_objs in -l$hdf5_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8237,8 +8279,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HDF5 library has required API" >&5 +@@ -8514,8 +8555,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -8523,7 +8563,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glp_lpx_simplex in -l$glpk_lib" >&5 + $as_echo_n "checking for glp_lpx_simplex in -l$glpk_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8558,8 +8598,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + GLPK_LIBS="-l$glpk_lib" + +@@ -8570,7 +8609,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$glpk_lib''__glp_lpx_simplex" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _glp_lpx_simplex in -l$glpk_lib" >&5 + $as_echo_n "checking for _glp_lpx_simplex in -l$glpk_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8605,8 +8644,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + GLPK_LIBS="-l$glpk_lib" + fi +@@ -8655,7 +8693,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$curl_lib''_curl_easy_escape" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_escape in -l$curl_lib" >&5 + $as_echo_n "checking for curl_easy_escape in -l$curl_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8690,8 +8728,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + for ac_header in curl/curl.h + do : +@@ -8936,8 +8973,7 @@ + #endif + + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -8951,8 +8987,7 @@ + #endif + + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -9324,8 +9359,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -9336,8 +9370,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -9699,7 +9732,7 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- 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 ++ 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 + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -9743,7 +9776,7 @@ + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- 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 ++ 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 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -9818,8 +9851,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -10122,7 +10155,7 @@ + ;; + # Ignore these flags. + -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ +- |-LANG:=* | -LIST:* | -LNO:*) ++ |-LANG:=* | -LIST:* | -LNO:* | -link) + ;; + -lkernel32) + test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" +@@ -10316,8 +10349,8 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "linking to Fortran libraries from C fails +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "linking to Fortran libraries from C fails ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -10478,8 +10511,8 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compile a simple Fortran program +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compile a simple Fortran program ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +@@ -10572,7 +10605,7 @@ + ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -mieee-fp" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -mieee-fp... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10627,7 +10660,7 @@ + ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -mieee" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -mieee... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10678,7 +10711,7 @@ + ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -ieee" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -ieee... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10728,7 +10761,7 @@ + ac_safe=`echo "-fpe1" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -fpe1" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -fpe1... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10797,7 +10830,7 @@ + $as_echo "$as_me: WARNING: Fortran compiler or wrapper script for f2c that functions" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: as a Fortran compiler installed and in your path." >&5 + $as_echo "$as_me: WARNING: as a Fortran compiler installed and in your path." >&2;} +- as_fn_error "See the file INSTALL for more information." "$LINENO" 5 ++ as_fn_error $? "See the file INSTALL for more information." "$LINENO" 5 + fi + + XTRA_CRUFT_SH_LDFLAGS= +@@ -10816,7 +10849,7 @@ + ac_safe=`echo "-ffloat-store" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -ffloat-store" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -ffloat-store... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -11117,8 +11150,7 @@ + save_LIBS="$LIBS"; LIBS="$LIBS" + as_ac_var=`$as_echo "ac_cv_func_$sgemm" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$sgemm" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + acx_blas_ok=yes + fi + +@@ -11175,7 +11207,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_f77blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lf77blas" >&5 + $as_echo_n "checking for $sgemm in -lf77blas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11218,8 +11250,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 + $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } + if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : +@@ -11324,7 +11355,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5 + $as_echo_n "checking for $sgemm in -lblas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11367,12 +11398,11 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + as_ac_Lib=`$as_echo "ac_cv_lib_dgemm_$dgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dgemm in -ldgemm" >&5 + $as_echo_n "checking for $dgemm in -ldgemm... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11415,12 +11445,11 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + as_ac_Lib=`$as_echo "ac_cv_lib_sgemm_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsgemm" >&5 + $as_echo_n "checking for $sgemm in -lsgemm... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11463,8 +11492,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas" + fi + +@@ -11479,7 +11507,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_cxml_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcxml" >&5 + $as_echo_n "checking for $sgemm in -lcxml... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11522,8 +11550,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes;BLAS_LIBS="-lcxml" + fi + +@@ -11534,7 +11561,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_dxml_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -ldxml" >&5 + $as_echo_n "checking for $sgemm in -ldxml... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11577,8 +11604,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes;BLAS_LIBS="-ldxml" + fi + +@@ -11635,7 +11661,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_sunperf_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsunperf" >&5 + $as_echo_n "checking for $sgemm in -lsunperf... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11678,8 +11704,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS_LIBS="-lsunperf -lsunmath" + acx_blas_ok=yes + fi +@@ -11694,7 +11719,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_scs_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lscs" >&5 + $as_echo_n "checking for $sgemm in -lscs... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11737,8 +11762,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lscs" + fi + +@@ -11749,7 +11773,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_complib.sgimath_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcomplib.sgimath" >&5 + $as_echo_n "checking for $sgemm in -lcomplib.sgimath... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11792,8 +11816,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath" + fi + +@@ -11804,7 +11827,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5 + $as_echo_n "checking for $sgemm in -lblas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11847,12 +11870,11 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + as_ac_Lib=`$as_echo "ac_cv_lib_essl_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lessl" >&5 + $as_echo_n "checking for $sgemm in -lessl... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11895,8 +11917,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas" + fi + +@@ -11909,7 +11930,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5 + $as_echo_n "checking for $sgemm in -lblas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11952,8 +11973,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lblas" + fi + +@@ -11996,8 +12016,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12031,8 +12051,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12064,8 +12084,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12096,8 +12116,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12128,8 +12148,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12160,8 +12180,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12312,8 +12332,7 @@ + save_LIBS="$LIBS"; LIBS="$LIBS $BLAS_LIBS $FLIBS" + as_ac_var=`$as_echo "ac_cv_func_$cheev" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$cheev" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + acx_lapack_ok=yes + fi + +@@ -12327,7 +12346,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cheev in -l$lapack" >&5 + $as_echo_n "checking for $cheev in -l$lapack... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12370,8 +12389,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_lapack_ok=yes; LAPACK_LIBS="-l$lapack" + fi + +@@ -12441,7 +12459,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_qrupdate_$sqr1up" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sqr1up in -lqrupdate" >&5 + $as_echo_n "checking for $sqr1up in -lqrupdate... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12484,8 +12502,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + QRUPDATE_LIBS="-lqrupdate"; with_qrupdate=yes + fi + +@@ -12521,8 +12538,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -12667,8 +12683,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -12941,8 +12956,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13034,8 +13048,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13125,8 +13138,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13277,8 +13289,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13369,9 +13380,10 @@ + warn_arpack="arpack not found. This will result in a lack of the eigs function." + if test "$with_arpack" = yes; then + with_arpack=no +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for F77_FUNC(dseupd,DSEUPD) in -larpack" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_arpack_F77_FUNC(dseupd,DSEUPD)" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for F77_FUNC(dseupd,DSEUPD) in -larpack" >&5 + $as_echo_n "checking for F77_FUNC(dseupd,DSEUPD) in -larpack... " >&6; } +-if test "${ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_+set}" = set; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -13403,17 +13415,18 @@ + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" >&5 +-$as_echo "$ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" >&6; } +-if test "x$ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + ARPACK_LIBS="-larpack"; with_arpack=yes + fi + +@@ -13473,7 +13486,7 @@ + if $STATIC_LIBS || $SHARED_LIBS; then + true + else +- as_fn_error "You can't disable building static AND shared libraries!" "$LINENO" 5 ++ as_fn_error $? "You can't disable building static AND shared libraries!" "$LINENO" 5 + fi + + # Check whether --enable-rpath was given. +@@ -14168,9 +14181,8 @@ + if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (short) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (short) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_short=0 + fi +@@ -14202,9 +14214,8 @@ + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (int) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (int) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_int=0 + fi +@@ -14236,9 +14247,8 @@ + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long=0 + fi +@@ -14270,9 +14280,8 @@ + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long long) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long_long=0 + fi +@@ -14435,8 +14444,7 @@ + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + + cat >>confdefs.h <<_ACEOF + #define CRAY_STACKSEG_END $ac_func +@@ -14707,10 +14715,8 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: guessing no" >&5 ++$as_echo "guessing no" >&6; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14811,9 +14817,8 @@ + if test "$ac_cv_type_long_double" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long double) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long double) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long_double=0 + fi +@@ -14958,7 +14963,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 + $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Header+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14993,8 +14998,7 @@ + eval ac_res=\$$as_ac_Header + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 + _ACEOF +@@ -15240,8 +15244,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -15514,10 +15517,10 @@ + + + if test "$have_fnmatch" != yes || test "$have_glob" != yes; then +- as_fn_error "You are required to have fnmatch and glob" "$LINENO" 5 ++ as_fn_error $? "You are required to have fnmatch and glob" "$LINENO" 5 + fi + else +- as_fn_error "You are required to have fnmatch.h and glob.h" "$LINENO" 5 ++ as_fn_error $? "You are required to have fnmatch.h and glob.h" "$LINENO" 5 + fi + + ### Checks for functions and variables. +@@ -15537,8 +15540,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -15591,8 +15593,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -15760,10 +15761,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++ octave_cv_strptime_broken=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -16057,8 +16055,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16194,8 +16191,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16240,7 +16236,7 @@ + ac_safe=`echo "-rdynamic" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -rdynamic" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -rdynamic... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -16743,8 +16739,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16756,8 +16751,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16786,8 +16780,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16799,8 +16792,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -17088,7 +17080,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -l${termlib}" >&5 + $as_echo_n "checking for tputs in -l${termlib}... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -17131,8 +17123,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + TERMLIBS="${TERMLIBS} -l${termlib}" + fi + +@@ -17221,7 +17212,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I need GNU Readline 4.2 or later" >&5 + $as_echo "$as_me: WARNING: I need GNU Readline 4.2 or later" >&2;} +- as_fn_error "this is fatal unless you specify --disable-readline" "$LINENO" 5 ++ as_fn_error $? "this is fatal unless you specify --disable-readline" "$LINENO" 5 + + fi + +@@ -17529,8 +17520,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -17667,7 +17657,7 @@ + { + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in $TMPDIR" "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in $TMPDIR" "$LINENO" 5 + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris +@@ -17708,7 +17698,7 @@ + + SED=$octave_cv_path_sed + if test -z "$SED"; then +- as_fn_error "no usable version of sed found" "$LINENO" 5 ++ as_fn_error $? "no usable version of sed found" "$LINENO" 5 + fi + fi + +@@ -17879,7 +17869,7 @@ + elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy + else +- as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 ++ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +@@ -18655,7 +18645,7 @@ + ac_safe=`echo "-Wall" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wall" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -Wall... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18720,7 +18710,7 @@ + ac_safe=`echo "-W" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -W" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -W... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18785,7 +18775,7 @@ + ac_safe=`echo "-Wshadow" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wshadow" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -Wshadow... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18850,7 +18840,7 @@ + ac_safe=`echo "-Wformat" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wformat" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -Wformat... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18916,7 +18906,7 @@ + ac_safe=`echo "-Wall" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wall" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wall... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18981,7 +18971,7 @@ + ac_safe=`echo "-W" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -W" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -W... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19046,7 +19036,7 @@ + ac_safe=`echo "-Wshadow" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wshadow" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wshadow... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19111,7 +19101,7 @@ + ac_safe=`echo "-Wold-style-cast" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wold-style-cast" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wold-style-cast... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19176,7 +19166,7 @@ + ac_safe=`echo "-Wformat" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wformat" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wformat... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19261,7 +19251,7 @@ + ac_safe=`echo "$flag" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts $flag" >&5 + $as_echo_n "checking whether ${CC-cc} accepts $flag... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19328,7 +19318,7 @@ + ac_safe=`echo "$flag" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts $flag" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts $flag... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19503,6 +19493,7 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -19664,19 +19655,19 @@ + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -19872,7 +19863,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -19926,7 +19917,7 @@ + # values after options handling. + ac_log=" + This file was extended by $as_me, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -19966,6 +19957,7 @@ + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -19988,12 +19980,13 @@ + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.64, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.67, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -20010,11 +20003,16 @@ + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -20028,12 +20026,15 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -20046,7 +20047,7 @@ + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -20055,7 +20056,7 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -20142,7 +20143,7 @@ + "libcruft/blas-xtra/Makefile") CONFIG_FILES="$CONFIG_FILES libcruft/blas-xtra/Makefile" ;; + "libcruft/lapack-xtra/Makefile") CONFIG_FILES="$CONFIG_FILES libcruft/lapack-xtra/Makefile" ;; + +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + esac + done + +@@ -20180,7 +20181,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -20197,7 +20198,7 @@ + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -20211,18 +20212,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -20244,7 +20245,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -20258,7 +20259,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -20311,20 +20312,28 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -20352,7 +20361,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -20437,7 +20446,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -20450,7 +20459,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -20478,7 +20487,7 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -20505,7 +20514,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -20636,22 +20645,22 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -20662,19 +20671,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error "could not create -" "$LINENO" 5 ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + ;; + +@@ -20698,7 +20707,7 @@ + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -20719,7 +20728,7 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 + fi + + # +@@ -20860,7 +20869,7 @@ + # The eval makes quoting arguments work. + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || +- as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 ++ as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 + fi + + cd "$ac_popdir" diff --git a/octave/patches/020-no-x-windows.patch b/octave/patches/020-no-x-windows.patch new file mode 100644 index 0000000..9c98466 --- /dev/null +++ b/octave/patches/020-no-x-windows.patch @@ -0,0 +1,26 @@ +Index: octave-3.2.4/configure +=================================================================== +--- octave-3.2.4.orig/configure 2011-01-02 15:14:21.000000000 +0100 ++++ octave-3.2.4/configure 2011-01-02 15:14:32.000000000 +0100 +@@ -6892,7 +6892,7 @@ + $as_echo "libraries $x_libraries, headers $x_includes" >&6; } + fi + +-if test "$have_x"; then ++if test "$have_x" = "yes"; then + + $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h + +Index: octave-3.2.4/configure.in +=================================================================== +--- octave-3.2.4.orig/configure.in 2011-01-02 15:14:20.000000000 +0100 ++++ octave-3.2.4/configure.in 2011-01-02 15:14:25.000000000 +0100 +@@ -258,7 +258,7 @@ + ACX_PTHREAD + + AC_PATH_X +-if test "$have_x"; then ++if test "$have_x" = "yes"; then + AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11]) + + if test "$x_includes" != "NONE"; then