From: Luca Heltai Date: Wed, 27 Feb 2013 15:38:21 +0000 (+0000) Subject: Fixed configure script for intel compilers which advertise as icc version XX (gcc... X-Git-Tag: v8.0.0~1130 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f71ef7f70ebacd7bcaafa197dcd725e7954107;p=dealii.git Fixed configure script for intel compilers which advertise as icc version XX (gcc version YY compatibility). These were recognized as gcc instead of icc. git-svn-id: https://svn.dealii.org/trunk@28615 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index a50c85b130..9c7791ed06 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -89,6 +89,16 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl fi fi + dnl This got even more complicated when icc decided to advertise as + dnl "icc version XX (gcc version 4.2.2 compatibility)", in which + dnl case the previous script would give a false positive. + if test "$GXX" = "yes" ; then + GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "icc version"` + if test "x$GXX_VERSION_STRING" != "x" ; then + GXX=no + fi + fi + dnl And because it is so convenient, the PathScale compiler also identifies dnl itself as GCC... if test "$GXX" = "yes" ; then diff --git a/deal.II/configure b/deal.II/configure index ed7813e96f..fd00f246ac 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,12 +1,14 @@ #! /bin/sh # From configure.in Revision: 27277 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for deal.II 7.3.pre. +# Generated by GNU Autoconf 2.65 for deal.II 7.3.pre. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -90,7 +92,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,31 +136,6 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -193,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" +test x\$exitcode = x0 || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -239,25 +214,14 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -356,18 +320,10 @@ $as_echo X"$as_dir" | 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 - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -404,19 +360,19 @@ else fi # as_fn_arith -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error 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=$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 + 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 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -489,10 +445,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -527,16 +479,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -548,8 +500,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -562,7 +534,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -916,9 +888,8 @@ do fi case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -963,7 +934,7 @@ do 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 @@ -989,7 +960,7 @@ do 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 @@ -1193,7 +1164,7 @@ do 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 @@ -1209,7 +1180,7 @@ do 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 @@ -1239,8 +1210,8 @@ do | --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." ;; *=*) @@ -1248,7 +1219,7 @@ Try \`$0 --help' for more information" # 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 ;; @@ -1258,7 +1229,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac @@ -1266,13 +1237,13 @@ done 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 @@ -1295,7 +1266,7 @@ do [\\/$]* | ?:[\\/]* ) 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' @@ -1309,6 +1280,8 @@ target=$target_alias 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 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1323,9 +1296,9 @@ test "$silent" = yes && exec 6>/dev/null 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. @@ -1364,11 +1337,11 @@ else 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 @@ -1408,7 +1381,7 @@ Configuration: --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 @@ -1664,9 +1637,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF deal.II configure 7.3.pre -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.65 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1710,7 +1683,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1748,7 +1721,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -1780,7 +1753,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -1794,7 +1767,7 @@ fi # interfere with the next link command; also delete a directory that is # 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; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_cxx_try_link @@ -1836,7 +1809,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_cxx_try_run @@ -1849,7 +1822,7 @@ ac_fn_cxx_check_func () 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 eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1904,7 +1877,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_cxx_check_func @@ -1917,7 +1890,7 @@ ac_fn_cxx_check_header_compile () 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 eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1935,7 +1908,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_cxx_check_header_compile @@ -1960,7 +1933,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { + test $ac_status = 0; } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : @@ -1971,7 +1944,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_cxx_try_cpp @@ -1984,10 +1957,10 @@ fi ac_fn_cxx_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2023,7 +1996,7 @@ if ac_fn_cxx_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -2046,15 +2019,17 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------- ## +( cat <<\_ASBOX +## -------------------------------- ## ## Report this to dealii@dealii.org ## -## -------------------------------- ##" +## -------------------------------- ## +_ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2063,7 +2038,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_cxx_check_header_mongrel cat >config.log <<_ACEOF @@ -2071,7 +2046,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by deal.II $as_me 7.3.pre, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2181,9 +2156,11 @@ trap 'exit_status=$? { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -2217,9 +2194,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -2232,9 +2211,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -2248,9 +2229,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -2305,12 +2288,7 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # 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 + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2325,11 +2303,7 @@ do { $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" \ - || { { $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; } + . "$ac_site_file" fi done @@ -2395,7 +2369,7 @@ if $ac_cache_corrupted; then $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. ## @@ -2418,22 +2392,16 @@ ac_config_headers="$ac_config_headers include/deal.II/base/config.h" ac_aux_dir= for ac_dir in contrib/config "$srcdir"/contrib/config; do - 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 + 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 done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in contrib/config \"$srcdir\"/contrib/config" "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in contrib/config \"$srcdir\"/contrib/config" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2482,27 +2450,27 @@ DEAL2_DIR="$DEAL_II_PATH" # 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; } -if ${ac_cv_build+:} false; then : +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias 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='-' @@ -2520,14 +2488,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then 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 @@ -2535,7 +2503,7 @@ fi $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='-' @@ -2553,14 +2521,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : +if test "${ac_cv_target+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi @@ -2568,7 +2536,7 @@ fi $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; +*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2625,7 +2593,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : +if test "${ac_cv_prog_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -2637,7 +2605,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2664,7 +2632,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI C++ compiler" >&5 $as_echo_n "checking for MPI C++ compiler... " >&6; } if test "x$CXX" = "x" ; then - as_fn_error $? "none found" "$LINENO" 5 + as_fn_error "none found" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } @@ -2679,7 +2647,7 @@ $as_echo_n "checking for MPI C compiler... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: mpicc" >&5 $as_echo "mpicc" >&6; } else - as_fn_error $? "no MPI C compiler found" "$LINENO" 5 + as_fn_error "no MPI C compiler found" "$LINENO" 5 fi fi @@ -2701,7 +2669,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2713,7 +2681,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2741,7 +2709,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2753,7 +2721,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2794,7 +2762,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2806,7 +2774,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2834,7 +2802,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2847,7 +2815,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2893,7 +2861,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2905,7 +2873,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2937,7 +2905,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2949,7 +2917,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2991,8 +2959,8 @@ fi 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 @@ -3106,8 +3074,9 @@ 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_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "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; } @@ -3149,8 +3118,8 @@ done 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 conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3207,9 +3176,9 @@ $as_echo "$ac_try_echo"; } >&5 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. +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi @@ -3220,7 +3189,7 @@ 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 ${ac_cv_objext+:} false; then : +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3260,8 +3229,8 @@ 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_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 @@ -3271,7 +3240,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3308,7 +3277,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3386,7 +3355,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3395,7 +3364,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3498,7 +3468,7 @@ CFLAGS="$OLDCFLAGS" set dummy $testprog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_CC+:} false; then : +if test "${ac_cv_path_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else case $CC in @@ -3512,7 +3482,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3554,7 +3524,7 @@ if test -z "$CXX"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : +if test "${ac_cv_prog_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -3566,7 +3536,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3598,7 +3568,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -3610,7 +3580,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3676,7 +3646,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3713,7 +3683,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : +if test "${ac_cv_prog_cxx_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -3813,7 +3783,7 @@ CXXFLAGS="$OLDCXXFLAGS" set dummy $testprog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_CXX+:} false; then : +if test "${ac_cv_path_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else case $CXX in @@ -3827,7 +3797,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3860,6 +3830,13 @@ fi fi fi + if test "$GXX" = "yes" ; then + GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "icc version"` + if test "x$GXX_VERSION_STRING" != "x" ; then + GXX=no + fi + fi + if test "$GXX" = "yes" ; then GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "PathScale"` if test "x$GXX_VERSION_STRING" != "x" ; then @@ -3904,14 +3881,14 @@ $as_echo "C++ compiler is IBM xlC" >&6; } *7.0* | *7.1* | *7.2* | *7.3*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is $mips_pro" >&5 $as_echo "C++ compiler is $mips_pro" >&6; } - as_fn_error $? "This compiler is not supported" "$LINENO" 5 + as_fn_error "This compiler is not supported" "$LINENO" 5 GXX_VERSION=MIPSpro7.3 GXX_VERSION_DETAILED="$GXX_VERSION" ;; *7.4) { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is MIPSpro compiler 7.4" >&5 $as_echo "C++ compiler is MIPSpro compiler 7.4" >&6; } - as_fn_error $? "This compiler is not supported. Use MIPSPro compiler 7.4x" "$LINENO" 5 + as_fn_error "This compiler is not supported. Use MIPSPro compiler 7.4x" "$LINENO" 5 GXX_VERSION=MIPSpro7.4 GXX_VERSION_DETAILED="$GXX_VERSION" ;; @@ -4387,8 +4364,8 @@ $as_echo_n "checking whether std::thread actually works... " >&6; } 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5205,8 +5182,8 @@ $as_echo_n "checking whether std::thread actually works... " >&6; } 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5514,8 +5491,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGSO="$CXXFLAGSO -q -O2" CXXFLAGSPIC="" LDFLAGSPIC="" - as_fn_error please remove this message from aclocal.m4 and call autoconf and configure. If you do not understand this "Attention! deal.II is not known to work with Borland C++! - If you intend to port it to Borland C++" "$LINENO" 5 + { as_fn_set_status please remove this message from aclocal.m4 and call autoconf and configure. If you do not understand this +as_fn_error "Attention! deal.II is not known to work with Borland C++! + If you intend to port it to Borland C++" "$LINENO" 5; } ;; pathscale_cc) @@ -5791,13 +5769,13 @@ $as_echo "C compiler is IBM xlC" >&6; } *7.0* | *7.1* | *7.2* | *7.3*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is $mips_pro" >&5 $as_echo "C compiler is $mips_pro" >&6; } - as_fn_error $? "This compiler is not supported" "$LINENO" 5 + as_fn_error "This compiler is not supported" "$LINENO" 5 CC_VERSION=MIPSpro7.3 ;; *7.4) { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is MIPSpro compiler 7.4" >&5 $as_echo "C compiler is MIPSpro compiler 7.4" >&6; } - as_fn_error $? "This compiler is not supported. Use MIPSPro compiler 7.4x" "$LINENO" 5 + as_fn_error "This compiler is not supported. Use MIPSPro compiler 7.4x" "$LINENO" 5 CC_VERSION=MIPSpro7.4 ;; *7.41* | *7.42* | *7.43* | *7.44*) @@ -6115,7 +6093,7 @@ fi if test "$enablethreads" = yes ; then case "$target" in *cygwin* ) - as_fn_error $? "Multithreading is not supported on CygWin" "$LINENO" 5 + as_fn_error "Multithreading is not supported on CygWin" "$LINENO" 5 ;; esac @@ -6164,7 +6142,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "$thread_flag" = invalid_last_entry ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no flag found!" >&5 $as_echo "no flag found!" >&6; } - as_fn_error $? "Could not determine multithreading flag for this platform. Aborting!" "$LINENO" 5 + as_fn_error "Could not determine multithreading flag for this platform. Aborting!" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: -$thread_flag" >&5 $as_echo "-$thread_flag" >&6; } @@ -6246,7 +6224,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; *) - as_fn_error $? "No threading compiler options for this C++ compiler specified at present" "$LINENO" 5 + as_fn_error "No threading compiler options for this C++ compiler specified at present" "$LINENO" 5 exit 1 ;; esac @@ -6286,7 +6264,7 @@ $as_echo "ok" >&6; } else - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error "not found" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6325,7 +6303,7 @@ $as_echo "ok" >&6; } else - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error "not found" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6367,7 +6345,7 @@ $as_echo "ok" >&6; } else - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error "not found" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8058,8 +8036,8 @@ $as_echo_n "checking for minimal std::vector capacity... " >&6; } 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8075,7 +8053,7 @@ int main () { _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : - as_fn_error $? "impossible result -- aborting" "$LINENO" 5 + as_fn_error "impossible result -- aborting" "$LINENO" 5 else @@ -8100,8 +8078,8 @@ $as_echo_n "checking for minimal std::vector capacity... " >&6; } 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8117,7 +8095,7 @@ int main () { _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : - as_fn_error $? "impossible result -- aborting" "$LINENO" 5 + as_fn_error "impossible result -- aborting" "$LINENO" 5 else @@ -8662,7 +8640,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -8683,7 +8662,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : + if test "${ac_cv_prog_CXXCPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded @@ -8713,7 +8692,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -8729,11 +8708,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -8772,7 +8751,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -8788,18 +8767,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f 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=cpp @@ -8811,7 +8790,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -8825,7 +8804,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -8860,7 +8839,7 @@ esac 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 @@ -8874,7 +8853,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -8891,7 +8870,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -8926,7 +8905,7 @@ esac 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 @@ -8941,7 +8920,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9058,7 +9037,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -9076,7 +9056,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -9100,7 +9081,7 @@ done for ac_func in times do : ac_fn_cxx_check_func "$LINENO" "times" "ac_cv_func_times" -if test "x$ac_cv_func_times" = xyes; then : +if test "x$ac_cv_func_times" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_TIMES 1 _ACEOF @@ -9121,8 +9102,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_fn_error "cannot run test program while cross compiling +See \`config.log' for more details." "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9178,7 +9159,7 @@ if test "x$F77" = "x" ; then set dummy gfortran f77 g77; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_F77+:} false; then : +if test "${ac_cv_path_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else case $F77 in @@ -9192,7 +9173,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_F77="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9219,7 +9200,7 @@ else set dummy $F77; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_F77+:} false; then : +if test "${ac_cv_path_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else case $F77 in @@ -9233,7 +9214,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_F77="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9348,7 +9329,7 @@ $as_echo "F77 compiler is unknown. no flags set!" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for e_wsfe in -lg2c" >&5 $as_echo_n "checking for e_wsfe in -lg2c... " >&6; } -if ${ac_cv_lib_g2c_e_wsfe+:} false; then : +if test "${ac_cv_lib_g2c_e_wsfe+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9382,14 +9363,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_g2c_e_wsfe" >&5 $as_echo "$ac_cv_lib_g2c_e_wsfe" >&6; } -if test "x$ac_cv_lib_g2c_e_wsfe" = xyes; then : +if test "x$ac_cv_lib_g2c_e_wsfe" = x""yes; then : F77LIBS="$F77LIBS -lg2c" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _gfortran_allocate in -lgfortran" >&5 $as_echo_n "checking for _gfortran_allocate in -lgfortran... " >&6; } -if ${ac_cv_lib_gfortran__gfortran_allocate+:} false; then : +if test "${ac_cv_lib_gfortran__gfortran_allocate+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9423,13 +9404,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gfortran__gfortran_allocate" >&5 $as_echo "$ac_cv_lib_gfortran__gfortran_allocate" >&6; } -if test "x$ac_cv_lib_gfortran__gfortran_allocate" = xyes; then : +if test "x$ac_cv_lib_gfortran__gfortran_allocate" = x""yes; then : found=1 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _gfortran_st_write_done in -lgfortran" >&5 $as_echo_n "checking for _gfortran_st_write_done in -lgfortran... " >&6; } -if ${ac_cv_lib_gfortran__gfortran_st_write_done+:} false; then : +if test "${ac_cv_lib_gfortran__gfortran_st_write_done+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9463,7 +9444,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gfortran__gfortran_st_write_done" >&5 $as_echo "$ac_cv_lib_gfortran__gfortran_st_write_done" >&6; } -if test "x$ac_cv_lib_gfortran__gfortran_st_write_done" = xyes; then : +if test "x$ac_cv_lib_gfortran__gfortran_st_write_done" = x""yes; then : found=1 fi @@ -9513,7 +9494,7 @@ $as_echo "Unknown FORTRAN compiler has been disabled!" >&6; } ;; *) - as_fn_error $? "No compiler options for F77 compiler \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" "$LINENO" 5 + as_fn_error "No compiler options for F77 compiler \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" "$LINENO" 5 ;; esac @@ -9735,7 +9716,7 @@ rm -f core conftest.err conftest.$ac_objext \ set dummy ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : +if test "${ac_cv_prog_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -9747,7 +9728,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9772,7 +9753,7 @@ fi set dummy $AR; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_AR+:} false; then : +if test "${ac_cv_path_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else case $AR in @@ -9786,7 +9767,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9813,7 +9794,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -9825,7 +9806,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9853,7 +9834,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -9865,7 +9846,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9905,7 +9886,7 @@ if test "$RANLIB" != ":" ; then set dummy $RANLIB; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RANLIB+:} false; then : +if test "${ac_cv_path_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else case $RANLIB in @@ -9919,7 +9900,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9993,7 +9974,7 @@ fi $as_echo "Disabling backward compatibility feature: \"$i\"" >&6; } ;; *) - as_fn_error $? "Backward compatibility feature \"$i\" unknown" "$LINENO" 5 + as_fn_error "Backward compatibility feature \"$i\" unknown" "$LINENO" 5 ;; esac done @@ -10016,7 +9997,7 @@ _ACEOF ;; *) - as_fn_error $? "Backward compatibility feature \"$i\" unknown" "$LINENO" 5 + as_fn_error "Backward compatibility feature \"$i\" unknown" "$LINENO" 5 ;; esac done @@ -10060,26 +10041,26 @@ fi LDFLAGS="$BOOST_LIB_DIR $LDFLAGS" ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_shared_ptr_hpp" = xyes; then : +if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then : else - as_fn_error $? "Your boost installation is incomplete!" "$LINENO" 5 + as_fn_error "Your boost installation is incomplete!" "$LINENO" 5 fi ac_fn_cxx_check_header_mongrel "$LINENO" "boost/type_traits.hpp" "ac_cv_header_boost_type_traits_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_type_traits_hpp" = xyes; then : +if test "x$ac_cv_header_boost_type_traits_hpp" = x""yes; then : else - as_fn_error $? "Your boost installation is incomplete!" "$LINENO" 5 + as_fn_error "Your boost installation is incomplete!" "$LINENO" 5 fi ac_fn_cxx_check_header_mongrel "$LINENO" "boost/tuple/tuple.hpp" "ac_cv_header_boost_tuple_tuple_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes; then : +if test "x$ac_cv_header_boost_tuple_tuple_hpp" = x""yes; then : else - as_fn_error $? "Your boost installation is incomplete!" "$LINENO" 5 + as_fn_error "Your boost installation is incomplete!" "$LINENO" 5 fi @@ -10256,7 +10237,7 @@ $as_echo "$DEAL_II_PETSC_DIR" >&6; } if test ! -d $DEAL_II_PETSC_DIR/include \ ; then - as_fn_error $? "Path to PETSc specified with --with-petsc does not point to a complete PETSc installation" "$LINENO" 5 + as_fn_error "Path to PETSc specified with --with-petsc does not point to a complete PETSc installation" "$LINENO" 5 fi fi @@ -10270,7 +10251,7 @@ $as_echo "$DEAL_II_PETSC_DIR" >&6; } if test ! -d $DEAL_II_PETSC_DIR/include \ ; then - as_fn_error $? "The path to PETSc specified in the PETSC_DIR environment variable does not point to a complete PETSc installation" "$LINENO" 5 + as_fn_error "The path to PETSc specified in the PETSC_DIR environment variable does not point to a complete PETSc installation" "$LINENO" 5 fi else USE_CONTRIB_PETSC=no @@ -10341,7 +10322,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_PETSC_ARCH" >&5 $as_echo "$DEAL_II_PETSC_ARCH" >&6; } else - as_fn_error $? "If PETSc is used, you must specify the architecture either through the PETSC_ARCH environment variable, or through the --with-petsc-arch flag" "$LINENO" 5 + as_fn_error "If PETSc is used, you must specify the architecture either through the PETSC_ARCH environment variable, or through the --with-petsc-arch flag" "$LINENO" 5 fi fi @@ -10352,10 +10333,10 @@ fi case "${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" in 3.*) if test ! -d $DEAL_II_PETSC_DIR/$DEAL_II_PETSC_ARCH/lib \ ; then - as_fn_error $? "PETSc has not been compiled for the architecture specified with --with-petsc-arch" "$LINENO" 5 + as_fn_error "PETSc has not been compiled for the architecture specified with --with-petsc-arch" "$LINENO" 5 fi ;; - *) as_fn_error $? "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 + *) as_fn_error "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 ;; esac fi @@ -10369,7 +10350,7 @@ $as_echo_n "checking for PETSc libmpiuni library... " >&6; } DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/$DEAL_II_PETSC_ARCH/lib/libmpiuni.a" fi ;; - *) as_fn_error $? "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 + *) as_fn_error "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 ;; esac @@ -10407,12 +10388,12 @@ if ac_fn_cxx_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "PETSc was not built for MPI, but deal.II is! + as_fn_error "PETSc was not built for MPI, but deal.II is! " "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; - *) as_fn_error $? "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 + *) as_fn_error "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 ;; esac else @@ -10435,12 +10416,12 @@ if ac_fn_cxx_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "PETSc was built for MPI, but deal.II is not!" "$LINENO" 5 + as_fn_error "PETSc was built for MPI, but deal.II is not!" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; - *) as_fn_error $? "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 + *) as_fn_error "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 ;; esac fi @@ -10515,13 +10496,13 @@ $as_echo "$DEAL_II_SLEPC_DIR" >&6; } if test ! -d $DEAL_II_SLEPC_DIR \ -o ! -d $DEAL_II_SLEPC_DIR/include \ ; then - as_fn_error $? "Path to SLEPc specified with --with-slepc does not point to a complete SLEPc installation" "$LINENO" 5 + as_fn_error "Path to SLEPc specified with --with-slepc does not point to a complete SLEPc installation" "$LINENO" 5 fi if test ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_PETSC_ARCH \ -o ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_PETSC_ARCH/lib \ ; then - as_fn_error $? "SLEPc has not been compiled for the PETSc architecture" "$LINENO" 5 + as_fn_error "SLEPc has not been compiled for the PETSc architecture" "$LINENO" 5 fi fi @@ -10535,7 +10516,7 @@ $as_echo "$DEAL_II_SLEPC_DIR" >&6; } if test ! -d $DEAL_II_SLEPC_DIR \ -o ! -d $DEAL_II_SLEPC_DIR/include \ ; then - as_fn_error $? "The path to SLEPc specified in the SLEPC_DIR environment variable does not point to a complete SLEPc installation" "$LINENO" 5 + as_fn_error "The path to SLEPc specified in the SLEPC_DIR environment variable does not point to a complete SLEPc installation" "$LINENO" 5 fi else USE_CONTRIB_SLEPC=no @@ -10585,7 +10566,7 @@ $as_echo "$SLEPC_VERSION" >&6; } if test "${PETSC_VERSION}" != "${SLEPC_VERSION}" \ -o "${PETSC_RELEASE}" != "${SLEPC_RELEASE}" \ ; then - as_fn_error $? "If SLEPc is used, you must use the same version number as your PETSc Installation" "$LINENO" 5 + as_fn_error "If SLEPc is used, you must use the same version number as your PETSc Installation" "$LINENO" 5 fi @@ -10620,7 +10601,7 @@ $as_echo "$DEAL_II_TRILINOS_DIR" >&6; } if test ! -d $DEAL_II_TRILINOS_DIR/include \ -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then - as_fn_error $? "Path to Trilinos specified with --with-trilinos does not point to a complete Trilinos installation" "$LINENO" 5 + as_fn_error "Path to Trilinos specified with --with-trilinos does not point to a complete Trilinos installation" "$LINENO" 5 fi DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include" @@ -10642,7 +10623,7 @@ $as_echo "$DEAL_II_TRILINOS_DIR" >&6; } if test ! -d $DEAL_II_TRILINOS_DIR/include \ -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then - as_fn_error $? "The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5 + as_fn_error "The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5 fi DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include" DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib" @@ -10675,7 +10656,7 @@ $as_echo "explicitly disabled" >&6; } $as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_INCDIR ; then - as_fn_error $? "Path to Trilinos specified with --with-trilinos-include does not point to a complete Trilinos installation" "$LINENO" 5 + as_fn_error "Path to Trilinos specified with --with-trilinos-include does not point to a complete Trilinos installation" "$LINENO" 5 fi fi @@ -10688,7 +10669,7 @@ else $as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_INCDIR ; then - as_fn_error $? "The path to Trilinos includes specified in the TRILINOS_INCDIR environment variable does not point to a valid directory" "$LINENO" 5 + as_fn_error "The path to Trilinos includes specified in the TRILINOS_INCDIR environment variable does not point to a valid directory" "$LINENO" 5 fi else if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then @@ -10723,7 +10704,7 @@ $as_echo "explicitly disabled" >&6; } $as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then - as_fn_error $? "Path to Trilinos libraries with --with-trilinos-libs does not point to a valid directory" "$LINENO" 5 + as_fn_error "Path to Trilinos libraries with --with-trilinos-libs does not point to a valid directory" "$LINENO" 5 fi fi @@ -10736,7 +10717,7 @@ else $as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then - as_fn_error $? "The path to Trilinos specified in the TRILINOS_LIBDIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5 + as_fn_error "The path to Trilinos specified in the TRILINOS_LIBDIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5 fi else if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then @@ -10778,17 +10759,17 @@ $as_echo_n "checking for Trilinos version... " >&6; } $as_echo "$DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_II_TRILINOS_VERSION_SUBMINOR" >&6; } if test "$DEAL_II_TRILINOS_VERSION_MAJOR" -lt 10 ; then - as_fn_error $? "Trilinos versions prior to 10.0 are no longer supported with deal.II." "$LINENO" 5 + as_fn_error "Trilinos versions prior to 10.0 are no longer supported with deal.II." "$LINENO" 5 fi if test "$DEAL_II_TRILINOS_VERSION_MAJOR" = 10 -a "$DEAL_II_TRILINOS_VERSION_MINOR" = 6 ; then - as_fn_error $? "Trilinos versions 10.6.x have bugs that make it incompatible + as_fn_error "Trilinos versions 10.6.x have bugs that make it incompatible with deal.II. Please use versions before 10.6 or after 10.8.1." "$LINENO" 5 fi if test "$DEAL_II_TRILINOS_VERSION_MAJOR" = 10 \ -a "$DEAL_II_TRILINOS_VERSION_MINOR" = 8 \ -a "$DEAL_II_TRILINOS_VERSION_SUBMINOR" -lt 2 ; then - as_fn_error $? "Trilinos versions 10.8.0 and 10.8.1 have bugs that make it incompatible + as_fn_error "Trilinos versions 10.8.0 and 10.8.1 have bugs that make it incompatible with deal.II. Please use versions before 10.6 or after 10.8.1." "$LINENO" 5 fi @@ -10853,7 +10834,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "Trilinos was not built for MPI, but deal.II is!" "$LINENO" 5 + as_fn_error "Trilinos was not built for MPI, but deal.II is!" "$LINENO" 5 exit 1; fi @@ -10883,7 +10864,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "Trilinos was built for MPI, but deal.II is not!" "$LINENO" 5 + as_fn_error "Trilinos was built for MPI, but deal.II is not!" "$LINENO" 5 exit 1; fi @@ -10927,16 +10908,16 @@ $as_echo "no" >&6; } fi if test "x${DEAL_II_TRILINOS_SHARED}${DEAL_II_TRILINOS_STATIC}" = "x" ; then - as_fn_error $? "Unable to determine whether Trilinos uses shared or static libraries." "$LINENO" 5 + as_fn_error "Unable to determine whether Trilinos uses shared or static libraries." "$LINENO" 5 fi if test "x$enableshared" = "xyes" -a "x$DEAL_II_TRILINOS_SHARED" != "xyes" ; then - as_fn_error $? "When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" "$LINENO" 5 + as_fn_error "When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" "$LINENO" 5 fi if test "x$enableshared" = "xno" -a "x$DEAL_II_TRILINOS_STATIC" != "xyes" ; then - as_fn_error $? "When building deal.II with static libraries, Trilinos also needs to be built with static libraries" "$LINENO" 5 + as_fn_error "When building deal.II with static libraries, Trilinos also needs to be built with static libraries" "$LINENO" 5 fi if test "x$enableshared" = "xyes" ; then @@ -10966,7 +10947,7 @@ $as_echo_n "checking for the set of Trilinos libraries... " >&6; } $DEAL_II_TRILINOS_VERSION_MINOR -lt 4 ; then : else - as_fn_error $? "package file TrilinosConfig.cmake not found" "$LINENO" 5 + as_fn_error "package file TrilinosConfig.cmake not found" "$LINENO" 5 fi DEAL_II_TRILINOS_LIBS="stratimikosamesos stratimikosaztecoo stratimikosifpack stratimikosml stratimikos ml amesos belos ifpack aztecoo rtop sacado thyra thyraepetra thyraepetraext epetraext epetra teuchos triutils" fi @@ -11105,12 +11086,12 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "*** Your Trilinos installation is not compatible with the C++ standard selected for this compiler. See the deal.II FAQ page for a solution. ***" "$LINENO" 5 + as_fn_error "*** Your Trilinos installation is not compatible with the C++ standard selected for this compiler. See the deal.II FAQ page for a solution. ***" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - as_fn_error $? "File $DEAL_II_TRILINOS_INCDIR/Sacado_cmath.hpp not found." "$LINENO" 5 + as_fn_error "File $DEAL_II_TRILINOS_INCDIR/Sacado_cmath.hpp not found." "$LINENO" 5 fi for ac_header in Amesos.h \ @@ -11135,14 +11116,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - as_fn_error $? "The Trilinos installation is missing one or more header files necessary for the deal.II Trilinos interfaces. Please re-install Trilinos with the missing Trilinos sub-packages enabled." "$LINENO" 5 + as_fn_error "The Trilinos installation is missing one or more header files necessary for the deal.II Trilinos interfaces. Please re-install Trilinos with the missing Trilinos sub-packages enabled." "$LINENO" 5 fi @@ -11181,7 +11163,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -11201,7 +11183,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -11236,7 +11218,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -11254,7 +11236,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -11266,7 +11248,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11333,7 +11315,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_H5CC+:} false; then : +if test "${ac_cv_path_H5CC+set}" = set; then : $as_echo_n "(cached) " >&6 else case $H5CC in @@ -11347,7 +11329,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_H5CC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11462,7 +11444,7 @@ $as_echo "yes (version $DEAL_II_HDF5_VERSION)" >&6; } LDFLAGS=$DEAL_II_HDF5_LDFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhdf5_hl" >&5 $as_echo_n "checking for main in -lhdf5_hl... " >&6; } -if ${ac_cv_lib_hdf5_hl_main+:} false; then : +if test "${ac_cv_lib_hdf5_hl_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11490,7 +11472,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hdf5_hl_main" >&5 $as_echo "$ac_cv_lib_hdf5_hl_main" >&6; } -if test "x$ac_cv_lib_hdf5_hl_main" = xyes; then : +if test "x$ac_cv_lib_hdf5_hl_main" = x""yes; then : DEAL_II_HDF5_LDFLAGS="$DEAL_II_HDF5_LDFLAGS -lhdf5_hl" fi ac_cv_lib_hdf5_hl=ac_cv_lib_hdf5_hl_main @@ -11538,7 +11520,7 @@ $as_echo "explicitly disabled" >&6; } $as_echo "$DEAL_II_ARPACK_DIR" >&6; } if test ! -d $DEAL_II_ARPACK_DIR \ ; then - as_fn_error $? "Path to ARPACK specified with --with-arpack does not point to a complete ARPACK installation" "$LINENO" 5 + as_fn_error "Path to ARPACK specified with --with-arpack does not point to a complete ARPACK installation" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARPACK library architecture" >&5 @@ -11587,7 +11569,7 @@ $as_echo "$DEAL_II_MUMPS_DIR" >&6; } -o ! -d $DEAL_II_MUMPS_DIR/include \ -o ! -d $DEAL_II_MUMPS_DIR/lib \ ; then - as_fn_error $? "Path to MUMPS specified with --with-mumps does not point to a complete MUMPS installation" "$LINENO" 5 + as_fn_error "Path to MUMPS specified with --with-mumps does not point to a complete MUMPS installation" "$LINENO" 5 fi fi @@ -11610,11 +11592,11 @@ if test "${with_scalapack+set}" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_SCALAPACK_DIR" >&5 $as_echo "$DEAL_II_SCALAPACK_DIR" >&6; } if test ! -d $DEAL_II_SCALAPCK_DIR ; then - as_fn_error $? "The path to SCALAPACK specified with --with-scalapack does t point to a complete SCALAPACK installation" "$LINENO" 5 + as_fn_error "The path to SCALAPACK specified with --with-scalapack does t point to a complete SCALAPACK installation" "$LINENO" 5 fi else - as_fn_error $? "If MUMPS is used, the path to SCALAPACK must be specified with --with-scalapack" "$LINENO" 5 + as_fn_error "If MUMPS is used, the path to SCALAPACK must be specified with --with-scalapack" "$LINENO" 5 fi @@ -11629,11 +11611,11 @@ if test "${with_blacs+set}" = set; then : $as_echo "$DEAL_II_BLACS_DIR" >&6; } if test ! -d $DEAL_II_BLACS_DIR \ -o ! -d $DEAL_II_BLACS_DIR/LIB ; then - as_fn_error $? "The path to BLACS specified with --with-blacs does not point to a complete BLACS installation" "$LINENO" 5 + as_fn_error "The path to BLACS specified with --with-blacs does not point to a complete BLACS installation" "$LINENO" 5 fi else - as_fn_error $? "If MUMPS is used, the path to BLACS must be specified with --with-blacs" "$LINENO" 5 + as_fn_error "If MUMPS is used, the path to BLACS must be specified with --with-blacs" "$LINENO" 5 fi @@ -11688,15 +11670,15 @@ fi $as_echo "yes" >&6; } if test ! -d "${use_p4est}/DEBUG" -o ! -d "${use_p4est}/FAST" ; then - as_fn_error $? "p4est directories $use_p4est/DEBUG or $use_p4est/FAST not found" "$LINENO" 5 + as_fn_error "p4est directories $use_p4est/DEBUG or $use_p4est/FAST not found" "$LINENO" 5 fi if test "x${DEAL_II_COMPILER_SUPPORTS_MPI}" != "x1" ; then - as_fn_error $? "When using p4est you also need to enable MPI." "$LINENO" 5 + as_fn_error "When using p4est you also need to enable MPI." "$LINENO" 5 fi if test "x$enableshared" != "xyes" ; then - as_fn_error $? "When using p4est with shared libraries, you need to build + as_fn_error "When using p4est with shared libraries, you need to build deal.II with shared libraries as well." "$LINENO" 5 fi @@ -11724,7 +11706,7 @@ $as_echo "lib64" >&6; } $as_echo "lib" >&6; } DEAL_II_P4EST_LIBDIR_NAME=lib else - as_fn_error $? "could not determine whether p4est stores its library in lib/ or lib64/ directories" "$LINENO" 5 + as_fn_error "could not determine whether p4est stores its library in lib/ or lib64/ directories" "$LINENO" 5 fi fi @@ -11801,7 +11783,7 @@ if test "${with_blas+set}" = set; then : as_ac_Lib=`$as_echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daxpy_ in -l$blas" >&5 $as_echo_n "checking for daxpy_ in -l$blas... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11836,7 +11818,8 @@ fi 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 : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : LIBS="-l$blas $LIBS" @@ -11929,7 +11912,7 @@ rm -f core conftest.err conftest.$ac_objext \ as_ac_Lib=`$as_echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daxpy_ in -l$blas" >&5 $as_echo_n "checking for daxpy_ in -l$blas... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11964,7 +11947,8 @@ fi 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 : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : LIBS="-l$blas $LIBS" @@ -12050,7 +12034,7 @@ if test "${with_zlib+set}" = set; then : as_ac_Lib=`$as_echo "ac_cv_lib_$zlib''_crc32" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crc32 in -l$zlib" >&5 $as_echo_n "checking for crc32 in -l$zlib... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12085,10 +12069,11 @@ fi 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 : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes; then : +if test "x$ac_cv_header_zlib_h" = x""yes; then : LIBS="-l$zlib $LIBS" @@ -12109,7 +12094,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : +if test "${ac_cv_c_bigendian+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown @@ -12329,7 +12314,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - as_fn_error $? "unknown endianness + as_fn_error "unknown endianness presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -12339,11 +12324,11 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h as_ac_File=`$as_echo "ac_cv_file_$i/lib/tecio.a" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i/lib/tecio.a" >&5 $as_echo_n "checking for $i/lib/tecio.a... " >&6; } -if eval \${$as_ac_File+:} false; then : +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$i/lib/tecio.a"; then eval "$as_ac_File=yes" else @@ -12353,18 +12338,19 @@ fi eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : TECPLOT_LIB="$i/lib/tecio.a" fi as_ac_File=`$as_echo "ac_cv_file_$i/include/TECIO.h" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i/include/TECIO.h" >&5 $as_echo_n "checking for $i/include/TECIO.h... " >&6; } -if eval \${$as_ac_File+:} false; then : +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$i/include/TECIO.h"; then eval "$as_ac_File=yes" else @@ -12374,7 +12360,8 @@ fi eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : TECPLOT_INCLUDE_DIR=-I$i/include else TECPLOT_LIB="" @@ -12460,7 +12447,7 @@ fi fi ac_fn_cxx_check_header_mongrel "$LINENO" "netcdfcpp.h" "ac_cv_header_netcdfcpp_h" "$ac_includes_default" -if test "x$ac_cv_header_netcdfcpp_h" = xyes; then : +if test "x$ac_cv_header_netcdfcpp_h" = x""yes; then : fi @@ -12468,7 +12455,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nc_open in -lnetcdf" >&5 $as_echo_n "checking for nc_open in -lnetcdf... " >&6; } -if ${ac_cv_lib_netcdf_nc_open+:} false; then : +if test "${ac_cv_lib_netcdf_nc_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12502,7 +12489,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netcdf_nc_open" >&5 $as_echo "$ac_cv_lib_netcdf_nc_open" >&6; } -if test "x$ac_cv_lib_netcdf_nc_open" = xyes; then : +if test "x$ac_cv_lib_netcdf_nc_open" = x""yes; then : OLD_LIBS="$LIBS" @@ -12562,7 +12549,7 @@ $as_echo "$DEAL_II_METIS_DIR" >&6; } if test ! -d $DEAL_II_METIS_DIR/lib \ && test ! -d $DEAL_II_METIS_DIR/libmetis ; then - as_fn_error $? "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 + as_fn_error "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 fi if test -d $DEAL_II_METIS_DIR/lib ; then @@ -12572,7 +12559,7 @@ $as_echo "$DEAL_II_METIS_DIR" >&6; } fi if test ! -d $DEAL_II_METIS_DIR/include ; then - as_fn_error $? "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 + as_fn_error "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 fi DEAL_II_METIS_INCDIR="$DEAL_II_METIS_DIR/include" @@ -12589,7 +12576,7 @@ $as_echo "$DEAL_II_METIS_DIR" >&6; } if test ! -d $DEAL_II_METIS_DIR/lib \ && test ! -d $DEAL_II_METIS_DIR/libmetis ; then - as_fn_error $? "The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" "$LINENO" 5 + as_fn_error "The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" "$LINENO" 5 fi if test -d $DEAL_II_METIS_DIR/lib ; then @@ -12697,7 +12684,7 @@ $as_echo "#define HAVE_LIBUMFPACK 1" >>confdefs.h LDFLAGS="-L${UMFPACK_DIR}/UMFPACK $LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umfpack_di_defaults in -lumfpack" >&5 $as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } -if ${ac_cv_lib_umfpack_umfpack_di_defaults+:} false; then : +if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12731,7 +12718,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 $as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = xyes; then : +if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then : LIBS="$LIBS -lumfpack" @@ -12745,7 +12732,7 @@ else LDFLAGS="-L${UMFPACK_DIR}/lib $OLD_LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umfpack_di_defaults in -lumfpack" >&5 $as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } -if ${ac_cv_lib_umfpack_umfpack_di_defaults+:} false; then : +if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12779,7 +12766,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 $as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = xyes; then : +if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then : LIBS="$LIBS -lumfpack" @@ -12790,7 +12777,7 @@ if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = xyes; then : else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi @@ -12804,7 +12791,7 @@ fi LDFLAGS="-L${UMFPACK_DIR}/AMD/Lib $LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5 $as_echo_n "checking for amd_info in -lamd... " >&6; } -if ${ac_cv_lib_amd_amd_info+:} false; then : +if test "${ac_cv_lib_amd_amd_info+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12838,7 +12825,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_amd_amd_info" >&5 $as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = xyes; then : +if test "x$ac_cv_lib_amd_amd_info" = x""yes; then : LIBS="$LIBS -lamd" @@ -12852,7 +12839,7 @@ else LDFLAGS="-L${UMFPACK_DIR}/lib $OLD_LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5 $as_echo_n "checking for amd_info in -lamd... " >&6; } -if ${ac_cv_lib_amd_amd_info+:} false; then : +if test "${ac_cv_lib_amd_amd_info+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12886,7 +12873,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_amd_amd_info" >&5 $as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = xyes; then : +if test "x$ac_cv_lib_amd_amd_info" = x""yes; then : LIBS="$LIBS -lamd" @@ -12897,7 +12884,7 @@ if test "x$ac_cv_lib_amd_amd_info" = xyes; then : else - as_fn_error $? "installation of AMD could not be determined" "$LINENO" 5 + as_fn_error "installation of AMD could not be determined" "$LINENO" 5 fi @@ -12911,11 +12898,11 @@ fi as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/UMFPACK/Include/umfpack.h" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${UMFPACK_DIR}/UMFPACK/Include/umfpack.h" >&5 $as_echo_n "checking for ${UMFPACK_DIR}/UMFPACK/Include/umfpack.h... " >&6; } -if eval \${$as_ac_File+:} false; then : +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "${UMFPACK_DIR}/UMFPACK/Include/umfpack.h"; then eval "$as_ac_File=yes" else @@ -12925,7 +12912,8 @@ fi eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : UMFPACK_INCLUDE_DIR=-I${UMFPACK_DIR}/UMFPACK/Include @@ -12934,11 +12922,11 @@ else as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/include/suitesparse/umfpack.h" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h" >&5 $as_echo_n "checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h... " >&6; } -if eval \${$as_ac_File+:} false; then : +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "${UMFPACK_DIR}/include/suitesparse/umfpack.h"; then eval "$as_ac_File=yes" else @@ -12948,13 +12936,14 @@ fi eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : UMFPACK_INCLUDE_DIR=-I${UMFPACK_DIR}/include/suitesparse else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi @@ -12967,11 +12956,11 @@ fi as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/AMD/Include/amd.h" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${UMFPACK_DIR}/AMD/Include/amd.h" >&5 $as_echo_n "checking for ${UMFPACK_DIR}/AMD/Include/amd.h... " >&6; } -if eval \${$as_ac_File+:} false; then : +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "${UMFPACK_DIR}/AMD/Include/amd.h"; then eval "$as_ac_File=yes" else @@ -12981,7 +12970,8 @@ fi eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : UMFPACK_INCLUDE_DIR="${UMFPACK_INCLUDE_DIR} -I${UMFPACK_DIR}/AMD/Include" @@ -12990,11 +12980,11 @@ else as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/include/suitesparse/umfpack.h" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h" >&5 $as_echo_n "checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h... " >&6; } -if eval \${$as_ac_File+:} false; then : +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "${UMFPACK_DIR}/include/suitesparse/umfpack.h"; then eval "$as_ac_File=yes" else @@ -13004,13 +12994,14 @@ fi eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : UMFPACK_INCLUDE_DIR="${UMFPACK_INCLUDE_DIR} -I${UMFPACK_DIR}/include/suitesparse" else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi @@ -13024,11 +13015,11 @@ fi as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/UFconfig/UFconfig.h" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${UMFPACK_DIR}/UFconfig/UFconfig.h" >&5 $as_echo_n "checking for ${UMFPACK_DIR}/UFconfig/UFconfig.h... " >&6; } -if eval \${$as_ac_File+:} false; then : +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "${UMFPACK_DIR}/UFconfig/UFconfig.h"; then eval "$as_ac_File=yes" else @@ -13038,13 +13029,14 @@ fi eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : UMFPACK_INCLUDE_DIR="${UMFPACK_INCLUDE_DIR} -I${UMFPACK_DIR}/UFconfig" else - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error "not found" "$LINENO" 5 fi @@ -13061,27 +13053,27 @@ fi CXXFLAGS="-I$UMFPACK_INCDIR $CXXFLAGS" CPPFLAGS="-I$UMFPACK_INCDIR $CPPFLAGS" ac_fn_cxx_check_header_mongrel "$LINENO" "umfpack.h" "ac_cv_header_umfpack_h" "$ac_includes_default" -if test "x$ac_cv_header_umfpack_h" = xyes; then : +if test "x$ac_cv_header_umfpack_h" = x""yes; then : else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi ac_fn_cxx_check_header_mongrel "$LINENO" "amd.h" "ac_cv_header_amd_h" "$ac_includes_default" -if test "x$ac_cv_header_amd_h" = xyes; then : +if test "x$ac_cv_header_amd_h" = x""yes; then : else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi ac_fn_cxx_check_header_mongrel "$LINENO" "UFconfig.h" "ac_cv_header_UFconfig_h" "$ac_includes_default" -if test "x$ac_cv_header_UFconfig_h" = xyes; then : +if test "x$ac_cv_header_UFconfig_h" = x""yes; then : else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi @@ -13089,7 +13081,7 @@ fi if test "x$UMFPACK_LIBDIR" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5 $as_echo_n "checking for amd_info in -lamd... " >&6; } -if ${ac_cv_lib_amd_amd_info+:} false; then : +if test "${ac_cv_lib_amd_amd_info+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13123,7 +13115,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_amd_amd_info" >&5 $as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = xyes; then : +if test "x$ac_cv_lib_amd_amd_info" = x""yes; then : LIBS="$LIBS -lamd" @@ -13133,13 +13125,13 @@ if test "x$ac_cv_lib_amd_amd_info" = xyes; then : fi else - as_fn_error $? "installation of AMD could not be determined" "$LINENO" 5 + as_fn_error "installation of AMD could not be determined" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umfpack_di_defaults in -lumfpack" >&5 $as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } -if ${ac_cv_lib_umfpack_umfpack_di_defaults+:} false; then : +if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13173,7 +13165,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 $as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = xyes; then : +if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then : LIBS="$LIBS -lumfpack" @@ -13183,14 +13175,14 @@ if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = xyes; then : fi else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5 $as_echo_n "checking for amd_info in -lamd... " >&6; } -if ${ac_cv_lib_amd_amd_info+:} false; then : +if test "${ac_cv_lib_amd_amd_info+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13224,20 +13216,20 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_amd_amd_info" >&5 $as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = xyes; then : +if test "x$ac_cv_lib_amd_amd_info" = x""yes; then : LIBS="$LIBS -lamd" else - as_fn_error $? "installation of AMD could not be determined" "$LINENO" 5 + as_fn_error "installation of AMD could not be determined" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umfpack_di_defaults in -lumfpack" >&5 $as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } -if ${ac_cv_lib_umfpack_umfpack_di_defaults+:} false; then : +if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13271,14 +13263,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 $as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = xyes; then : +if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then : LIBS="$LIBS -lumfpack" else - as_fn_error $? "installation of UMFPACK could not be determined" "$LINENO" 5 + as_fn_error "installation of UMFPACK could not be determined" "$LINENO" 5 fi @@ -13299,7 +13291,7 @@ if test "${with_lapack+set}" = set; then : as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_dgbsv_" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgbsv_ in -l$lapack" >&5 $as_echo_n "checking for dgbsv_ in -l$lapack... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13334,7 +13326,8 @@ fi 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 : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : LIBS="-l$lapack $LIBS" @@ -13346,7 +13339,7 @@ $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h USE_CONTRIB_LAPACK='yes' else - as_fn_error $? "LAPACK library $lapack not found" "$LINENO" 5 + as_fn_error "LAPACK library $lapack not found" "$LINENO" 5 fi @@ -13357,10 +13350,10 @@ fi if test "x$with_blas" != "x" -a "x$with_blas" != "xno" ; then ac_fn_cxx_check_func "$LINENO" "daxpy_" "ac_cv_func_daxpy_" -if test "x$ac_cv_func_daxpy_" = xyes; then : +if test "x$ac_cv_func_daxpy_" = x""yes; then : else - as_fn_error $? "BLAS library not installed correctly($with_blas)" "$LINENO" 5 + as_fn_error "BLAS library not installed correctly($with_blas)" "$LINENO" 5 fi fi @@ -13370,7 +13363,8 @@ for ac_func in daxpy_ saxpy_ dgemv_ sgemv_ dgeev_ sgeev_ dgeevx_ sgeevx_ 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13382,7 +13376,8 @@ for ac_func in dgemm_ sgemm_ dgetrf_ sgetrf_ dgetri_ sgetri_ 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13394,7 +13389,8 @@ for ac_func in dgeqrf_ sgeqrf_ dormqr_ sormqr_ dorgqr_ sorgqr_ dtrtrs_ strtrs_ 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13406,7 +13402,8 @@ for ac_func in dgetrs_ sgetrs_ dstev_ sstev_ dsygv_ ssygv_ dsygvx_ ssygvx_ 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13418,7 +13415,8 @@ for ac_func in dsyevx_ ssyevx_ 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13430,7 +13428,8 @@ for ac_func in dgesvd_ sgesvd_ dgesdd_ sgesdd_ dgelsd_ sgelsd_ 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13441,7 +13440,7 @@ done for ac_func in jn do : ac_fn_cxx_check_func "$LINENO" "jn" "ac_cv_func_jn" -if test "x$ac_cv_func_jn" = xyes; then : +if test "x$ac_cv_func_jn" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_JN 1 _ACEOF @@ -13565,7 +13564,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "invalid combination of flags!" "$LINENO" 5 + as_fn_error "invalid combination of flags!" "$LINENO" 5 exit 1; fi @@ -13592,7 +13591,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "invalid combination of flags!" "$LINENO" 5 + as_fn_error "invalid combination of flags!" "$LINENO" 5 exit 1; fi @@ -13614,8 +13613,8 @@ $as_echo_n "checking whether CPU supports SSE2... " >&6; } 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13657,8 +13656,8 @@ $as_echo_n "checking whether CPU supports AVX... " >&6; } 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13802,14 +13801,14 @@ $as_echo "$DOXYGEN" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error $? "Invalid doxygen path $DOXYGEN" "$LINENO" 5 + as_fn_error "Invalid doxygen path $DOXYGEN" "$LINENO" 5 fi else # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DOXYGEN+:} false; then : +if test "${ac_cv_path_DOXYGEN+set}" = set; then : $as_echo_n "(cached) " >&6 else case $DOXYGEN in @@ -13823,7 +13822,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13874,7 +13873,7 @@ $as_echo "1.5.x or later" >&6; } set dummy dot; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DOT+:} false; then : +if test "${ac_cv_prog_DOT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DOT"; then @@ -13886,7 +13885,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DOT="dot" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13922,7 +13921,7 @@ fi set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : +if test "${ac_cv_path_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -13936,7 +13935,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13965,7 +13964,7 @@ fi set dummy qmake; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_QMAKE+:} false; then : +if test "${ac_cv_prog_QMAKE+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$QMAKE"; then @@ -13977,7 +13976,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_QMAKE="qmake" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14003,7 +14002,7 @@ if test -n "$QMAKE" ; then set dummy $QMAKE; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_QMAKE+:} false; then : +if test "${ac_cv_path_QMAKE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $QMAKE in @@ -14017,7 +14016,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14120,7 +14119,6 @@ DEFS=-DHAVE_CONFIG_H 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$//' @@ -14137,7 +14135,7 @@ LTLIBOBJS=$ac_ltlibobjs -: "${CONFIG_STATUS=./config.status}" +: ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -14238,7 +14236,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -14284,19 +14281,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error 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=$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 + 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 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -14434,16 +14431,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -14492,7 +14489,7 @@ $as_echo X"$as_dir" | 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 @@ -14503,16 +14500,28 @@ else as_mkdir_p=false fi - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -14534,7 +14543,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by deal.II $as_me 7.3.pre, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -14596,10 +14605,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ deal.II config.status 7.3.pre -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -14615,16 +14624,11 @@ ac_need_defaults=: 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 @@ -14646,7 +14650,6 @@ do $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;; @@ -14659,7 +14662,7 @@ do 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 ;; @@ -14668,7 +14671,7 @@ Try \`$0 --help' for more information.";; 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" @@ -14688,7 +14691,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -14720,7 +14723,7 @@ do "include/deal.II/base/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/deal.II/base/config.h" ;; "$process_files") CONFIG_FILES="$CONFIG_FILES $process_files" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -14742,10 +14745,9 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -14753,13 +14755,12 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp +} || 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. @@ -14776,12 +14777,12 @@ if test "x$ac_cr" = x; then 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 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF @@ -14790,18 +14791,18 @@ _ACEOF 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 @@ -14809,7 +14810,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -14857,7 +14858,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"\$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -14889,29 +14890,21 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ 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[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// s/^[^=]*=[ ]*$// }' fi @@ -14923,7 +14916,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || +cat >"$tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -14935,11 +14928,11 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + 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 @@ -15024,7 +15017,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _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" @@ -15037,7 +15030,7 @@ do 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 @@ -15056,7 +15049,7 @@ do for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -15065,7 +15058,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error "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'" @@ -15091,8 +15084,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -15217,24 +15210,23 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +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 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && + { 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 "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) 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) # @@ -15243,21 +15235,21 @@ which seems to be undefined. Please make sure it is defined" >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || 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 "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi ;; @@ -15272,7 +15264,7 @@ _ACEOF 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. @@ -15293,7 +15285,7 @@ if test "$no_create" != yes; then 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 1 + $ac_cs_success || as_fn_exit $? fi # @@ -15434,7 +15426,7 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach # 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"