From cb73f259db27abb105b8e0f1ffe835e47f81bc86 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 13 Mar 2002 08:48:17 +0000 Subject: [PATCH] Use __builtin_expect if available for AssertThrow. git-svn-id: https://svn.dealii.org/trunk@5564 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 43 +- deal.II/base/include/base/config.h.in | 74 +- deal.II/base/include/base/exceptions.h | 37 +- deal.II/configure | 1277 ++++++++++++------------ deal.II/configure.in | 1 + deal.II/doc/news/2002/c-3-3.html | 10 + 6 files changed, 732 insertions(+), 710 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index f6c476b813..ec6acad70e 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -581,10 +581,10 @@ AC_DEFUN(DEAL_II_THREAD_CPPFLAGS, dnl ; ], [ - AC_MSG_RESULT("not necessary") + AC_MSG_RESULT(not necessary) ], [ - AC_MSG_RESULT("-D_REENTRANT -D_THREAD_SAFE") + AC_MSG_RESULT(-D_REENTRANT -D_THREAD_SAFE) CXXFLAGSG="$CXXFLAGSG -D_REENTRANT -D_THREAD_SAFE" CXXFLAGSO="$CXXFLAGSO -D_REENTRANT -D_THREAD_SAFE" ]) @@ -620,10 +620,10 @@ AC_DEFUN(DEAL_II_GET_THREAD_FLAGS, dnl ]) done if test "$thread_flag" = invalid_last_entry ; then - AC_MSG_RESULT("no flag found!") - AC_MSG_ERROR("Could not determine multithreading flag for this platform. Aborting!") + AC_MSG_RESULT(no flag found!) + AC_MSG_ERROR(Could not determine multithreading flag for this platform. Aborting!) fi - AC_MSG_RESULT("-$thread_flag") + AC_MSG_RESULT(-$thread_flag) ]) @@ -1266,6 +1266,39 @@ AC_DEFUN(DEAL_II_HAVE_STD_STRINGSTREAM, dnl +dnl ------------------------------------------------------------- +dnl Check for existence of the __builtin_expect facility of newer +dnl gcc compilers. This can be used to hint the compiler's branch +dnl prediction unit in some cases. We use it in the AssertThrow +dnl macros. +dnl +dnl Usage: DEAL_II_HAVE_BUILTIN_EXPECT +dnl +dnl ------------------------------------------------------------- +AC_DEFUN(DEAL_II_HAVE_BUILTIN_EXPECT, dnl +[ + AC_MSG_CHECKING(for __builtin_expect) + AC_LANG(C++) + CXXFLAGS="$CXXFLAGSG" + AC_TRY_COMPILE( + [ + bool f(); + ], + [ + if (__builtin_expect(f(),false)); + ], + [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BUILTIN_EXPECT, 1, + [Define if the compiler provides __builtin_expect]) + ], + [ + AC_MSG_RESULT(no) + ]) +]) + + + dnl ------------------------------------------------------------- dnl For gcc 2.95, when using the random_shuffle function with -ansi dnl compiler flag, there is an error saying that lrand48 is diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index 979597596b..9d0f585684 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -28,8 +28,18 @@ // environment, contact the authors of the library. -/* Define if you have the gethostname function. */ -#undef HAVE_GETHOSTNAME + +/* Backward compatibility support for functions and classes that do not take + an explicit mapping variable, but rather use a default Q1 mapping instead + */ +#undef DEAL_II_COMPAT_MAPPING + +/* Define if you have the rand_r function */ +#undef DEAL_II_DECLARE_LRAND48 + +/* Flag indicating whether the library shall be compiled to use the Tecplot + interface */ +#undef DEAL_II_HAVE_TECPLOT /* Major version number of deal.II */ #undef DEAL_II_MAJOR @@ -37,53 +47,47 @@ /* Minor version number of deal.II */ #undef DEAL_II_MINOR -/* Flag indicating whether the library shall be compiler for - multithreaded applications */ +/* Flag indicating whether the library shall be compiler for multithreaded + applications */ #undef DEAL_II_USE_MT -/* Backward compatibility support for functions - and classes that do not take an explicit mapping - variable, but rather use a default Q1 mapping instead */ -#undef DEAL_II_COMPAT_MAPPING +/* Enable the multigrid components of the library */ +#undef ENABLE_MULTIGRID -/* Define if we have to work around a bug in IBM's xlC compiler */ -#undef XLC_WORK_AROUND_STD_BUG +/* Define if the compiler provides __builtin_expect */ +#undef HAVE_BUILTIN_EXPECT -/* Define if the compiler's library in use provides a - std::iterator class (early gcc versions did not) */ -#undef HAVE_STD_ITERATOR_CLASS +/* Define if you have the `gethostname' function. */ +#undef HAVE_GETHOSTNAME -/* Define if the compiler's library in use provides - std::i/ostringstream classes (early gcc versions did not) */ -#undef HAVE_STD_STRINGSTREAM +/* Availability of the MA27 algorithm from HSL */ +#undef HAVE_HSL_MA27 -/* Define if the compiler's library in use provides - std::numeric_limits classes in the appropriate header file */ -#undef HAVE_STD_NUMERIC_LIMITS +/* Availability of the MA47 algorithm from HSL */ +#undef HAVE_HSL_MA47 -/* Define if the compiler provides an header file */ -#undef HAVE_STD_OSTREAM_HEADER +/* Define if you have the rand_r function */ +#undef HAVE_RAND_R /* Define if the compiler provides an header file */ #undef HAVE_STD_IOSFWD_HEADER -/* Define if you have the rand_r function */ -#undef DEAL_II_DECLARE_LRAND48 - -/* Define if you have the rand_r function */ -#undef HAVE_RAND_R - -/* Availability of the MA27 algorithm from HSL */ -#undef HAVE_HSL_MA27 +/* Define if the compiler's library in use provides a std::iterator class + (early gcc versions did not) */ +#undef HAVE_STD_ITERATOR_CLASS -/* Availability of the MA47 algorithm from HSL */ -#undef HAVE_HSL_MA47 +/* Define if the compiler's library in use provides std::numeric_limits + classes in the appropriate header file */ +#undef HAVE_STD_NUMERIC_LIMITS -/* Enable the multigrid components of the library */ -#undef ENABLE_MULTIGRID +/* Define if the compiler provides an header file */ +#undef HAVE_STD_OSTREAM_HEADER -/* Flag indicating whether the library shall be compiled to use the Tecplot interface */ -#undef DEAL_II_HAVE_TECPLOT +/* Define if the compiler's library in use provides std::i/ostringstream + classes (early gcc versions did not) */ +#undef HAVE_STD_STRINGSTREAM +/* Define if we have to work around a bug in IBM's xlC compiler */ +#undef XLC_WORK_AROUND_STD_BUG #endif diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h index 66e7115fe2..f85cd743f5 100644 --- a/deal.II/base/include/base/exceptions.h +++ b/deal.II/base/include/base/exceptions.h @@ -590,20 +590,31 @@ namespace deal_II_exceptions * @author Wolfgang Bangerth, November 1997, extensions 1998 */ #ifndef DISABLE_ASSERT_THROW -#define AssertThrow(cond, exc) \ - { \ - if (!(cond)) \ - deal_II_exceptions::internals:: \ - issue_error_throw (__FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, #cond, #exc, exc); \ - } +# ifndef HAVE_BUILTIN_EXPECT +# define AssertThrow(cond, exc) \ + { \ + if (!(cond)) \ + deal_II_exceptions::internals:: \ + issue_error_throw (__FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__, #cond, #exc, exc); \ + } +# else // HAVE_BUILTIN_EXPECT +# define AssertThrow(cond, exc) \ + { \ + if (__builtin_expect(!cond, false)) \ + deal_II_exceptions::internals:: \ + issue_error_throw (__FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__, #cond, #exc, exc); \ + } +# endif #else -#define AssertThrow(cond, exc) \ - { \ - if (!(cond)) \ - deal_II_exceptions::internals::abort (); \ - } +# define AssertThrow(cond, exc) \ + { \ + if (!(cond)) \ + deal_II_exceptions::internals::abort (); \ + } #endif diff --git a/deal.II/configure b/deal.II/configure index 378cd48a17..66cf33265c 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,26 +1,13 @@ #! /bin/sh # From configure.in Revision: 1.97 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by Autoconf 2.50. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh @@ -105,6 +92,16 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Avoid depending upon Character Ranges. +ac_cr_az='abcdefghijklmnopqrstuvwxyz' +ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +ac_cr_09='0123456789' +ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09 + +# Sed expression to map a string onto a valid sh and CPP variable names. +ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g" +ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g" + ac_unique_file="base" ac_subdirs_all="$ac_subdirs_all contrib tests" @@ -198,7 +195,7 @@ do -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` @@ -207,7 +204,7 @@ do -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` @@ -389,7 +386,7 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` @@ -402,7 +399,7 @@ do -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package | sed 's/-/_/g'` @@ -434,7 +431,7 @@ Try \`$0 --help' for more information." >&2 *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` @@ -444,7 +441,7 @@ Try \`$0 --help' for more information." >&2 *) # FIXME: should be removed in autoconf 3.0. echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null && echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -458,24 +455,15 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir \ + exec_prefix prefix do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; + NONE ) ;; *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac @@ -721,7 +709,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.50. Invocation command line was $ $0 $@ @@ -800,11 +788,11 @@ trap 'exit_status=$? *ac_space=\ *) sed -n \ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } >&5 @@ -825,7 +813,7 @@ trap 'exit_status=$? exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal done ac_signal=0 @@ -845,7 +833,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:848: loading site script $ac_site_file" >&5 + { echo "$as_me:836: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -854,7 +842,7 @@ done # Check that the precious variables saved in the cache have kept the same # value. -ac_cache_corrupted=false +ac_suggest_removing_cache=false for ac_var in `(set) 2>&1 | sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set @@ -863,44 +851,31 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:866: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; + { echo "$as_me:854: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_suggest_removing_cache=: ;; ,set) - { echo "$as_me:870: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; + { echo "$as_me:858: WARNING: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;} + ac_suggest_removing_cache=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:876: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:878: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:880: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + { echo "$as_me:864: WARNING: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:866: WARNING: former value: $ac_old_val" >&5 +echo "$as_me: WARNING: former value: $ac_old_val" >&2;} + { echo "$as_me:868: WARNING: current value: $ac_new_val" >&5 +echo "$as_me: WARNING: current value: $ac_new_val" >&2;} + ac_suggest_removing_cache=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; - esac - fi done -if $ac_cache_corrupted; then - { echo "$as_me:899: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:901: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } +if $ac_suggest_removing_cache; then + { echo "$as_me:875: WARNING: changes in the environment can compromise the build" >&5 +echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;} + { echo "$as_me:877: WARNING: consider removing $cache_file and starting over" >&5 +echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;} fi ac_ext=c @@ -918,10 +893,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:921: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:896: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:924: \$? = $ac_status" >&5 + echo "$as_me:899: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -949,7 +924,7 @@ for ac_dir in contrib/config $srcdir/contrib/config; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:952: error: cannot find install-sh or install.sh in contrib/config $srcdir/contrib/config" >&5 + { { echo "$as_me:927: error: cannot find install-sh or install.sh in contrib/config $srcdir/contrib/config" >&5 echo "$as_me: error: cannot find install-sh or install.sh in contrib/config $srcdir/contrib/config" >&2;} { (exit 1); exit 1; }; } fi @@ -971,16 +946,16 @@ cat >>confdefs.h <&5 +echo "$as_me:949: result: Configuring deal.II version $DEAL_II_VERSION" >&5 echo "${ECHO_T}Configuring deal.II version $DEAL_II_VERSION" >&6 # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:979: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:954: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:983: checking build system type" >&5 +echo "$as_me:958: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -989,23 +964,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:992: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:967: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:996: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:971: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1001: result: $ac_cv_build" >&5 +echo "$as_me:976: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1008: checking host system type" >&5 +echo "$as_me:983: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1014,19 +989,19 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1017: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:992: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1022: result: $ac_cv_host" >&5 +echo "$as_me:997: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1029: checking target system type" >&5 +echo "$as_me:1004: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1035,12 +1010,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1038: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1013: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1043: result: $ac_cv_target" >&5 +echo "$as_me:1018: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1060,9 +1035,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:1063: result: " >&5 +echo "$as_me:1038: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:1065: result: ---------------- configuring C/C++ compilers ----------------" >&5 +echo "$as_me:1040: result: ---------------- configuring C/C++ compilers ----------------" >&5 echo "${ECHO_T}---------------- configuring C/C++ compilers ----------------" >&6 ac_ext=c @@ -1073,7 +1048,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1076: checking for $ac_word" >&5 +echo "$as_me:1051: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1088,7 +1063,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1091: found $ac_dir/$ac_word" >&5 +echo "$as_me:1066: found $ac_dir/$ac_word" >&5 break done @@ -1096,10 +1071,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1099: result: $CC" >&5 + echo "$as_me:1074: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1102: result: no" >&5 + echo "$as_me:1077: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1108,7 +1083,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1111: checking for $ac_word" >&5 +echo "$as_me:1086: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1123,7 +1098,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1126: found $ac_dir/$ac_word" >&5 +echo "$as_me:1101: found $ac_dir/$ac_word" >&5 break done @@ -1131,10 +1106,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1134: result: $ac_ct_CC" >&5 + echo "$as_me:1109: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1137: result: no" >&5 + echo "$as_me:1112: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1147,7 +1122,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1150: checking for $ac_word" >&5 +echo "$as_me:1125: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1162,7 +1137,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1165: found $ac_dir/$ac_word" >&5 +echo "$as_me:1140: found $ac_dir/$ac_word" >&5 break done @@ -1170,10 +1145,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1173: result: $CC" >&5 + echo "$as_me:1148: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1176: result: no" >&5 + echo "$as_me:1151: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1182,7 +1157,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1185: checking for $ac_word" >&5 +echo "$as_me:1160: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1197,7 +1172,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1200: found $ac_dir/$ac_word" >&5 +echo "$as_me:1175: found $ac_dir/$ac_word" >&5 break done @@ -1205,10 +1180,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1208: result: $ac_ct_CC" >&5 + echo "$as_me:1183: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1211: result: no" >&5 + echo "$as_me:1186: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1221,7 +1196,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1224: checking for $ac_word" >&5 +echo "$as_me:1199: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1241,7 +1216,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1244: found $ac_dir/$ac_word" >&5 +echo "$as_me:1219: found $ac_dir/$ac_word" >&5 break done @@ -1263,10 +1238,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1266: result: $CC" >&5 + echo "$as_me:1241: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1269: result: no" >&5 + echo "$as_me:1244: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1277,7 +1252,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1280: checking for $ac_word" >&5 +echo "$as_me:1255: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1292,7 +1267,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1295: found $ac_dir/$ac_word" >&5 +echo "$as_me:1270: found $ac_dir/$ac_word" >&5 break done @@ -1300,10 +1275,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1303: result: $CC" >&5 + echo "$as_me:1278: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1306: result: no" >&5 + echo "$as_me:1281: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1316,7 +1291,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1319: checking for $ac_word" >&5 +echo "$as_me:1294: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1331,7 +1306,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1334: found $ac_dir/$ac_word" >&5 +echo "$as_me:1309: found $ac_dir/$ac_word" >&5 break done @@ -1339,10 +1314,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1342: result: $ac_ct_CC" >&5 + echo "$as_me:1317: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1345: result: no" >&5 + echo "$as_me:1320: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1354,32 +1329,12 @@ fi fi -test -z "$CC" && { { echo "$as_me:1357: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1332: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } -# Provide some information about the compiler. -echo "$as_me:1362:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1365: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:1368: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1370: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:1373: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1375: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:1378: \$? = $ac_status" >&5 - (exit $ac_status); } - cat >conftest.$ac_ext <<_ACEOF -#line 1382 "configure" +#line 1337 "configure" #include "confdefs.h" int @@ -1393,29 +1348,23 @@ _ACEOF ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition +# It will help us diagnose broken compiler, and finding out an intuition # of exeext. -echo "$as_me:1398: checking for C compiler default output" >&5 +echo "$as_me:1353: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1401: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1356: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1404: \$? = $ac_status" >&5 + echo "$as_me:1359: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do case $ac_file in *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. export ac_cv_exeext break;; * ) break;; @@ -1424,34 +1373,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1427: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1376: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1433: result: $ac_file" >&5 +echo "$as_me:1382: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1438: checking whether the C compiler works" >&5 +echo "$as_me:1387: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1444: \"$ac_try\"") >&5 + { (eval echo "$as_me:1393: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1447: \$? = $ac_status" >&5 + echo "$as_me:1396: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1454: error: cannot run C compiled programs. + { { echo "$as_me:1403: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1459,24 +1408,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1462: result: yes" >&5 +echo "$as_me:1411: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1469: checking whether we are cross compiling" >&5 +echo "$as_me:1418: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1471: result: $cross_compiling" >&5 +echo "$as_me:1420: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1474: checking for executable suffix" >&5 +echo "$as_me:1423: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1476: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1425: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1479: \$? = $ac_status" >&5 + echo "$as_me:1428: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1492,25 +1441,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1495: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1444: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1501: result: $ac_cv_exeext" >&5 +echo "$as_me:1450: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1507: checking for object suffix" >&5 +echo "$as_me:1456: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1513 "configure" +#line 1462 "configure" #include "confdefs.h" int @@ -1522,10 +1471,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1525: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1474: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1528: \$? = $ac_status" >&5 + echo "$as_me:1477: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1537,24 +1486,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1540: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1489: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1547: result: $ac_cv_objext" >&5 +echo "$as_me:1496: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1551: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1500: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1557 "configure" +#line 1506 "configure" #include "confdefs.h" int @@ -1569,16 +1518,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1572: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1521: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1575: \$? = $ac_status" >&5 + echo "$as_me:1524: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1578: \"$ac_try\"") >&5 + { (eval echo "$as_me:1527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1581: \$? = $ac_status" >&5 + echo "$as_me:1530: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1590,19 +1539,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1593: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1542: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1599: checking whether $CC accepts -g" >&5 +echo "$as_me:1548: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1605 "configure" +#line 1554 "configure" #include "confdefs.h" int @@ -1614,16 +1563,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1566: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1620: \$? = $ac_status" >&5 + echo "$as_me:1569: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1623: \"$ac_try\"") >&5 + { (eval echo "$as_me:1572: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1626: \$? = $ac_status" >&5 + echo "$as_me:1575: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1633,7 +1582,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1636: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1585: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1660,16 +1609,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1663: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1666: \$? = $ac_status" >&5 + echo "$as_me:1615: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1669: \"$ac_try\"") >&5 + { (eval echo "$as_me:1618: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1672: \$? = $ac_status" >&5 + echo "$as_me:1621: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1681,7 +1630,7 @@ if { (eval echo "$as_me:1663: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1684 "configure" +#line 1633 "configure" #include "confdefs.h" #include $ac_declaration @@ -1694,16 +1643,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1697: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1700: \$? = $ac_status" >&5 + echo "$as_me:1649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1703: \"$ac_try\"") >&5 + { (eval echo "$as_me:1652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1706: \$? = $ac_status" >&5 + echo "$as_me:1655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1713,7 +1662,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1716 "configure" +#line 1665 "configure" #include "confdefs.h" $ac_declaration int @@ -1725,16 +1674,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1728: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1677: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1731: \$? = $ac_status" >&5 + echo "$as_me:1680: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1734: \"$ac_try\"") >&5 + { (eval echo "$as_me:1683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1737: \$? = $ac_status" >&5 + echo "$as_me:1686: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1743,12 +1692,9 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi +echo '#ifdef __cplusplus' >>confdefs.h +echo $ac_declaration >>confdefs.h +echo '#endif' >>confdefs.h else echo "$as_me: failed program was:" >&5 @@ -1763,7 +1709,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Extract the first word of "$CC", so it can be a program name with args. set dummy $CC; ac_word=$2 -echo "$as_me:1766: checking for $ac_word" >&5 +echo "$as_me:1712: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1780,7 +1726,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_CC="$ac_dir/$ac_word" - echo "$as_me:1783: found $ac_dir/$ac_word" >&5 + echo "$as_me:1729: found $ac_dir/$ac_word" >&5 break fi done @@ -1791,10 +1737,10 @@ fi CC=$ac_cv_path_CC if test -n "$CC"; then - echo "$as_me:1794: result: $CC" >&5 + echo "$as_me:1740: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1797: result: no" >&5 + echo "$as_me:1743: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1805,11 +1751,11 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1812: checking for $ac_word" >&5 +echo "$as_me:1758: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1824,7 +1770,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:1827: found $ac_dir/$ac_word" >&5 +echo "$as_me:1773: found $ac_dir/$ac_word" >&5 break done @@ -1832,10 +1778,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:1835: result: $CXX" >&5 + echo "$as_me:1781: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:1838: result: no" >&5 + echo "$as_me:1784: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1844,11 +1790,11 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1851: checking for $ac_word" >&5 +echo "$as_me:1797: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1863,7 +1809,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:1866: found $ac_dir/$ac_word" >&5 +echo "$as_me:1812: found $ac_dir/$ac_word" >&5 break done @@ -1871,10 +1817,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:1874: result: $ac_ct_CXX" >&5 + echo "$as_me:1820: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:1877: result: no" >&5 + echo "$as_me:1823: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1885,33 +1831,13 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" CXX=$ac_ct_CXX fi -# Provide some information about the compiler. -echo "$as_me:1889:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1892: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:1895: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1897: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:1900: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1902: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:1905: \$? = $ac_status" >&5 - (exit $ac_status); } - -echo "$as_me:1908: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:1834: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1914 "configure" +#line 1840 "configure" #include "confdefs.h" int @@ -1926,16 +1852,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1932: \$? = $ac_status" >&5 + echo "$as_me:1858: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1935: \"$ac_try\"") >&5 + { (eval echo "$as_me:1861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1938: \$? = $ac_status" >&5 + echo "$as_me:1864: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1947,19 +1873,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1950: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:1876: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:1956: checking whether $CXX accepts -g" >&5 +echo "$as_me:1882: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1962 "configure" +#line 1888 "configure" #include "confdefs.h" int @@ -1971,16 +1897,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1974: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1900: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1977: \$? = $ac_status" >&5 + echo "$as_me:1903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1980: \"$ac_try\"") >&5 + { (eval echo "$as_me:1906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1983: \$? = $ac_status" >&5 + echo "$as_me:1909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -1990,7 +1916,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1993: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:1919: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -2017,7 +1943,7 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2020 "configure" +#line 1946 "configure" #include "confdefs.h" #include $ac_declaration @@ -2030,16 +1956,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2033: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1959: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2036: \$? = $ac_status" >&5 + echo "$as_me:1962: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2039: \"$ac_try\"") >&5 + { (eval echo "$as_me:1965: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2042: \$? = $ac_status" >&5 + echo "$as_me:1968: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2049,7 +1975,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2052 "configure" +#line 1978 "configure" #include "confdefs.h" $ac_declaration int @@ -2061,16 +1987,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2064: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1990: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2067: \$? = $ac_status" >&5 + echo "$as_me:1993: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2070: \"$ac_try\"") >&5 + { (eval echo "$as_me:1996: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2073: \$? = $ac_status" >&5 + echo "$as_me:1999: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2079,12 +2005,9 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi +echo '#ifdef __cplusplus' >>confdefs.h +echo $ac_declaration >>confdefs.h +echo '#endif' >>confdefs.h ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2095,7 +2018,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$OLDCXXFLAGS" # Extract the first word of "$CXX", so it can be a program name with args. set dummy $CXX; ac_word=$2 -echo "$as_me:2098: checking for $ac_word" >&5 +echo "$as_me:2021: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2112,7 +2035,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_CXX="$ac_dir/$ac_word" - echo "$as_me:2115: found $ac_dir/$ac_word" >&5 + echo "$as_me:2038: found $ac_dir/$ac_word" >&5 break fi done @@ -2123,10 +2046,10 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:2126: result: $CXX" >&5 + echo "$as_me:2049: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2129: result: no" >&5 + echo "$as_me:2052: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2134,49 +2057,49 @@ fi GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` case "$GXX_VERSION_STRING" in *"egcs-1.1"*) - echo "$as_me:2137: result: C++ compiler is egcs-1.1" >&5 + echo "$as_me:2060: result: C++ compiler is egcs-1.1" >&5 echo "${ECHO_T}C++ compiler is egcs-1.1" >&6 GXX_VERSION=egcs1.1 ;; *2.95*) - echo "$as_me:2142: result: C++ compiler is gcc-2.95" >&5 + echo "$as_me:2065: result: C++ compiler is gcc-2.95" >&5 echo "${ECHO_T}C++ compiler is gcc-2.95" >&6 GXX_VERSION=gcc2.95 ;; *2.96*) - echo "$as_me:2147: result: C++ compiler is gcc-2.96" >&5 + echo "$as_me:2070: result: C++ compiler is gcc-2.96" >&5 echo "${ECHO_T}C++ compiler is gcc-2.96" >&6 GXX_VERSION=gcc2.96 ;; *2.97*) - echo "$as_me:2152: result: C++ compiler is gcc-2.97" >&5 + echo "$as_me:2075: result: C++ compiler is gcc-2.97" >&5 echo "${ECHO_T}C++ compiler is gcc-2.97" >&6 GXX_VERSION=gcc2.97 ;; *3.0*) - echo "$as_me:2157: result: C++ compiler is gcc-3.0" >&5 + echo "$as_me:2080: result: C++ compiler is gcc-3.0" >&5 echo "${ECHO_T}C++ compiler is gcc-3.0" >&6 GXX_VERSION=gcc3.0 ;; *3.1*) - echo "$as_me:2162: result: C++ compiler is gcc-3.1" >&5 + echo "$as_me:2085: result: C++ compiler is gcc-3.1" >&5 echo "${ECHO_T}C++ compiler is gcc-3.1" >&6 GXX_VERSION=gcc3.1 ;; *3.2*) - echo "$as_me:2167: result: C++ compiler is gcc-3.2" >&5 + echo "$as_me:2090: result: C++ compiler is gcc-3.2" >&5 echo "${ECHO_T}C++ compiler is gcc-3.2" >&6 GXX_VERSION=gcc3.2 ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) - echo "$as_me:2172: result: C++ compiler is $GXX_VERSION_STRING" >&5 + echo "$as_me:2095: result: C++ compiler is $GXX_VERSION_STRING" >&5 echo "${ECHO_T}C++ compiler is $GXX_VERSION_STRING" >&6 - { { echo "$as_me:2174: error: C++ compiler is not supported" >&5 + { { echo "$as_me:2097: error: C++ compiler is not supported" >&5 echo "$as_me: error: C++ compiler is not supported" >&2;} { (exit 1); exit 1; }; } ;; *) - echo "$as_me:2179: result: C++ compiler is unknown but accepted gcc version" >&5 + echo "$as_me:2102: result: C++ compiler is unknown but accepted gcc version" >&5 echo "${ECHO_T}C++ compiler is unknown but accepted gcc version" >&6 GXX_VERSION=gcc-other ;; @@ -2185,47 +2108,47 @@ echo "${ECHO_T}C++ compiler is unknown but accepted gcc version" >&6 is_ibm_xlc="`($CXX 2>&1) | egrep 'VisualAge C++|C Set ++|C for AIX Compiler'`" if test "x$is_ibm_xlc" != "x" ; then - echo "$as_me:2188: result: C++ compiler is IBM xlC" >&5 + echo "$as_me:2111: result: C++ compiler is IBM xlC" >&5 echo "${ECHO_T}C++ compiler is IBM xlC" >&6 GXX_VERSION=ibm_xlc else is_mips_pro="`($CXX -version 2>&1) | grep MIPSpro`" if test "x$is_mips_pro" != "x" ; then - echo "$as_me:2195: result: C++ compiler is MIPSpro C++ compiler" >&5 + echo "$as_me:2118: result: C++ compiler is MIPSpro C++ compiler" >&5 echo "${ECHO_T}C++ compiler is MIPSpro C++ compiler" >&6 GXX_VERSION=MIPSpro else is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" if test "x$is_intel_icc" != "x" ; then - echo "$as_me:2202: result: C++ compiler is Intel ICC" >&5 + echo "$as_me:2125: result: C++ compiler is Intel ICC" >&5 echo "${ECHO_T}C++ compiler is Intel ICC" >&6 GXX_VERSION=intel_icc else is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" if test "x$is_dec_cxx" != "x" ; then - echo "$as_me:2209: result: C++ compiler is Compaq cxx" >&5 + echo "$as_me:2132: result: C++ compiler is Compaq cxx" >&5 echo "${ECHO_T}C++ compiler is Compaq cxx" >&6 GXX_VERSION=compaq_cxx else is_sun_cc="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" if test "x$is_sun_cc" != "x" ; then - echo "$as_me:2216: result: C++ compiler is Sun Workshop compiler" >&5 + echo "$as_me:2139: result: C++ compiler is Sun Workshop compiler" >&5 echo "${ECHO_T}C++ compiler is Sun Workshop compiler" >&6 GXX_VERSION=sun_workshop else is_kai_cc="`($CXX -V 2>&1) | grep 'KAI C++'`" if test "x$is_kai_cc" != "x" ; then - echo "$as_me:2223: result: compile is KAI C++" >&5 + echo "$as_me:2146: result: compile is KAI C++" >&5 echo "${ECHO_T}compile is KAI C++" >&6 GXX_VERSSION=kai_cc else - { { echo "$as_me:2228: error: Unrecognized compiler" >&5 + { { echo "$as_me:2151: error: Unrecognized compiler" >&5 echo "$as_me: error: Unrecognized compiler" >&2;} { (exit sorry); exit sorry; }; } exit 1 @@ -2278,10 +2201,10 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG -Werror" - echo "$as_me:2281: checking for std::advance warning" >&5 + echo "$as_me:2204: checking for std::advance warning" >&5 echo $ECHO_N "checking for std::advance warning... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 2284 "configure" +#line 2207 "configure" #include "confdefs.h" #include @@ -2300,19 +2223,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2303: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2226: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2306: \$? = $ac_status" >&5 + echo "$as_me:2229: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2309: \"$ac_try\"") >&5 + { (eval echo "$as_me:2232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2312: \$? = $ac_status" >&5 + echo "$as_me:2235: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:2315: result: no" >&5 + echo "$as_me:2238: result: no" >&5 echo "${ECHO_T}no" >&6 DEAL_II_ADVANCE_WARNING=no @@ -2320,7 +2243,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:2323: result: yes" >&5 + echo "$as_me:2246: result: yes" >&5 echo "${ECHO_T}yes" >&6 DEAL_II_ADVANCE_WARNING=yes @@ -2380,7 +2303,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext ;; *) - { { echo "$as_me:2383: error: No compiler options for this C++ compiler + { { echo "$as_me:2306: error: No compiler options for this C++ compiler specified at present" >&5 echo "$as_me: error: No compiler options for this C++ compiler specified at present" >&2;} @@ -2390,13 +2313,13 @@ echo "$as_me: error: No compiler options for this C++ compiler fi if test "$GXX" = yes ; then - echo "$as_me:2393: checking whether -ggdb works for long symbols" >&5 + echo "$as_me:2316: checking whether -ggdb works for long symbols" >&5 echo $ECHO_N "checking whether -ggdb works for long symbols... $ECHO_C" >&6 case "$target" in alpha*-osf*) CXXFLAGS="-ggdb $CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 2399 "configure" +#line 2322 "configure" #include "confdefs.h" # include @@ -2425,20 +2348,20 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2428: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2351: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2431: \$? = $ac_status" >&5 + echo "$as_me:2354: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2434: \"$ac_try\"") >&5 + { (eval echo "$as_me:2357: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2437: \$? = $ac_status" >&5 + echo "$as_me:2360: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CXXFLAGSG="-ggdb $CXXFLAGSG" - echo "$as_me:2441: result: yes" >&5 + echo "$as_me:2364: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -2446,7 +2369,7 @@ else cat conftest.$ac_ext >&5 CXXFLAGSG="-gstabs $CXXFLAGSG" - echo "$as_me:2449: result: no -- using -gstabs" >&5 + echo "$as_me:2372: result: no -- using -gstabs" >&5 echo "${ECHO_T}no -- using -gstabs" >&6 fi @@ -2454,7 +2377,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext ;; *) - echo "$as_me:2457: result: yes" >&5 + echo "$as_me:2380: result: yes" >&5 echo "${ECHO_T}yes" >&6 CXXFLAGSG="-ggdb $CXXFLAGSG" ;; @@ -2475,7 +2398,7 @@ fi; if test "$enablemultithreading" = yes ; then if test "$GXX" = yes ; then - echo "$as_me:2478: checking for platform specific thread flags" >&5 + echo "$as_me:2401: checking for platform specific thread flags" >&5 echo $ECHO_N "checking for platform specific thread flags... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2509,16 +2432,16 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu done if test "$thread_flag" = invalid_last_entry ; then - echo "$as_me:2512: result: \"no flag found!\"" >&5 + echo "$as_me:2435: result: \"no flag found!\"" >&5 echo "${ECHO_T}\"no flag found!\"" >&6 - { { echo "$as_me:2514: error: \"Could not determine multithreading flag for this platform. Aborting!\"" >&5 + { { echo "$as_me:2437: error: \"Could not determine multithreading flag for this platform. Aborting!\"" >&5 echo "$as_me: error: \"Could not determine multithreading flag for this platform. Aborting!\"" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:2518: result: \"-$thread_flag\"" >&5 + echo "$as_me:2441: result: \"-$thread_flag\"" >&5 echo "${ECHO_T}\"-$thread_flag\"" >&6 - echo "$as_me:2521: checking for platform specific multi-threading defines" >&5 + echo "$as_me:2444: checking for platform specific multi-threading defines" >&5 echo $ECHO_N "checking for platform specific multi-threading defines... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2527,7 +2450,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 2530 "configure" +#line 2453 "configure" #include "confdefs.h" # if !defined (_REENTRANT) && !defined (_THREAD_SAFE) @@ -2546,26 +2469,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2549: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2552: \$? = $ac_status" >&5 + echo "$as_me:2475: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2555: \"$ac_try\"") >&5 + { (eval echo "$as_me:2478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2558: \$? = $ac_status" >&5 + echo "$as_me:2481: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:2561: result: \"not necessary\"" >&5 + echo "$as_me:2484: result: \"not necessary\"" >&5 echo "${ECHO_T}\"not necessary\"" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:2568: result: \"-D_REENTRANT -D_THREAD_SAFE\"" >&5 + echo "$as_me:2491: result: \"-D_REENTRANT -D_THREAD_SAFE\"" >&5 echo "${ECHO_T}\"-D_REENTRANT -D_THREAD_SAFE\"" >&6 CXXFLAGSG="$CXXFLAGSG -D_REENTRANT -D_THREAD_SAFE" CXXFLAGSO="$CXXFLAGSO -D_REENTRANT -D_THREAD_SAFE" @@ -2580,7 +2503,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGSG = "$CXXFLAGSG -threaded" CXXFLAGSO = "$CXXFLAGSO -threaded" else - { { echo "$as_me:2583: error: No threading compiler options for this C++ compiler + { { echo "$as_me:2506: error: No threading compiler options for this C++ compiler specified at present" >&5 echo "$as_me: error: No threading compiler options for this C++ compiler specified at present" >&2;} @@ -2598,15 +2521,15 @@ else withmultithreading=no fi; if test "$withmultithreading" != no ; then - echo "$as_me:2601: checking for ACE" >&5 + echo "$as_me:2524: checking for ACE" >&5 echo $ECHO_N "checking for ACE... $ECHO_C" >&6 if test -d "$withmultithreading" ; then - echo "$as_me:2604: result: found" >&5 + echo "$as_me:2527: result: found" >&5 echo "${ECHO_T}found" >&6 else - echo "$as_me:2607: result: not found" >&5 + echo "$as_me:2530: result: not found" >&5 echo "${ECHO_T}not found" >&6 - { { echo "$as_me:2609: error: Invalid ACE path" >&5 + { { echo "$as_me:2532: error: Invalid ACE path" >&5 echo "$as_me: error: Invalid ACE path" >&2;} { (exit 1); exit 1; }; } fi @@ -2620,7 +2543,7 @@ EOF if test "$enablemultithreading" = yes ; then if test "$GXX" = yes ; then - echo "$as_me:2623: checking whether compilation with ACE disallows flags" >&5 + echo "$as_me:2546: checking whether compilation with ACE disallows flags" >&5 echo $ECHO_N "checking whether compilation with ACE disallows flags... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2630,7 +2553,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="-ansi -I$withmultithreading" cat >conftest.$ac_ext <<_ACEOF -#line 2633 "configure" +#line 2556 "configure" #include "confdefs.h" # include @@ -2645,16 +2568,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2648: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2571: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2651: \$? = $ac_status" >&5 + echo "$as_me:2574: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2654: \"$ac_try\"") >&5 + { (eval echo "$as_me:2577: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2657: \$? = $ac_status" >&5 + echo "$as_me:2580: \$? = $ac_status" >&5 (exit $ac_status); }; }; then deal_II_ace_remove_ansi="no" @@ -2669,7 +2592,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="-pedantic -Werror -I$withmultithreading" cat >conftest.$ac_ext <<_ACEOF -#line 2672 "configure" +#line 2595 "configure" #include "confdefs.h" # include @@ -2684,16 +2607,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2687: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2610: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2690: \$? = $ac_status" >&5 + echo "$as_me:2613: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2693: \"$ac_try\"") >&5 + { (eval echo "$as_me:2616: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2696: \$? = $ac_status" >&5 + echo "$as_me:2619: \$? = $ac_status" >&5 (exit $ac_status); }; }; then deal_II_ace_remove_pedantic="no" @@ -2709,18 +2632,18 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test $deal_II_ace_remove_ansi = "no" ; then if test $deal_II_ace_remove_pedantic = "no" ; then - echo "$as_me:2712: result: no" >&5 + echo "$as_me:2635: result: no" >&5 echo "${ECHO_T}no" >&6 else - echo "$as_me:2715: result: -pedantic" >&5 + echo "$as_me:2638: result: -pedantic" >&5 echo "${ECHO_T}-pedantic" >&6 fi else if test $deal_II_ace_remove_pedantic = "no" ; then - echo "$as_me:2720: result: -ansi" >&5 + echo "$as_me:2643: result: -ansi" >&5 echo "${ECHO_T}-ansi" >&6 else - echo "$as_me:2723: result: -ansi -pedantic" >&5 + echo "$as_me:2646: result: -ansi -pedantic" >&5 echo "${ECHO_T}-ansi -pedantic" >&6 fi fi @@ -2736,7 +2659,7 @@ echo "${ECHO_T}-ansi -pedantic" >&6 fi fi - echo "$as_me:2739: checking whether AssertThrow works with debug flags" >&5 + echo "$as_me:2662: checking whether AssertThrow works with debug flags" >&5 echo $ECHO_N "checking whether AssertThrow works with debug flags... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2746,7 +2669,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS=$CXXFLAGSG cat >conftest.$ac_ext <<_ACEOF -#line 2749 "configure" +#line 2672 "configure" #include "confdefs.h" #include @@ -2830,33 +2753,33 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2833: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2756: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2836: \$? = $ac_status" >&5 + echo "$as_me:2759: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2839: \"$ac_try\"") >&5 + { (eval echo "$as_me:2762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2842: \$? = $ac_status" >&5 + echo "$as_me:2765: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:2845: result: yes" >&5 + echo "$as_me:2768: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:2852: result: no" >&5 + echo "$as_me:2775: result: no" >&5 echo "${ECHO_T}no" >&6 CXXFLAGSG="-DDISABLE_ASSERT_THROW $CXXFLAGSG" fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:2859: checking whether AssertThrow works with optimized flags" >&5 + echo "$as_me:2782: checking whether AssertThrow works with optimized flags" >&5 echo $ECHO_N "checking whether AssertThrow works with optimized flags... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2866,7 +2789,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS=$CXXFLAGSO cat >conftest.$ac_ext <<_ACEOF -#line 2869 "configure" +#line 2792 "configure" #include "confdefs.h" #include @@ -2950,33 +2873,33 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2953: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2876: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2956: \$? = $ac_status" >&5 + echo "$as_me:2879: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2959: \"$ac_try\"") >&5 + { (eval echo "$as_me:2882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2962: \$? = $ac_status" >&5 + echo "$as_me:2885: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:2965: result: yes" >&5 + echo "$as_me:2888: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:2972: result: no" >&5 + echo "$as_me:2895: result: no" >&5 echo "${ECHO_T}no" >&6 CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO" fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:2979: checking for std::vector bug" >&5 + echo "$as_me:2902: checking for std::vector bug" >&5 echo $ECHO_N "checking for std::vector bug... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2986,7 +2909,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 2989 "configure" +#line 2912 "configure" #include "confdefs.h" namespace std { @@ -3011,26 +2934,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3014: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2937: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3017: \$? = $ac_status" >&5 + echo "$as_me:2940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3020: \"$ac_try\"") >&5 + { (eval echo "$as_me:2943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3023: \$? = $ac_status" >&5 + echo "$as_me:2946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3026: result: no" >&5 + echo "$as_me:2949: result: no" >&5 echo "${ECHO_T}no" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3033: result: yes. trying to work around" >&5 + echo "$as_me:2956: result: yes. trying to work around" >&5 echo "${ECHO_T}yes. trying to work around" >&6 cat >>confdefs.h <<\EOF @@ -3040,7 +2963,7 @@ EOF fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3043: checking for std::iterator class" >&5 + echo "$as_me:2966: checking for std::iterator class" >&5 echo $ECHO_N "checking for std::iterator class... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3050,7 +2973,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 3053 "configure" +#line 2976 "configure" #include "confdefs.h" #include @@ -3066,19 +2989,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3069: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2992: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3072: \$? = $ac_status" >&5 + echo "$as_me:2995: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3075: \"$ac_try\"") >&5 + { (eval echo "$as_me:2998: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3078: \$? = $ac_status" >&5 + echo "$as_me:3001: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3081: result: yes" >&5 + echo "$as_me:3004: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -3089,13 +3012,13 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3092: result: no" >&5 + echo "$as_me:3015: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3098: checking for std::i/ostringstream classes" >&5 + echo "$as_me:3021: checking for std::i/ostringstream classes" >&5 echo $ECHO_N "checking for std::i/ostringstream classes... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3105,7 +3028,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 3108 "configure" +#line 3031 "configure" #include "confdefs.h" #include @@ -3122,19 +3045,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3125: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3048: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3128: \$? = $ac_status" >&5 + echo "$as_me:3051: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3131: \"$ac_try\"") >&5 + { (eval echo "$as_me:3054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3134: \$? = $ac_status" >&5 + echo "$as_me:3057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3137: result: yes" >&5 + echo "$as_me:3060: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -3145,13 +3068,13 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3148: result: no" >&5 + echo "$as_me:3071: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3154: checking for std::numeric_limits classes" >&5 + echo "$as_me:3077: checking for std::numeric_limits classes" >&5 echo $ECHO_N "checking for std::numeric_limits classes... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3161,7 +3084,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 3164 "configure" +#line 3087 "configure" #include "confdefs.h" #include @@ -3177,19 +3100,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3180: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3103: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3183: \$? = $ac_status" >&5 + echo "$as_me:3106: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3186: \"$ac_try\"") >&5 + { (eval echo "$as_me:3109: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3189: \$? = $ac_status" >&5 + echo "$as_me:3112: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3192: result: yes" >&5 + echo "$as_me:3115: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -3200,13 +3123,13 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3203: result: no" >&5 + echo "$as_me:3126: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3209: checking for header" >&5 + echo "$as_me:3132: checking for header" >&5 echo $ECHO_N "checking for header... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3216,7 +3139,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 3219 "configure" +#line 3142 "configure" #include "confdefs.h" #include @@ -3231,19 +3154,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3234: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3157: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3237: \$? = $ac_status" >&5 + echo "$as_me:3160: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3240: \"$ac_try\"") >&5 + { (eval echo "$as_me:3163: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3243: \$? = $ac_status" >&5 + echo "$as_me:3166: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3246: result: yes" >&5 + echo "$as_me:3169: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -3254,13 +3177,13 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3257: result: no" >&5 + echo "$as_me:3180: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3263: checking for header" >&5 + echo "$as_me:3186: checking for header" >&5 echo $ECHO_N "checking for header... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3270,7 +3193,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 3273 "configure" +#line 3196 "configure" #include "confdefs.h" #include @@ -3285,19 +3208,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3288: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3211: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3291: \$? = $ac_status" >&5 + echo "$as_me:3214: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3294: \"$ac_try\"") >&5 + { (eval echo "$as_me:3217: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3297: \$? = $ac_status" >&5 + echo "$as_me:3220: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3300: result: yes" >&5 + echo "$as_me:3223: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -3308,13 +3231,68 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3311: result: no" >&5 + echo "$as_me:3234: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3317: checking whether lrand48 needs to be declared with -ansi" >&5 + echo "$as_me:3240: checking for __builtin_expect" >&5 +echo $ECHO_N "checking for __builtin_expect... $ECHO_C" >&6 + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + CXXFLAGS="$CXXFLAGSG" + cat >conftest.$ac_ext <<_ACEOF +#line 3250 "configure" +#include "confdefs.h" + + bool f(); + +int +main () +{ + + if (__builtin_expect(f(),false)); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3266: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3269: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3272: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3275: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:3278: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +cat >>confdefs.h <<\EOF +#define HAVE_BUILTIN_EXPECT 1 +EOF + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + echo "$as_me:3289: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + echo "$as_me:3295: checking whether lrand48 needs to be declared with -ansi" >&5 echo $ECHO_N "checking whether lrand48 needs to be declared with -ansi... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3324,7 +3302,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF -#line 3327 "configure" +#line 3305 "configure" #include "confdefs.h" #include @@ -3345,26 +3323,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3348: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3326: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3351: \$? = $ac_status" >&5 + echo "$as_me:3329: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3354: \"$ac_try\"") >&5 + { (eval echo "$as_me:3332: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3357: \$? = $ac_status" >&5 + echo "$as_me:3335: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3360: result: no" >&5 + echo "$as_me:3338: result: no" >&5 echo "${ECHO_T}no" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3367: result: yes" >&5 + echo "$as_me:3345: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -3374,7 +3352,7 @@ EOF fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3377: checking whether getrusage is properly declared" >&5 + echo "$as_me:3355: checking whether getrusage is properly declared" >&5 echo $ECHO_N "checking whether getrusage is properly declared... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3383,7 +3361,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 3386 "configure" +#line 3364 "configure" #include "confdefs.h" #include @@ -3400,26 +3378,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3403: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3381: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3406: \$? = $ac_status" >&5 + echo "$as_me:3384: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3409: \"$ac_try\"") >&5 + { (eval echo "$as_me:3387: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3412: \$? = $ac_status" >&5 + echo "$as_me:3390: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3415: result: yes" >&5 + echo "$as_me:3393: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3422: result: no" >&5 + echo "$as_me:3400: result: no" >&5 echo "${ECHO_T}no" >&6 CXXFLAGSG="$CXXFLAGSG -DNO_HAVE_GETRUSAGE" CXXFLAGSO="$CXXFLAGSO -DNO_HAVE_GETRUSAGE" @@ -3427,7 +3405,7 @@ echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3430: checking whether isnan is declared with debug flags" >&5 + echo "$as_me:3408: checking whether isnan is declared with debug flags" >&5 echo $ECHO_N "checking whether isnan is declared with debug flags... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3438,7 +3416,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS=$CXXFLAGSG deal_II_isnan_flag="" cat >conftest.$ac_ext <<_ACEOF -#line 3441 "configure" +#line 3419 "configure" #include "confdefs.h" #include @@ -3455,19 +3433,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3458: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3436: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3461: \$? = $ac_status" >&5 + echo "$as_me:3439: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3464: \"$ac_try\"") >&5 + { (eval echo "$as_me:3442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3467: \$? = $ac_status" >&5 + echo "$as_me:3445: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3470: result: yes" >&5 + echo "$as_me:3448: result: yes" >&5 echo "${ECHO_T}yes" >&6 deal_II_isnan_flag="-DHAVE_ISNAN" CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" @@ -3480,7 +3458,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "x$deal_II_isnan_flag" = "x" ; then cat >conftest.$ac_ext <<_ACEOF -#line 3483 "configure" +#line 3461 "configure" #include "confdefs.h" #include @@ -3497,19 +3475,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3500: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3478: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3503: \$? = $ac_status" >&5 + echo "$as_me:3481: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3506: \"$ac_try\"") >&5 + { (eval echo "$as_me:3484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3509: \$? = $ac_status" >&5 + echo "$as_me:3487: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3512: result: yes" >&5 + echo "$as_me:3490: result: yes" >&5 echo "${ECHO_T}yes" >&6 deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" @@ -3526,7 +3504,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSG $testflag" cat >conftest.$ac_ext <<_ACEOF -#line 3529 "configure" +#line 3507 "configure" #include "confdefs.h" #include @@ -3543,16 +3521,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3546: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3524: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3549: \$? = $ac_status" >&5 + echo "$as_me:3527: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3552: \"$ac_try\"") >&5 + { (eval echo "$as_me:3530: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3555: \$? = $ac_status" >&5 + echo "$as_me:3533: \$? = $ac_status" >&5 (exit $ac_status); }; }; then deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -3565,7 +3543,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 3568 "configure" +#line 3546 "configure" #include "confdefs.h" #include @@ -3582,16 +3560,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3585: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3563: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3588: \$? = $ac_status" >&5 + echo "$as_me:3566: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3591: \"$ac_try\"") >&5 + { (eval echo "$as_me:3569: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3594: \$? = $ac_status" >&5 + echo "$as_me:3572: \$? = $ac_status" >&5 (exit $ac_status); }; }; then deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -3605,16 +3583,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done if test "x$deal_II_isnan_flag" = "x" ; then - echo "$as_me:3608: result: no." >&5 + echo "$as_me:3586: result: no." >&5 echo "${ECHO_T}no." >&6 else - echo "$as_me:3611: result: using $testflag" >&5 + echo "$as_me:3589: result: using $testflag" >&5 echo "${ECHO_T}using $testflag" >&6 CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" fi fi - echo "$as_me:3617: checking whether isnan is declared with optimized flags" >&5 + echo "$as_me:3595: checking whether isnan is declared with optimized flags" >&5 echo $ECHO_N "checking whether isnan is declared with optimized flags... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3625,7 +3603,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS=$CXXFLAGSO deal_II_isnan_flag="" cat >conftest.$ac_ext <<_ACEOF -#line 3628 "configure" +#line 3606 "configure" #include "confdefs.h" #include @@ -3642,19 +3620,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3645: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3623: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3648: \$? = $ac_status" >&5 + echo "$as_me:3626: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3651: \"$ac_try\"") >&5 + { (eval echo "$as_me:3629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3654: \$? = $ac_status" >&5 + echo "$as_me:3632: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3657: result: yes" >&5 + echo "$as_me:3635: result: yes" >&5 echo "${ECHO_T}yes" >&6 deal_II_isnan_flag="-DHAVE_ISNAN" CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" @@ -3667,7 +3645,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "x$deal_II_isnan_flag" = "x" ; then cat >conftest.$ac_ext <<_ACEOF -#line 3670 "configure" +#line 3648 "configure" #include "confdefs.h" #include @@ -3684,19 +3662,19 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3687: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3665: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3690: \$? = $ac_status" >&5 + echo "$as_me:3668: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3693: \"$ac_try\"") >&5 + { (eval echo "$as_me:3671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3696: \$? = $ac_status" >&5 + echo "$as_me:3674: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3699: result: yes" >&5 + echo "$as_me:3677: result: yes" >&5 echo "${ECHO_T}yes" >&6 deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" @@ -3713,7 +3691,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSO $testflag" cat >conftest.$ac_ext <<_ACEOF -#line 3716 "configure" +#line 3694 "configure" #include "confdefs.h" #include @@ -3730,16 +3708,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3733: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3711: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3736: \$? = $ac_status" >&5 + echo "$as_me:3714: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3739: \"$ac_try\"") >&5 + { (eval echo "$as_me:3717: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3742: \$? = $ac_status" >&5 + echo "$as_me:3720: \$? = $ac_status" >&5 (exit $ac_status); }; }; then deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -3752,7 +3730,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 3755 "configure" +#line 3733 "configure" #include "confdefs.h" #include @@ -3769,16 +3747,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3772: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3775: \$? = $ac_status" >&5 + echo "$as_me:3753: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3778: \"$ac_try\"") >&5 + { (eval echo "$as_me:3756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3781: \$? = $ac_status" >&5 + echo "$as_me:3759: \$? = $ac_status" >&5 (exit $ac_status); }; }; then deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -3792,10 +3770,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext done if test "x$deal_II_isnan_flag" = "x" ; then - echo "$as_me:3795: result: no." >&5 + echo "$as_me:3773: result: no." >&5 echo "${ECHO_T}no." >&6 else - echo "$as_me:3798: result: using $testflag" >&5 + echo "$as_me:3776: result: using $testflag" >&5 echo "${ECHO_T}using $testflag" >&6 CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" fi @@ -3808,10 +3786,10 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS=$CXXFLAGSG - echo "$as_me:3811: checking for rand_r" >&5 + echo "$as_me:3789: checking for rand_r" >&5 echo $ECHO_N "checking for rand_r... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3814 "configure" +#line 3792 "configure" #include "confdefs.h" #include @@ -3828,19 +3806,19 @@ int i=rand_r(&i); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3809: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3834: \$? = $ac_status" >&5 + echo "$as_me:3812: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3837: \"$ac_try\"") >&5 + { (eval echo "$as_me:3815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3840: \$? = $ac_status" >&5 + echo "$as_me:3818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3843: result: found" >&5 + echo "$as_me:3821: result: found" >&5 echo "${ECHO_T}found" >&6 cat >>confdefs.h <<\EOF @@ -3851,7 +3829,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:3854: result: no" >&5 + echo "$as_me:3832: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3859,14 +3837,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext for ac_func in gethostname do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3863: checking for $ac_func" >&5 +ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` +echo "$as_me:3841: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +if eval "test \"\${$ac_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3869 "configure" +#line 3847 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3897,45 +3875,45 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3900: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3878: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3903: \$? = $ac_status" >&5 + echo "$as_me:3881: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3906: \"$ac_try\"") >&5 + { (eval echo "$as_me:3884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3909: \$? = $ac_status" >&5 + echo "$as_me:3887: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + eval "$ac_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" +eval "$ac_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3919: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:3897: result: `eval echo '${'$ac_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 +if test `eval echo '${'$ac_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3907: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:3931: result: ----------------- configuring F77 compilers -----------------" >&5 +echo "$as_me:3909: result: ----------------- configuring F77 compilers -----------------" >&5 echo "${ECHO_T}----------------- configuring F77 compilers -----------------" >&6 for ac_prog in f77 g77 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3938: checking for $ac_word" >&5 +echo "$as_me:3916: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3952,7 +3930,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_F77="$ac_dir/$ac_word" - echo "$as_me:3955: found $ac_dir/$ac_word" >&5 + echo "$as_me:3933: found $ac_dir/$ac_word" >&5 break fi done @@ -3963,10 +3941,10 @@ fi F77=$ac_cv_path_F77 if test -n "$F77"; then - echo "$as_me:3966: result: $F77" >&5 + echo "$as_me:3944: result: $F77" >&5 echo "${ECHO_T}$F77" >&6 else - echo "$as_me:3969: result: no" >&5 + echo "$as_me:3947: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3979,49 +3957,49 @@ done G77_VERSION_STRING="`($F77 -v 2>&1) | grep \"gcc version\"`" case "$G77_VERSION_STRING" in *"egcs-1.1"*) - echo "$as_me:3982: result: F77 compiler is egcs-1.1" >&5 + echo "$as_me:3960: result: F77 compiler is egcs-1.1" >&5 echo "${ECHO_T}F77 compiler is egcs-1.1" >&6 F77_VERSION=egcs1.1 ;; *2.95*) - echo "$as_me:3987: result: F77 compiler is gcc-2.95" >&5 + echo "$as_me:3965: result: F77 compiler is gcc-2.95" >&5 echo "${ECHO_T}F77 compiler is gcc-2.95" >&6 F77_VERSION=gcc2.95 ;; *2.96*) - echo "$as_me:3992: result: F77 compiler is gcc-2.96" >&5 + echo "$as_me:3970: result: F77 compiler is gcc-2.96" >&5 echo "${ECHO_T}F77 compiler is gcc-2.96" >&6 F77_VERSION=gcc2.96 ;; *2.97*) - echo "$as_me:3997: result: F77 compiler is gcc-2.97" >&5 + echo "$as_me:3975: result: F77 compiler is gcc-2.97" >&5 echo "${ECHO_T}F77 compiler is gcc-2.97" >&6 F77_VERSION=gcc2.97 ;; *3.0*) - echo "$as_me:4002: result: F77 compiler is gcc-3.0" >&5 + echo "$as_me:3980: result: F77 compiler is gcc-3.0" >&5 echo "${ECHO_T}F77 compiler is gcc-3.0" >&6 F77_VERSION=gcc3.0 ;; *3.1*) - echo "$as_me:4007: result: F77 compiler is gcc-3.1" >&5 + echo "$as_me:3985: result: F77 compiler is gcc-3.1" >&5 echo "${ECHO_T}F77 compiler is gcc-3.1" >&6 F77_VERSION=gcc3.1 ;; *3.2*) - echo "$as_me:4012: result: F77 compiler is gcc-3.2" >&5 + echo "$as_me:3990: result: F77 compiler is gcc-3.2" >&5 echo "${ECHO_T}F77 compiler is gcc-3.2" >&6 F77_VERSION=gcc3.2 ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) - echo "$as_me:4017: result: F77 compiler is $G77_VERSION_STRING" >&5 + echo "$as_me:3995: result: F77 compiler is $G77_VERSION_STRING" >&5 echo "${ECHO_T}F77 compiler is $G77_VERSION_STRING" >&6 - { { echo "$as_me:4019: error: F77 compiler is not supported" >&5 + { { echo "$as_me:3997: error: F77 compiler is not supported" >&5 echo "$as_me: error: F77 compiler is not supported" >&2;} { (exit 1); exit 1; }; } ;; *) - echo "$as_me:4024: result: F77 compiler is unknown but accepted gcc version" >&5 + echo "$as_me:4002: result: F77 compiler is unknown but accepted gcc version" >&5 echo "${ECHO_T}F77 compiler is unknown but accepted gcc version" >&6 F77_VERSION=gcc-other ;; @@ -4032,7 +4010,7 @@ echo "${ECHO_T}F77 compiler is unknown but accepted gcc version" >&6 if test -n "`echo $F77_VERSION_STRING | grep \"XL Fortran for AIX\"`" ; then F77_VERSION=AIXF77 - echo "$as_me:4035: result: F77 compiler is AIX Fortran77" >&5 + echo "$as_me:4013: result: F77 compiler is AIX Fortran77" >&5 echo "${ECHO_T}F77 compiler is AIX Fortran77" >&6 else @@ -4040,7 +4018,7 @@ echo "${ECHO_T}F77 compiler is AIX Fortran77" >&6 F77_VERSION_STRING=`($F77 -V 2>&1)` if test -n "`echo $F77_VERSION_STRING | grep \"WorkShop Compilers\"`" ; then - echo "$as_me:4043: result: F77 compiler is Sun WorkShop f77" >&5 + echo "$as_me:4021: result: F77 compiler is Sun WorkShop f77" >&5 echo "${ECHO_T}F77 compiler is Sun WorkShop f77" >&6 F77_VERSION="SunF77" @@ -4048,14 +4026,14 @@ echo "${ECHO_T}F77 compiler is Sun WorkShop f77" >&6 F77_VERSION_STRING=`($F77 -version 2>&1)` if test -n "`echo $F77_VERSION_STRING | grep MIPSpro`" ; then - echo "$as_me:4051: result: F77 compiler is MIPSpro f77" >&5 + echo "$as_me:4029: result: F77 compiler is MIPSpro f77" >&5 echo "${ECHO_T}F77 compiler is MIPSpro f77" >&6 F77_VERSION="MIPSproF77" else F77_VERSION= - echo "$as_me:4058: result: F77 compiler is unkown. no flags set!" >&5 + echo "$as_me:4036: result: F77 compiler is unkown. no flags set!" >&5 echo "${ECHO_T}F77 compiler is unkown. no flags set!" >&6 fi fi @@ -4101,7 +4079,7 @@ echo "${ECHO_T}F77 compiler is unkown. no flags set!" >&6 ;; *) - { { echo "$as_me:4104: error: No compiler options for F77 compiler + { { echo "$as_me:4082: error: No compiler options for F77 compiler \"$F77_VERSION\" specified at present" >&5 echo "$as_me: error: No compiler options for F77 compiler \"$F77_VERSION\" specified at present" >&2;} @@ -4109,9 +4087,9 @@ echo "$as_me: error: No compiler options for F77 compiler ;; esac -echo "$as_me:4112: result: " >&5 +echo "$as_me:4090: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:4114: result: -------------- configuring shared/static libs ---------------" >&5 +echo "$as_me:4092: result: -------------- configuring shared/static libs ---------------" >&5 echo "${ECHO_T}-------------- configuring shared/static libs ---------------" >&6 # Check whether --enable-shared or --disable-shared was given. @@ -4124,7 +4102,7 @@ fi; case "$target" in *-aix* | alpha*-linux* | alpha*-osf45* | *cygwin ) - { echo "$as_me:4127: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 + { echo "$as_me:4105: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 echo "$as_me: WARNING: Shared libraries not supported on $target. Using static libs instead" >&2;} enableshared=no ;; @@ -4149,11 +4127,11 @@ fi; for i in $disable_compat ; do case $i in mapping) - echo "$as_me:4152: result: Disabling backward compatibility feature: \"$i\"" >&5 + echo "$as_me:4130: result: Disabling backward compatibility feature: \"$i\"" >&5 echo "${ECHO_T}Disabling backward compatibility feature: \"$i\"" >&6 ;; *) - { { echo "$as_me:4156: error: Backward compatibility feature \"$i\" unknown" >&5 + { { echo "$as_me:4134: error: Backward compatibility feature \"$i\" unknown" >&5 echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} { (exit 1); exit 1; }; } ;; @@ -4178,7 +4156,7 @@ EOF ;; *) - { { echo "$as_me:4181: error: Backward compatibility feature \"$i\" unknown" >&5 + { { echo "$as_me:4159: error: Backward compatibility feature \"$i\" unknown" >&5 echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} { (exit 1); exit 1; }; } ;; @@ -4197,7 +4175,7 @@ else fi fi; if test "$enablemultigrid" = yes ; then - echo "$as_me:4200: result: configuring multigrid" >&5 + echo "$as_me:4178: result: configuring multigrid" >&5 echo "${ECHO_T}configuring multigrid" >&6 cat >>confdefs.h <<\EOF @@ -4206,140 +4184,140 @@ EOF fi -echo "$as_me:4209: result: " >&5 +echo "$as_me:4187: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:4211: result: ---------------- configuring additional libs ----------------" >&5 +echo "$as_me:4189: result: ---------------- configuring additional libs ----------------" >&5 echo "${ECHO_T}---------------- configuring additional libs ----------------" >&6 - as_ac_File=`echo "ac_cv_file_$TECHOME/lib/tecio.a" | $as_tr_sh` -echo "$as_me:4215: checking for $TECHOME/lib/tecio.a" >&5 + ac_ac_File=`echo "ac_cv_file_$TECHOME/lib/tecio.a" | $ac_tr_sh` +echo "$as_me:4193: checking for $TECHOME/lib/tecio.a" >&5 echo $ECHO_N "checking for $TECHOME/lib/tecio.a... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then +if eval "test \"\${$ac_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:4221: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:4199: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$TECHOME/lib/tecio.a"; then - eval "$as_ac_File=yes" + eval "$ac_ac_File=yes" else - eval "$as_ac_File=no" + eval "$ac_ac_File=no" fi fi -echo "$as_me:4230: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +echo "$as_me:4208: result: `eval echo '${'$ac_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$ac_ac_File'}'`" >&6 +if test `eval echo '${'$ac_ac_File'}'` = yes; then TECPLOT_LIBRARY_PATH=$TECHOME/lib/tecio.a fi - as_ac_File=`echo "ac_cv_file_$TEC80HOME/lib/tecio.a" | $as_tr_sh` -echo "$as_me:4237: checking for $TEC80HOME/lib/tecio.a" >&5 + ac_ac_File=`echo "ac_cv_file_$TEC80HOME/lib/tecio.a" | $ac_tr_sh` +echo "$as_me:4215: checking for $TEC80HOME/lib/tecio.a" >&5 echo $ECHO_N "checking for $TEC80HOME/lib/tecio.a... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then +if eval "test \"\${$ac_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:4243: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:4221: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$TEC80HOME/lib/tecio.a"; then - eval "$as_ac_File=yes" + eval "$ac_ac_File=yes" else - eval "$as_ac_File=no" + eval "$ac_ac_File=no" fi fi -echo "$as_me:4252: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +echo "$as_me:4230: result: `eval echo '${'$ac_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$ac_ac_File'}'`" >&6 +if test `eval echo '${'$ac_ac_File'}'` = yes; then TECPLOT_LIBRARY_PATH=$TEC80HOME/lib/tecio.a fi - as_ac_File=`echo "ac_cv_file_$TEC90HOME/lib/tecio.a" | $as_tr_sh` -echo "$as_me:4259: checking for $TEC90HOME/lib/tecio.a" >&5 + ac_ac_File=`echo "ac_cv_file_$TEC90HOME/lib/tecio.a" | $ac_tr_sh` +echo "$as_me:4237: checking for $TEC90HOME/lib/tecio.a" >&5 echo $ECHO_N "checking for $TEC90HOME/lib/tecio.a... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then +if eval "test \"\${$ac_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:4265: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:4243: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$TEC90HOME/lib/tecio.a"; then - eval "$as_ac_File=yes" + eval "$ac_ac_File=yes" else - eval "$as_ac_File=no" + eval "$ac_ac_File=no" fi fi -echo "$as_me:4274: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +echo "$as_me:4252: result: `eval echo '${'$ac_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$ac_ac_File'}'`" >&6 +if test `eval echo '${'$ac_ac_File'}'` = yes; then TECPLOT_LIBRARY_PATH=$TEC90HOME/lib/tecio.a fi - as_ac_File=`echo "ac_cv_file_$TECHOME/include/TECIO.h" | $as_tr_sh` -echo "$as_me:4281: checking for $TECHOME/include/TECIO.h" >&5 + ac_ac_File=`echo "ac_cv_file_$TECHOME/include/TECIO.h" | $ac_tr_sh` +echo "$as_me:4259: checking for $TECHOME/include/TECIO.h" >&5 echo $ECHO_N "checking for $TECHOME/include/TECIO.h... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then +if eval "test \"\${$ac_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:4287: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:4265: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$TECHOME/include/TECIO.h"; then - eval "$as_ac_File=yes" + eval "$ac_ac_File=yes" else - eval "$as_ac_File=no" + eval "$ac_ac_File=no" fi fi -echo "$as_me:4296: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +echo "$as_me:4274: result: `eval echo '${'$ac_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$ac_ac_File'}'`" >&6 +if test `eval echo '${'$ac_ac_File'}'` = yes; then TECPLOT_INCLUDE_PATH=$TECHOME/include fi - as_ac_File=`echo "ac_cv_file_$TEC80HOME/include/TECIO.h" | $as_tr_sh` -echo "$as_me:4303: checking for $TEC80HOME/include/TECIO.h" >&5 + ac_ac_File=`echo "ac_cv_file_$TEC80HOME/include/TECIO.h" | $ac_tr_sh` +echo "$as_me:4281: checking for $TEC80HOME/include/TECIO.h" >&5 echo $ECHO_N "checking for $TEC80HOME/include/TECIO.h... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then +if eval "test \"\${$ac_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:4309: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:4287: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$TEC80HOME/include/TECIO.h"; then - eval "$as_ac_File=yes" + eval "$ac_ac_File=yes" else - eval "$as_ac_File=no" + eval "$ac_ac_File=no" fi fi -echo "$as_me:4318: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +echo "$as_me:4296: result: `eval echo '${'$ac_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$ac_ac_File'}'`" >&6 +if test `eval echo '${'$ac_ac_File'}'` = yes; then TECPLOT_INCLUDE_PATH=$TEC80HOME/include fi - as_ac_File=`echo "ac_cv_file_$TEC90HOME/include/TECIO.h" | $as_tr_sh` -echo "$as_me:4325: checking for $TEC90HOME/include/TECIO.h" >&5 + ac_ac_File=`echo "ac_cv_file_$TEC90HOME/include/TECIO.h" | $ac_tr_sh` +echo "$as_me:4303: checking for $TEC90HOME/include/TECIO.h" >&5 echo $ECHO_N "checking for $TEC90HOME/include/TECIO.h... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then +if eval "test \"\${$ac_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:4331: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:4309: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$TEC90HOME/include/TECIO.h"; then - eval "$as_ac_File=yes" + eval "$ac_ac_File=yes" else - eval "$as_ac_File=no" + eval "$ac_ac_File=no" fi fi -echo "$as_me:4340: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +echo "$as_me:4318: result: `eval echo '${'$ac_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$ac_ac_File'}'`" >&6 +if test `eval echo '${'$ac_ac_File'}'` = yes; then TECPLOT_INCLUDE_PATH=$TEC90HOME/include fi @@ -4352,7 +4330,7 @@ EOF fi - echo "$as_me:4355: checking for HSL subroutines" >&5 + echo "$as_me:4333: checking for HSL subroutines" >&5 echo $ECHO_N "checking for HSL subroutines... $ECHO_C" >&6 hsl_subroutines="" if test -r contrib/hsl/source/ma27.f ; then @@ -4375,18 +4353,18 @@ EOF fi if test "x$hsl_subroutines" != "x" ; then - echo "$as_me:4378: result: $hsl_subroutines" >&5 + echo "$as_me:4356: result: $hsl_subroutines" >&5 echo "${ECHO_T}$hsl_subroutines" >&6 USE_CONTRIB_HSL=yes else - echo "$as_me:4382: result: none found" >&5 + echo "$as_me:4360: result: none found" >&5 echo "${ECHO_T}none found" >&6 USE_CONTRIB_HSL=no fi -echo "$as_me:4387: result: " >&5 +echo "$as_me:4365: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:4389: result: ------------------ checking compiler flags ------------------" >&5 +echo "$as_me:4367: result: ------------------ checking compiler flags ------------------" >&5 echo "${ECHO_T}------------------ checking compiler flags ------------------" >&6 ac_ext=cc @@ -4396,10 +4374,10 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" - echo "$as_me:4399: checking for consistency of CXXFLAGSG flags" >&5 + echo "$as_me:4377: checking for consistency of CXXFLAGSG flags" >&5 echo $ECHO_N "checking for consistency of CXXFLAGSG flags... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4402 "configure" +#line 4380 "configure" #include "confdefs.h" int @@ -4411,26 +4389,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4414: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4417: \$? = $ac_status" >&5 + echo "$as_me:4395: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4420: \"$ac_try\"") >&5 + { (eval echo "$as_me:4398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4423: \$? = $ac_status" >&5 + echo "$as_me:4401: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:4426: result: yes" >&5 + echo "$as_me:4404: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:4433: error: invalid combination of flags!" >&5 + { { echo "$as_me:4411: error: invalid combination of flags!" >&5 echo "$as_me: error: invalid combination of flags!" >&2;} { (exit 1); exit 1; }; } exit 1; @@ -4439,10 +4417,10 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$CXXFLAGSO" - echo "$as_me:4442: checking for consistency of CXXFLAGSO flags" >&5 + echo "$as_me:4420: checking for consistency of CXXFLAGSO flags" >&5 echo $ECHO_N "checking for consistency of CXXFLAGSO flags... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4445 "configure" +#line 4423 "configure" #include "confdefs.h" int @@ -4454,26 +4432,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4457: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4435: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4460: \$? = $ac_status" >&5 + echo "$as_me:4438: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4463: \"$ac_try\"") >&5 + { (eval echo "$as_me:4441: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4466: \$? = $ac_status" >&5 + echo "$as_me:4444: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:4469: result: yes" >&5 + echo "$as_me:4447: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:4476: error: invalid combination of flags!" >&5 + { { echo "$as_me:4454: error: invalid combination of flags!" >&5 echo "$as_me: error: invalid combination of flags!" >&2;} { (exit 1); exit 1; }; } exit 1; @@ -4481,9 +4459,9 @@ echo "$as_me: error: invalid combination of flags!" >&2;} fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:4484: result: " >&5 +echo "$as_me:4462: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:4486: result: ---------------- configuring other programs -----------------" >&5 +echo "$as_me:4464: result: ---------------- configuring other programs -----------------" >&5 echo "${ECHO_T}---------------- configuring other programs -----------------" >&6 # Check whether --with-kdoc or --without-kdoc was given. @@ -4493,17 +4471,17 @@ if test "${with_kdoc+set}" = set; then else kdocdir=${DEAL2_DIR}/contrib/kdoc/bin fi; - echo "$as_me:4496: checking for kdoc" >&5 + echo "$as_me:4474: checking for kdoc" >&5 echo $ECHO_N "checking for kdoc... $ECHO_C" >&6 if test "$kdocdir" != ${DEAL2_DIR}/contrib/kdoc/bin ; then if test -r $kdocdir/kdoc ; then - echo "$as_me:4501: result: found" >&5 + echo "$as_me:4479: result: found" >&5 echo "${ECHO_T}found" >&6 else - echo "$as_me:4504: result: not found" >&5 + echo "$as_me:4482: result: not found" >&5 echo "${ECHO_T}not found" >&6 - { { echo "$as_me:4506: error: Invalid kdoc path $kdocdir/kdoc" >&5 + { { echo "$as_me:4484: error: Invalid kdoc path $kdocdir/kdoc" >&5 echo "$as_me: error: Invalid kdoc path $kdocdir/kdoc" >&2;} { (exit 1); exit 1; }; } fi @@ -4515,7 +4493,7 @@ echo "$as_me: error: Invalid kdoc path $kdocdir/kdoc" >&2;} fi else kdocversion=`cat ${DEAL2_DIR}/contrib/kdoc/src/Version` - echo "$as_me:4518: result: using default version $kdocversion" >&5 + echo "$as_me:4496: result: using default version $kdocversion" >&5 echo "${ECHO_T}using default version $kdocversion" >&6 fi @@ -4529,7 +4507,7 @@ fi; if test "$docxx" = to-be-determined ; then # Extract the first word of ""doc++"", so it can be a program name with args. set dummy "doc++"; ac_word=$2 -echo "$as_me:4532: checking for $ac_word" >&5 +echo "$as_me:4510: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_docxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4546,7 +4524,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_docxx="$ac_dir/$ac_word" - echo "$as_me:4549: found $ac_dir/$ac_word" >&5 + echo "$as_me:4527: found $ac_dir/$ac_word" >&5 break fi done @@ -4557,21 +4535,21 @@ fi docxx=$ac_cv_path_docxx if test -n "$docxx"; then - echo "$as_me:4560: result: $docxx" >&5 + echo "$as_me:4538: result: $docxx" >&5 echo "${ECHO_T}$docxx" >&6 else - echo "$as_me:4563: result: no" >&5 + echo "$as_me:4541: result: no" >&5 echo "${ECHO_T}no" >&6 fi else - echo "$as_me:4568: checking for doc++" >&5 + echo "$as_me:4546: checking for doc++" >&5 echo $ECHO_N "checking for doc++... $ECHO_C" >&6 if test -x "$docxx" ; then - echo "$as_me:4571: result: yes" >&5 + echo "$as_me:4549: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:4574: result: no" >&5 + echo "$as_me:4552: result: no" >&5 echo "${ECHO_T}no" >&6 docxx= fi @@ -4579,7 +4557,7 @@ echo "${ECHO_T}no" >&6 # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:4582: checking for $ac_word" >&5 +echo "$as_me:4560: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4596,7 +4574,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PERL="$ac_dir/$ac_word" - echo "$as_me:4599: found $ac_dir/$ac_word" >&5 + echo "$as_me:4577: found $ac_dir/$ac_word" >&5 break fi done @@ -4607,18 +4585,18 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "$as_me:4610: result: $PERL" >&5 + echo "$as_me:4588: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:4613: result: no" >&5 + echo "$as_me:4591: result: no" >&5 echo "${ECHO_T}no" >&6 fi subdirs="$subdirs contrib tests" -echo "$as_me:4619: result: " >&5 +echo "$as_me:4597: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:4621: result: --------------------- generating output ---------------------" >&5 +echo "$as_me:4599: result: --------------------- generating output ---------------------" >&5 echo "${ECHO_T}--------------------- generating output ---------------------" >&6 ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template doc/Makefile doc/auto/Makefile doc/auto/kdoc/Makefile" @@ -4647,7 +4625,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:4650: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:4628: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -4776,7 +4754,7 @@ EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:4822: error: ambiguous option: $1 + { { echo "$as_me:4800: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -4837,15 +4815,23 @@ Try \`$0 --help' for more information." >&2;} CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; + # Handling of arguments. + 'common/Make.global_options' ) CONFIG_FILES="$CONFIG_FILES common/Make.global_options" ;; + 'common/Makefile.template' ) CONFIG_FILES="$CONFIG_FILES common/Makefile.template" ;; + 'doc/Makefile' ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + 'doc/auto/Makefile' ) CONFIG_FILES="$CONFIG_FILES doc/auto/Makefile" ;; + 'doc/auto/kdoc/Makefile' ) CONFIG_FILES="$CONFIG_FILES doc/auto/kdoc/Makefile" ;; + 'base/include/base/config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS base/include/base/config.h" ;; + # This is an error. - -*) { { echo "$as_me:4841: error: unrecognized option: $1 + -*) { { echo "$as_me:4827: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - + *) { { echo "$as_me:4832: error: invalid argument: $1" >&5 +echo "$as_me: error: invalid argument: $1" >&2;} + { (exit 1); exit 1; }; };; esac shift done @@ -4857,11 +4843,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS +This file was extended by $as_me 2.50, executed with > $ac_cs_invocation on `(hostname || uname -n) 2>/dev/null | sed 1q` @@ -4869,22 +4851,6 @@ _ACEOF EOF cat >>$CONFIG_STATUS <<\EOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "common/Make.global_options" ) CONFIG_FILES="$CONFIG_FILES common/Make.global_options" ;; - "common/Makefile.template" ) CONFIG_FILES="$CONFIG_FILES common/Makefile.template" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/auto/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/auto/Makefile" ;; - "doc/auto/kdoc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/auto/kdoc/Makefile" ;; - "base/include/base/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS base/include/base/config.h" ;; - *) { { echo "$as_me:4882: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -4898,7 +4864,7 @@ fi $debug || { trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap '{ (exit $?); exit $?; }' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -4951,9 +4917,6 @@ s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t @@ -5118,7 +5081,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:5121: creating $ac_file" >&5 + { echo "$as_me:5084: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -5136,7 +5099,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:5139: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5102: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5149,7 +5112,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5152: error: cannot find input file: $f" >&5 + { { echo "$as_me:5115: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5209,7 +5172,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:5212: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:5175: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -5220,7 +5183,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:5223: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5186: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5233,7 +5196,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5236: error: cannot find input file: $f" >&5 + { { echo "$as_me:5199: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5350,7 +5313,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:5353: $ac_file is unchanged" >&5 + { echo "$as_me:5316: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -5454,7 +5417,7 @@ if test "$no_recursion" != yes; then # parts of a large source tree are present. test -d $srcdir/$ac_subdir || continue - { echo "$as_me:5457: configuring in $ac_subdir" >&5 + { echo "$as_me:5420: configuring in $ac_subdir" >&5 echo "$as_me: configuring in $ac_subdir" >&6;} case $srcdir in .) ;; @@ -5476,7 +5439,7 @@ done; } if test -d ./$ac_subdir; then :; else - { { echo "$as_me:5479: error: cannot create \`pwd\`/$ac_subdir" >&5 + { { echo "$as_me:5442: error: cannot create \`pwd\`/$ac_subdir" >&5 echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;} { (exit 1); exit 1; }; } fi @@ -5507,7 +5470,7 @@ echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;} elif test -f $ac_sub_srcdir/configure.in; then ac_sub_configure=$ac_configure else - { echo "$as_me:5510: WARNING: no configuration information is in $ac_subdir" >&5 + { echo "$as_me:5473: WARNING: no configuration information is in $ac_subdir" >&5 echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;} ac_sub_configure= fi @@ -5521,12 +5484,12 @@ echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;} ac_sub_cache_file=$ac_dots$cache_file ;; esac - { echo "$as_me:5524: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5 + { echo "$as_me:5487: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5 echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;} # The eval makes quoting arguments work. eval $ac_sub_configure $ac_sub_configure_args \ --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir || - { { echo "$as_me:5529: error: $ac_sub_configure failed for $ac_subdir" >&5 + { { echo "$as_me:5492: error: $ac_sub_configure failed for $ac_subdir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;} { (exit 1); exit 1; }; } fi diff --git a/deal.II/configure.in b/deal.II/configure.in index 1438b00ad0..146d25c00e 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -155,6 +155,7 @@ DEAL_II_HAVE_STD_STRINGSTREAM DEAL_II_HAVE_STD_NUMERIC_LIMITS DEAL_II_HAVE_STD_OSTREAM_HEADER DEAL_II_HAVE_STD_IOSFWD_HEADER +DEAL_II_HAVE_BUILTIN_EXPECT DEAL_II_HAVE_LRAND48_DECLARED DEAL_II_CHECK_GETRUSAGE DEAL_II_CHECK_ISNAN diff --git a/deal.II/doc/news/2002/c-3-3.html b/deal.II/doc/news/2002/c-3-3.html index 7506939c15..9c5eeb5b0d 100644 --- a/deal.II/doc/news/2002/c-3-3.html +++ b/deal.II/doc/news/2002/c-3-3.html @@ -67,6 +67,16 @@ contributor's names are abbreviated by WB (Wolfgang Bangerth), GK

base

    +
  1. + Improved: The AssertThrow macro now + uses __builtin_expect if the + compiler supports this. This indicates to the compiler that we + expect the condition to be true and that throwing an exception + is a rare case. +
    + (WB 2002/03/13) +

    +
  2. New: The vector2d class now not only allows access to elements through the