ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/configure
(Generate patch)

Comparing trunk/OOPSE/configure (file contents):
Revision 840 by gezelter, Wed Oct 29 14:29:12 2003 UTC vs.
Revision 944 by gezelter, Wed Jan 14 22:41:34 2004 UTC

# Line 1 | Line 1
1   #! /bin/sh
2   # Guess values for system-dependent variables and create Makefiles.
3 < # Generated by GNU Autoconf 2.57 for OOPSE 1.0.
3 > # Generated by GNU Autoconf 2.59 for OOPSE 1.0.
4   #
5   # Report bugs to <gezelter@nd.edu>.
6   #
7 < # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
8 < # Free Software Foundation, Inc.
7 > # Copyright (C) 2003 Free Software Foundation, Inc.
8   # This configure script is free software; the Free Software Foundation
9   # gives unlimited permission to copy, distribute and modify it.
10   ## --------------------- ##
# Line 22 | Line 21 | fi
21   elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
22    set -o posix
23   fi
24 + DUALCASE=1; export DUALCASE # for MKS sh
25  
26   # Support unset when possible.
27 < if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
27 > if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
28    as_unset=unset
29   else
30    as_unset=false
# Line 43 | Line 43 | do
43    LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
44    LC_TELEPHONE LC_TIME
45   do
46 <  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
46 >  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
47      eval $as_var=C; export $as_var
48    else
49      $as_unset $as_var
# Line 220 | Line 220 | else
220   if mkdir -p . 2>/dev/null; then
221    as_mkdir_p=:
222   else
223 +  test -d ./-p && rmdir ./-p
224    as_mkdir_p=false
225   fi
226  
227   as_executable_p="test -f"
228  
229   # Sed expression to map a string onto a valid CPP name.
230 < as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
230 > as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
231  
232   # Sed expression to map a string onto a valid variable name.
233 < as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
233 > as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
234  
235  
236   # IFS
# Line 311 | Line 312 | ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA
312   # include <unistd.h>
313   #endif"
314  
315 < ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR mpi_dir MPI_LIBDIR MPI_INC MPI_LIB MPIF77 MPIF90 MPILIBS CPP EGREP SPRNG_LIBDIR SPRNG_LIB SPRNG_INC HAVE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL MPI_F90_MODS MPIMODLIBNAME BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LIBOBJS LTLIBOBJS'
315 > ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR mpi MPI_LIBDIR MPI_INC MPI_F90INC MPI_LIB MPI_F90LIB CPP EGREP SPRNG_LIBDIR SPRNG_LIB SPRNG_INC HAVE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LIBOBJS LTLIBOBJS'
316   ac_subst_files=''
317  
318   # Initialize some variables set by options.
# Line 670 | Line 671 | for ac_var in bindir sbindir libexecdir datadir syscon
671  
672   # Be sure to have absolute paths.
673   for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
674 <              localstatedir libdir includedir oldincludedir infodir mandir
674 >              localstatedir libdir includedir oldincludedir infodir mandir
675   do
676    eval ac_val=$`echo $ac_var`
677    case $ac_val in
# Line 710 | Line 711 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
711    # Try the directory containing this script, then its parent.
712    ac_confdir=`(dirname "$0") 2>/dev/null ||
713   $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
714 <         X"$0" : 'X\(//\)[^/]' \| \
715 <         X"$0" : 'X\(//\)$' \| \
716 <         X"$0" : 'X\(/\)' \| \
717 <         .     : '\(.\)' 2>/dev/null ||
714 >         X"$0" : 'X\(//\)[^/]' \| \
715 >         X"$0" : 'X\(//\)$' \| \
716 >         X"$0" : 'X\(/\)' \| \
717 >         .     : '\(.\)' 2>/dev/null ||
718   echo X"$0" |
719      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
720            /^X\(\/\/\)[^/].*/{ s//\1/; q; }
# Line 784 | Line 785 | ac_env_MPIF77_set=${MPIF77+set}
785   ac_env_F90FLAGS_value=$F90FLAGS
786   ac_cv_env_F90FLAGS_set=${F90FLAGS+set}
787   ac_cv_env_F90FLAGS_value=$F90FLAGS
787 – ac_env_MPIF77_set=${MPIF77+set}
788 – ac_env_MPIF77_value=$MPIF77
789 – ac_cv_env_MPIF77_set=${MPIF77+set}
790 – ac_cv_env_MPIF77_value=$MPIF77
788   ac_env_CPP_set=${CPP+set}
789   ac_env_CPP_value=$CPP
790   ac_cv_env_CPP_set=${CPP+set}
# Line 825 | Line 822 | Installation directories:
822    cat <<_ACEOF
823   Installation directories:
824    --prefix=PREFIX         install architecture-independent files in PREFIX
825 <                          [$ac_default_prefix]
825 >                          [$ac_default_prefix]
826    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
827 <                          [PREFIX]
827 >                          [PREFIX]
828  
829   By default, \`make install' will install all the files in
830   \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
# Line 874 | Line 871 | Optional Packages:
871   Optional Packages:
872    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
873    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
874 <  --with-mpi_dir=MPIDIR   give the path for MPI /usr/local
874 >  --with-mpi=MPIDIR   give the path for MPI /usr/local
875    --with-mpi-libdir=dir  give the path for MPI-libraries MPI_DIR/lib
876 <  --with-mpi_inc=dir  give the path for MPI-include-files MPI_DIR/include
876 >  --with-mpi-inc=dir  give the path for MPI-include-files MPI_DIR/include
877    --with-sprng_prefix=PREFIX
878                            Prefix where SPRNG is installed
879    --with-sprng-libdir=PREFIX  SPRNG library directory
880    --with-sprng-include=PREFIX
881                            SPRNG include directory
882 <  --with-mkl              Do we want MKL will check /usr/local/intel/mkl60 /opt/intel/mkl60
886 <  --with-mpi_f90_mods=<dir>
887 <                          Location where MPI f90 modules are installed
882 >  --with-mkl              Do we want MKL will check /usr/local/intel/mkl61 /opt/intel/mkl61
883  
884   Some influential environment variables:
885    CC          C compiler command
# Line 897 | Line 892 | Some influential environment variables:
892    CXXFLAGS    C++ compiler flags
893    F90         Fortran 90 compiler command
894    F90FLAGS    Fortran 90 compiler flags
900 –  MPIF77      MPI Fortran compiler command
895    CPP         C preprocessor
896  
897   Use these variables to override the choices made by `configure' or to help
# Line 937 | Line 931 | esac
931      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
932      ac_top_srcdir=$ac_top_builddir$srcdir ;;
933   esac
934 < # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
935 < # absolute.
936 < ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
937 < ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
938 < ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
939 < ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
934 >
935 > # Do not use `cd foo && pwd` to compute absolute paths, because
936 > # the directories may not exist.
937 > case `pwd` in
938 > .) ac_abs_builddir="$ac_dir";;
939 > *)
940 >  case "$ac_dir" in
941 >  .) ac_abs_builddir=`pwd`;;
942 >  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
943 >  *) ac_abs_builddir=`pwd`/"$ac_dir";;
944 >  esac;;
945 > esac
946 > case $ac_abs_builddir in
947 > .) ac_abs_top_builddir=${ac_top_builddir}.;;
948 > *)
949 >  case ${ac_top_builddir}. in
950 >  .) ac_abs_top_builddir=$ac_abs_builddir;;
951 >  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
952 >  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
953 >  esac;;
954 > esac
955 > case $ac_abs_builddir in
956 > .) ac_abs_srcdir=$ac_srcdir;;
957 > *)
958 >  case $ac_srcdir in
959 >  .) ac_abs_srcdir=$ac_abs_builddir;;
960 >  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
961 >  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
962 >  esac;;
963 > esac
964 > case $ac_abs_builddir in
965 > .) ac_abs_top_srcdir=$ac_top_srcdir;;
966 > *)
967 >  case $ac_top_srcdir in
968 >  .) ac_abs_top_srcdir=$ac_abs_builddir;;
969 >  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
970 >  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
971 >  esac;;
972 > esac
973  
974      cd $ac_dir
975      # Check for guested configure; otherwise get Cygnus style configure.
# Line 953 | Line 980 | ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir &
980        echo
981        $SHELL $ac_srcdir/configure  --help=recursive
982      elif test -f $ac_srcdir/configure.ac ||
983 <           test -f $ac_srcdir/configure.in; then
983 >           test -f $ac_srcdir/configure.in; then
984        echo
985        $ac_configure --help
986      else
# Line 967 | Line 994 | generated by GNU Autoconf 2.57
994   if $ac_init_version; then
995    cat <<\_ACEOF
996   OOPSE configure 1.0
997 < generated by GNU Autoconf 2.57
997 > generated by GNU Autoconf 2.59
998  
999 < Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
973 < Free Software Foundation, Inc.
999 > Copyright (C) 2003 Free Software Foundation, Inc.
1000   This configure script is free software; the Free Software Foundation
1001   gives unlimited permission to copy, distribute and modify it.
1002   _ACEOF
# Line 982 | Line 1008 | generated by GNU Autoconf 2.57.  Invocation command li
1008   running configure, to aid debugging if configure makes a mistake.
1009  
1010   It was created by OOPSE $as_me 1.0, which was
1011 < generated by GNU Autoconf 2.57.  Invocation command line was
1011 > generated by GNU Autoconf 2.59.  Invocation command line was
1012  
1013    $ $0 $@
1014  
# Line 1059 | Line 1085 | do
1085      2)
1086        ac_configure_args1="$ac_configure_args1 '$ac_arg'"
1087        if test $ac_must_keep_next = true; then
1088 <        ac_must_keep_next=false # Got value, back to normal.
1088 >        ac_must_keep_next=false # Got value, back to normal.
1089        else
1090 <        case $ac_arg in
1091 <          *=* | --config-cache | -C | -disable-* | --disable-* \
1092 <          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
1093 <          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
1094 <          | -with-* | --with-* | -without-* | --without-* | --x)
1095 <            case "$ac_configure_args0 " in
1096 <              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
1097 <            esac
1098 <            ;;
1099 <          -* ) ac_must_keep_next=true ;;
1100 <        esac
1090 >        case $ac_arg in
1091 >          *=* | --config-cache | -C | -disable-* | --disable-* \
1092 >          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
1093 >          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
1094 >          | -with-* | --with-* | -without-* | --without-* | --x)
1095 >            case "$ac_configure_args0 " in
1096 >              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
1097 >            esac
1098 >            ;;
1099 >          -* ) ac_must_keep_next=true ;;
1100 >        esac
1101        fi
1102        ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
1103        # Get rid of the leading space.
# Line 1105 | Line 1131 | _ASBOX
1131      case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
1132      *ac_space=\ *)
1133        sed -n \
1134 <        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1135 <          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1134 >        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1135 >          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1136        ;;
1137      *)
1138        sed -n \
1139 <        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1139 >        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1140        ;;
1141      esac;
1142   }
# Line 1139 | Line 1165 | _ASBOX
1165        for ac_var in $ac_subst_files
1166        do
1167          eval ac_val=$`echo $ac_var`
1168 <        echo "$ac_var='"'"'$ac_val'"'"'"
1168 >        echo "$ac_var='"'"'$ac_val'"'"'"
1169        done | sort
1170        echo
1171      fi
# Line 1158 | Line 1184 | _ASBOX
1184        echo "$as_me: caught signal $ac_signal"
1185      echo "$as_me: exit $exit_status"
1186    } >&5
1187 <  rm -f core core.* *.core &&
1187 >  rm -f core *.core &&
1188    rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
1189      exit $exit_status
1190       ' 0
# Line 1238 | Line 1264 | for ac_var in `(set) 2>&1 |
1264   # value.
1265   ac_cache_corrupted=false
1266   for ac_var in `(set) 2>&1 |
1267 <               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
1267 >               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
1268    eval ac_old_set=\$ac_cv_env_${ac_var}_set
1269    eval ac_new_set=\$ac_env_${ac_var}_set
1270    eval ac_old_val="\$ac_cv_env_${ac_var}_value"
# Line 1255 | Line 1281 | echo "$as_me: error: \`$ac_var' was not set in the pre
1281      ,);;
1282      *)
1283        if test "x$ac_old_val" != "x$ac_new_val"; then
1284 <        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1284 >        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1285   echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1286 <        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
1286 >        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
1287   echo "$as_me:   former value:  $ac_old_val" >&2;}
1288 <        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
1288 >        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
1289   echo "$as_me:   current value: $ac_new_val" >&2;}
1290 <        ac_cache_corrupted=:
1290 >        ac_cache_corrupted=:
1291        fi;;
1292    esac
1293    # Pass precious variables to config.status.
# Line 1836 | Line 1862 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1862  
1863  
1864  
1865 +
1866 +
1867 +
1868 +
1869 +
1870 +
1871 +
1872 +
1873   # set program name
1874   PROGNAME="oopse"
1875  
# Line 2034 | Line 2068 | cat >conftest.$ac_ext <<_ACEOF
2068    (exit $ac_status); }
2069  
2070   cat >conftest.$ac_ext <<_ACEOF
2037 – #line $LINENO "configure"
2071   /* confdefs.h.  */
2072   _ACEOF
2073   cat confdefs.h >>conftest.$ac_ext
# Line 2054 | Line 2087 | echo "$as_me:$LINENO: checking for C compiler default
2087   # Try to create an executable without -o first, disregard a.out.
2088   # It will help us diagnose broken compilers, and finding out an intuition
2089   # of exeext.
2090 < echo "$as_me:$LINENO: checking for C compiler default output" >&5
2091 < echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
2090 > echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
2091 > echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
2092   ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2093   if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
2094    (eval $ac_link_default) 2>&5
# Line 2075 | Line 2108 | do
2108    test -f "$ac_file" || continue
2109    case $ac_file in
2110      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
2111 <        ;;
2111 >        ;;
2112      conftest.$ac_ext )
2113 <        # This is the source file.
2114 <        ;;
2113 >        # This is the source file.
2114 >        ;;
2115      [ab].out )
2116 <        # We found the default executable, but exeext='' is most
2117 <        # certainly right.
2118 <        break;;
2116 >        # We found the default executable, but exeext='' is most
2117 >        # certainly right.
2118 >        break;;
2119      *.* )
2120 <        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2121 <        # FIXME: I believe we export ac_cv_exeext for Libtool,
2122 <        # but it would be cool to find out if it's true.  Does anybody
2123 <        # maintain Libtool? --akim.
2124 <        export ac_cv_exeext
2125 <        break;;
2120 >        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2121 >        # FIXME: I believe we export ac_cv_exeext for Libtool,
2122 >        # but it would be cool to find out if it's true.  Does anybody
2123 >        # maintain Libtool? --akim.
2124 >        export ac_cv_exeext
2125 >        break;;
2126      * )
2127 <        break;;
2127 >        break;;
2128    esac
2129   done
2130   else
# Line 2165 | Line 2198 | for ac_file in conftest.exe conftest conftest.*; do
2198    case $ac_file in
2199      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
2200      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2201 <          export ac_cv_exeext
2202 <          break;;
2201 >          export ac_cv_exeext
2202 >          break;;
2203      * ) break;;
2204    esac
2205   done
# Line 2191 | Line 2224 | else
2224    echo $ECHO_N "(cached) $ECHO_C" >&6
2225   else
2226    cat >conftest.$ac_ext <<_ACEOF
2194 – #line $LINENO "configure"
2227   /* confdefs.h.  */
2228   _ACEOF
2229   cat confdefs.h >>conftest.$ac_ext
# Line 2242 | Line 2274 | else
2274    echo $ECHO_N "(cached) $ECHO_C" >&6
2275   else
2276    cat >conftest.$ac_ext <<_ACEOF
2245 – #line $LINENO "configure"
2277   /* confdefs.h.  */
2278   _ACEOF
2279   cat confdefs.h >>conftest.$ac_ext
# Line 2262 | Line 2293 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2293   _ACEOF
2294   rm -f conftest.$ac_objext
2295   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2296 <  (eval $ac_compile) 2>&5
2296 >  (eval $ac_compile) 2>conftest.er1
2297    ac_status=$?
2298 +  grep -v '^ *+' conftest.er1 >conftest.err
2299 +  rm -f conftest.er1
2300 +  cat conftest.err >&5
2301    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2302    (exit $ac_status); } &&
2303 <         { ac_try='test -s conftest.$ac_objext'
2303 >         { ac_try='test -z "$ac_c_werror_flag"
2304 >                         || test ! -s conftest.err'
2305    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2306    (eval $ac_try) 2>&5
2307    ac_status=$?
2308    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2309 +  (exit $ac_status); }; } &&
2310 +         { ac_try='test -s conftest.$ac_objext'
2311 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2312 +  (eval $ac_try) 2>&5
2313 +  ac_status=$?
2314 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2315    (exit $ac_status); }; }; then
2316    ac_compiler_gnu=yes
2317   else
# Line 2279 | Line 2320 | rm -f conftest.$ac_objext conftest.$ac_ext
2320  
2321   ac_compiler_gnu=no
2322   fi
2323 < rm -f conftest.$ac_objext conftest.$ac_ext
2323 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2324   ac_cv_c_compiler_gnu=$ac_compiler_gnu
2325  
2326   fi
# Line 2295 | Line 2336 | else
2336    echo $ECHO_N "(cached) $ECHO_C" >&6
2337   else
2338    cat >conftest.$ac_ext <<_ACEOF
2298 – #line $LINENO "configure"
2339   /* confdefs.h.  */
2340   _ACEOF
2341   cat confdefs.h >>conftest.$ac_ext
# Line 2312 | Line 2352 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2352   _ACEOF
2353   rm -f conftest.$ac_objext
2354   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2355 <  (eval $ac_compile) 2>&5
2355 >  (eval $ac_compile) 2>conftest.er1
2356    ac_status=$?
2357 +  grep -v '^ *+' conftest.er1 >conftest.err
2358 +  rm -f conftest.er1
2359 +  cat conftest.err >&5
2360    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2361    (exit $ac_status); } &&
2362 <         { ac_try='test -s conftest.$ac_objext'
2362 >         { ac_try='test -z "$ac_c_werror_flag"
2363 >                         || test ! -s conftest.err'
2364    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2365    (eval $ac_try) 2>&5
2366    ac_status=$?
2367    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2368 +  (exit $ac_status); }; } &&
2369 +         { ac_try='test -s conftest.$ac_objext'
2370 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2371 +  (eval $ac_try) 2>&5
2372 +  ac_status=$?
2373 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2374    (exit $ac_status); }; }; then
2375    ac_cv_prog_cc_g=yes
2376   else
# Line 2329 | Line 2379 | rm -f conftest.$ac_objext conftest.$ac_ext
2379  
2380   ac_cv_prog_cc_g=no
2381   fi
2382 < rm -f conftest.$ac_objext conftest.$ac_ext
2382 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2383   fi
2384   echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2385   echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
# Line 2356 | Line 2406 | cat >conftest.$ac_ext <<_ACEOF
2406    ac_cv_prog_cc_stdc=no
2407   ac_save_CC=$CC
2408   cat >conftest.$ac_ext <<_ACEOF
2359 – #line $LINENO "configure"
2409   /* confdefs.h.  */
2410   _ACEOF
2411   cat confdefs.h >>conftest.$ac_ext
# Line 2384 | Line 2433 | int test (int i, double x);
2433    va_end (v);
2434    return s;
2435   }
2436 +
2437 + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
2438 +   function prototypes and stuff, but not '\xHH' hex character constants.
2439 +   These don't provoke an error unfortunately, instead are silently treated
2440 +   as 'x'.  The following induces an error, until -std1 is added to get
2441 +   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
2442 +   array size at least.  It's necessary to write '\x00'==0 to get something
2443 +   that's true only with -std1.  */
2444 + int osf4_cc_array ['\x00' == 0 ? 1 : -1];
2445 +
2446   int test (int i, double x);
2447   struct s1 {int (*f) (int a);};
2448   struct s2 {int (*f) (double a);};
# Line 2410 | Line 2469 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2469    CC="$ac_save_CC $ac_arg"
2470    rm -f conftest.$ac_objext
2471   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2472 <  (eval $ac_compile) 2>&5
2472 >  (eval $ac_compile) 2>conftest.er1
2473    ac_status=$?
2474 +  grep -v '^ *+' conftest.er1 >conftest.err
2475 +  rm -f conftest.er1
2476 +  cat conftest.err >&5
2477    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2478    (exit $ac_status); } &&
2479 <         { ac_try='test -s conftest.$ac_objext'
2479 >         { ac_try='test -z "$ac_c_werror_flag"
2480 >                         || test ! -s conftest.err'
2481    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2482    (eval $ac_try) 2>&5
2483    ac_status=$?
2484    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2485 +  (exit $ac_status); }; } &&
2486 +         { ac_try='test -s conftest.$ac_objext'
2487 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2488 +  (eval $ac_try) 2>&5
2489 +  ac_status=$?
2490 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2491    (exit $ac_status); }; }; then
2492    ac_cv_prog_cc_stdc=$ac_arg
2493   break
# Line 2427 | Line 2496 | rm -f conftest.$ac_objext
2496   sed 's/^/| /' conftest.$ac_ext >&5
2497  
2498   fi
2499 < rm -f conftest.$ac_objext
2499 > rm -f conftest.err conftest.$ac_objext
2500   done
2501   rm -f conftest.$ac_ext conftest.$ac_objext
2502   CC=$ac_save_CC
# Line 2455 | Line 2524 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2524   _ACEOF
2525   rm -f conftest.$ac_objext
2526   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2527 <  (eval $ac_compile) 2>&5
2527 >  (eval $ac_compile) 2>conftest.er1
2528    ac_status=$?
2529 +  grep -v '^ *+' conftest.er1 >conftest.err
2530 +  rm -f conftest.er1
2531 +  cat conftest.err >&5
2532    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2533    (exit $ac_status); } &&
2534 <         { ac_try='test -s conftest.$ac_objext'
2534 >         { ac_try='test -z "$ac_c_werror_flag"
2535 >                         || test ! -s conftest.err'
2536    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2537    (eval $ac_try) 2>&5
2538    ac_status=$?
2539    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2540 +  (exit $ac_status); }; } &&
2541 +         { ac_try='test -s conftest.$ac_objext'
2542 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2543 +  (eval $ac_try) 2>&5
2544 +  ac_status=$?
2545 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2546    (exit $ac_status); }; }; then
2547    for ac_declaration in \
2548 <   ''\
2470 <   '#include <stdlib.h>' \
2548 >   '' \
2549     'extern "C" void std::exit (int) throw (); using std::exit;' \
2550     'extern "C" void std::exit (int); using std::exit;' \
2551     'extern "C" void exit (int) throw ();' \
# Line 2475 | Line 2553 | do
2553     'void exit (int);'
2554   do
2555    cat >conftest.$ac_ext <<_ACEOF
2478 – #line $LINENO "configure"
2556   /* confdefs.h.  */
2557   _ACEOF
2558   cat confdefs.h >>conftest.$ac_ext
2559   cat >>conftest.$ac_ext <<_ACEOF
2560   /* end confdefs.h.  */
2484 – #include <stdlib.h>
2561   $ac_declaration
2562 + #include <stdlib.h>
2563   int
2564   main ()
2565   {
# Line 2493 | Line 2570 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2570   _ACEOF
2571   rm -f conftest.$ac_objext
2572   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2573 <  (eval $ac_compile) 2>&5
2573 >  (eval $ac_compile) 2>conftest.er1
2574    ac_status=$?
2575 +  grep -v '^ *+' conftest.er1 >conftest.err
2576 +  rm -f conftest.er1
2577 +  cat conftest.err >&5
2578    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2579    (exit $ac_status); } &&
2580 <         { ac_try='test -s conftest.$ac_objext'
2580 >         { ac_try='test -z "$ac_c_werror_flag"
2581 >                         || test ! -s conftest.err'
2582    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2583    (eval $ac_try) 2>&5
2584    ac_status=$?
2585    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2586 +  (exit $ac_status); }; } &&
2587 +         { ac_try='test -s conftest.$ac_objext'
2588 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2589 +  (eval $ac_try) 2>&5
2590 +  ac_status=$?
2591 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2592    (exit $ac_status); }; }; then
2593    :
2594   else
# Line 2510 | Line 2597 | rm -f conftest.$ac_objext conftest.$ac_ext
2597  
2598   continue
2599   fi
2600 < rm -f conftest.$ac_objext conftest.$ac_ext
2600 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2601    cat >conftest.$ac_ext <<_ACEOF
2515 – #line $LINENO "configure"
2602   /* confdefs.h.  */
2603   _ACEOF
2604   cat confdefs.h >>conftest.$ac_ext
# Line 2529 | Line 2615 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2615   _ACEOF
2616   rm -f conftest.$ac_objext
2617   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2618 <  (eval $ac_compile) 2>&5
2618 >  (eval $ac_compile) 2>conftest.er1
2619    ac_status=$?
2620 +  grep -v '^ *+' conftest.er1 >conftest.err
2621 +  rm -f conftest.er1
2622 +  cat conftest.err >&5
2623    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2624    (exit $ac_status); } &&
2625 <         { ac_try='test -s conftest.$ac_objext'
2625 >         { ac_try='test -z "$ac_c_werror_flag"
2626 >                         || test ! -s conftest.err'
2627    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2628    (eval $ac_try) 2>&5
2629    ac_status=$?
2630    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2631 +  (exit $ac_status); }; } &&
2632 +         { ac_try='test -s conftest.$ac_objext'
2633 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2634 +  (eval $ac_try) 2>&5
2635 +  ac_status=$?
2636 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2637    (exit $ac_status); }; }; then
2638    break
2639   else
# Line 2545 | Line 2641 | rm -f conftest.$ac_objext conftest.$ac_ext
2641   sed 's/^/| /' conftest.$ac_ext >&5
2642  
2643   fi
2644 < rm -f conftest.$ac_objext conftest.$ac_ext
2644 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2645   done
2646   rm -f conftest*
2647   if test -n "$ac_declaration"; then
# Line 2559 | Line 2655 | rm -f conftest.$ac_objext conftest.$ac_ext
2655   sed 's/^/| /' conftest.$ac_ext >&5
2656  
2657   fi
2658 < rm -f conftest.$ac_objext conftest.$ac_ext
2658 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2659   ac_ext=c
2660   ac_cpp='$CPP $CPPFLAGS'
2661   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 2686 | Line 2782 | else
2782    echo $ECHO_N "(cached) $ECHO_C" >&6
2783   else
2784    cat >conftest.$ac_ext <<_ACEOF
2689 – #line $LINENO "configure"
2785   /* confdefs.h.  */
2786   _ACEOF
2787   cat confdefs.h >>conftest.$ac_ext
# Line 2706 | Line 2801 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2801   _ACEOF
2802   rm -f conftest.$ac_objext
2803   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2804 <  (eval $ac_compile) 2>&5
2804 >  (eval $ac_compile) 2>conftest.er1
2805    ac_status=$?
2806 +  grep -v '^ *+' conftest.er1 >conftest.err
2807 +  rm -f conftest.er1
2808 +  cat conftest.err >&5
2809    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2810    (exit $ac_status); } &&
2811 <         { ac_try='test -s conftest.$ac_objext'
2811 >         { ac_try='test -z "$ac_cxx_werror_flag"
2812 >                         || test ! -s conftest.err'
2813    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2814    (eval $ac_try) 2>&5
2815    ac_status=$?
2816    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2817 +  (exit $ac_status); }; } &&
2818 +         { ac_try='test -s conftest.$ac_objext'
2819 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2820 +  (eval $ac_try) 2>&5
2821 +  ac_status=$?
2822 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2823    (exit $ac_status); }; }; then
2824    ac_compiler_gnu=yes
2825   else
# Line 2723 | Line 2828 | rm -f conftest.$ac_objext conftest.$ac_ext
2828  
2829   ac_compiler_gnu=no
2830   fi
2831 < rm -f conftest.$ac_objext conftest.$ac_ext
2831 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2832   ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
2833  
2834   fi
# Line 2739 | Line 2844 | else
2844    echo $ECHO_N "(cached) $ECHO_C" >&6
2845   else
2846    cat >conftest.$ac_ext <<_ACEOF
2742 – #line $LINENO "configure"
2847   /* confdefs.h.  */
2848   _ACEOF
2849   cat confdefs.h >>conftest.$ac_ext
# Line 2756 | Line 2860 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2860   _ACEOF
2861   rm -f conftest.$ac_objext
2862   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2863 <  (eval $ac_compile) 2>&5
2863 >  (eval $ac_compile) 2>conftest.er1
2864    ac_status=$?
2865 +  grep -v '^ *+' conftest.er1 >conftest.err
2866 +  rm -f conftest.er1
2867 +  cat conftest.err >&5
2868    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2869    (exit $ac_status); } &&
2870 <         { ac_try='test -s conftest.$ac_objext'
2870 >         { ac_try='test -z "$ac_cxx_werror_flag"
2871 >                         || test ! -s conftest.err'
2872    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2873    (eval $ac_try) 2>&5
2874    ac_status=$?
2875    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2876 +  (exit $ac_status); }; } &&
2877 +         { ac_try='test -s conftest.$ac_objext'
2878 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2879 +  (eval $ac_try) 2>&5
2880 +  ac_status=$?
2881 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2882    (exit $ac_status); }; }; then
2883    ac_cv_prog_cxx_g=yes
2884   else
# Line 2773 | Line 2887 | rm -f conftest.$ac_objext conftest.$ac_ext
2887  
2888   ac_cv_prog_cxx_g=no
2889   fi
2890 < rm -f conftest.$ac_objext conftest.$ac_ext
2890 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2891   fi
2892   echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
2893   echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
# Line 2793 | Line 2907 | for ac_declaration in \
2907    fi
2908   fi
2909   for ac_declaration in \
2910 <   ''\
2797 <   '#include <stdlib.h>' \
2910 >   '' \
2911     'extern "C" void std::exit (int) throw (); using std::exit;' \
2912     'extern "C" void std::exit (int); using std::exit;' \
2913     'extern "C" void exit (int) throw ();' \
# Line 2802 | Line 2915 | do
2915     'void exit (int);'
2916   do
2917    cat >conftest.$ac_ext <<_ACEOF
2805 – #line $LINENO "configure"
2918   /* confdefs.h.  */
2919   _ACEOF
2920   cat confdefs.h >>conftest.$ac_ext
2921   cat >>conftest.$ac_ext <<_ACEOF
2922   /* end confdefs.h.  */
2811 – #include <stdlib.h>
2923   $ac_declaration
2924 + #include <stdlib.h>
2925   int
2926   main ()
2927   {
# Line 2820 | Line 2932 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2932   _ACEOF
2933   rm -f conftest.$ac_objext
2934   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2935 <  (eval $ac_compile) 2>&5
2935 >  (eval $ac_compile) 2>conftest.er1
2936    ac_status=$?
2937 +  grep -v '^ *+' conftest.er1 >conftest.err
2938 +  rm -f conftest.er1
2939 +  cat conftest.err >&5
2940    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2941    (exit $ac_status); } &&
2942 <         { ac_try='test -s conftest.$ac_objext'
2942 >         { ac_try='test -z "$ac_cxx_werror_flag"
2943 >                         || test ! -s conftest.err'
2944    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2945    (eval $ac_try) 2>&5
2946    ac_status=$?
2947    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2948 +  (exit $ac_status); }; } &&
2949 +         { ac_try='test -s conftest.$ac_objext'
2950 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2951 +  (eval $ac_try) 2>&5
2952 +  ac_status=$?
2953 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2954    (exit $ac_status); }; }; then
2955    :
2956   else
# Line 2837 | Line 2959 | rm -f conftest.$ac_objext conftest.$ac_ext
2959  
2960   continue
2961   fi
2962 < rm -f conftest.$ac_objext conftest.$ac_ext
2962 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2963    cat >conftest.$ac_ext <<_ACEOF
2842 – #line $LINENO "configure"
2964   /* confdefs.h.  */
2965   _ACEOF
2966   cat confdefs.h >>conftest.$ac_ext
# Line 2856 | Line 2977 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2977   _ACEOF
2978   rm -f conftest.$ac_objext
2979   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2980 <  (eval $ac_compile) 2>&5
2980 >  (eval $ac_compile) 2>conftest.er1
2981    ac_status=$?
2982 +  grep -v '^ *+' conftest.er1 >conftest.err
2983 +  rm -f conftest.er1
2984 +  cat conftest.err >&5
2985    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2986    (exit $ac_status); } &&
2987 <         { ac_try='test -s conftest.$ac_objext'
2987 >         { ac_try='test -z "$ac_cxx_werror_flag"
2988 >                         || test ! -s conftest.err'
2989    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2990    (eval $ac_try) 2>&5
2991    ac_status=$?
2992    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2993 +  (exit $ac_status); }; } &&
2994 +         { ac_try='test -s conftest.$ac_objext'
2995 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2996 +  (eval $ac_try) 2>&5
2997 +  ac_status=$?
2998 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2999    (exit $ac_status); }; }; then
3000    break
3001   else
# Line 2872 | Line 3003 | rm -f conftest.$ac_objext conftest.$ac_ext
3003   sed 's/^/| /' conftest.$ac_ext >&5
3004  
3005   fi
3006 < rm -f conftest.$ac_objext conftest.$ac_ext
3006 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3007   done
3008   rm -f conftest*
3009   if test -n "$ac_declaration"; then
# Line 2887 | Line 3018 | OOPSE_TEMPLATE_FLAGS=""
3018   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3019   ac_compiler_gnu=$ac_cv_c_compiler_gnu
3020  
3021 +
3022   OOPSE_TEMPLATE_FLAGS=""
3023   if test $ac_cv_cxx_compiler_gnu = no; then
3024    echo "$as_me:$LINENO: checking checking whether ${CXX} accepts -ptused -no_prelink" >&5
# Line 2931 | Line 3063 | echo "${ECHO_T}yes" >&6
3063    if test -z "`${CXX} -LANG:std -c conftest.cc 2>&1`"; then
3064      echo "$as_me:$LINENO: result: yes" >&5
3065   echo "${ECHO_T}yes" >&6
3066 +
3067 +
3068      EXTRA_CC_FLAG=${EXTRA_CC_FLAG}" -LANG:std"
3069    else
3070      echo "$as_me:$LINENO: result: no" >&5
# Line 2946 | Line 3080 | if test -n "$ac_tool_prefix"; then
3080   ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3081   ac_compiler_gnu=$ac_cv_f90_compiler_gnu
3082   if test -n "$ac_tool_prefix"; then
3083 <  for ac_prog in ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3083 >  for ac_prog in ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3084    do
3085      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3086   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 2988 | Line 3122 | if test -z "$F90"; then
3122   fi
3123   if test -z "$F90"; then
3124    ac_ct_F90=$F90
3125 <  for ac_prog in ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3125 >  for ac_prog in ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3126   do
3127    # Extract the first word of "$ac_prog", so it can be a program name with args.
3128   set dummy $ac_prog; ac_word=$2
# Line 3054 | Line 3188 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3188   _ACEOF
3189   rm -f conftest.$ac_objext
3190   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3191 <  (eval $ac_compile) 2>&5
3191 >  (eval $ac_compile) 2>conftest.er1
3192    ac_status=$?
3193 +  grep -v '^ *+' conftest.er1 >conftest.err
3194 +  rm -f conftest.er1
3195 +  cat conftest.err >&5
3196    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3197    (exit $ac_status); } &&
3198 <         { ac_try='test -s conftest.$ac_objext'
3198 >         { ac_try='test -z "$ac_f90_werror_flag"
3199 >                         || test ! -s conftest.err'
3200    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3201    (eval $ac_try) 2>&5
3202    ac_status=$?
3203    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3204 +  (exit $ac_status); }; } &&
3205 +         { ac_try='test -s conftest.$ac_objext'
3206 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3207 +  (eval $ac_try) 2>&5
3208 +  ac_status=$?
3209 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3210    (exit $ac_status); }; }; then
3211    ac_compiler_gnu=yes
3212   else
# Line 3071 | Line 3215 | rm -f conftest.$ac_objext conftest.$ac_ext
3215  
3216   ac_compiler_gnu=no
3217   fi
3218 < rm -f conftest.$ac_objext conftest.$ac_ext
3218 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3219   ac_cv_f90_compiler_gnu=$ac_compiler_gnu
3220  
3221   fi
# Line 3096 | Line 3240 | if test "$ac_test_PREPFLAG" != "set"; then
3240    PREPFLAG=""
3241    case "${host_cpu}-${host_os}" in
3242  
3243 <  *linux*) if test "$F90" = ifc; then
3243 >  *linux*) if test "$F90" = ifc -o "$F90" = ifort; then
3244                      PREPFLAG="-fpp1 "
3245                  fi;;
3246    *aix*)  if test "$F90" = xlf90 -o "$F90" = f90; then
# Line 3109 | Line 3253 | if test "$ac_test_PREPFLAG" != "set"; then
3253    esac
3254  
3255    if test -z "$PREPFLAG"; then
3256 <        echo ""
3257 <        echo "**********************************************************"
3114 <        echo "* WARNING: Don't know the best PREPFLAG for this system  *"
3115 <        echo "* Use  make PREPFLAG=..., or edit the top level Makefile *"
3116 <        echo "* (otherwise, an empty PREPFLAG will be used)            *"
3117 <        echo "**********************************************************"
3118 <        echo ""
3256 >        { echo "$as_me:$LINENO: WARNING: \"Using empty PREPFLAG\"" >&5
3257 > echo "$as_me: WARNING: \"Using empty PREPFLAG\"" >&2;}
3258          PREPFLAG=""
3259    fi
3260  
# Line 3150 | Line 3289 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3289   _ACEOF
3290   rm -f conftest.$ac_objext
3291   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3292 <  (eval $ac_compile) 2>&5
3292 >  (eval $ac_compile) 2>conftest.er1
3293    ac_status=$?
3294 +  grep -v '^ *+' conftest.er1 >conftest.err
3295 +  rm -f conftest.er1
3296 +  cat conftest.err >&5
3297    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3298    (exit $ac_status); } &&
3299 <         { ac_try='test -s conftest.$ac_objext'
3299 >         { ac_try='test -z "$ac_f90_werror_flag"
3300 >                         || test ! -s conftest.err'
3301    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3302    (eval $ac_try) 2>&5
3303    ac_status=$?
3304    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3305 +  (exit $ac_status); }; } &&
3306 +         { ac_try='test -s conftest.$ac_objext'
3307 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3308 +  (eval $ac_try) 2>&5
3309 +  ac_status=$?
3310 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3311    (exit $ac_status); }; }; then
3312    prepflagworks=1
3313   else
# Line 3167 | Line 3316 | rm -f conftest.$ac_objext conftest.$ac_ext
3316  
3317   prepflagworks=0
3318   fi
3319 < rm -f conftest.$ac_objext conftest.$ac_ext
3319 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3320  
3321    F90FLAGS=$ac_save_F90FLAGS
3322    ac_ext=$ac_save_ext
# Line 3178 | Line 3327 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
3327   ac_compiler_gnu=$ac_cv_c_compiler_gnu
3328  
3329  
3181 –
3330    if test "$prepflagworks" = 1; then
3331      echo "$as_me:$LINENO: result: yes" >&5
3332   echo "${ECHO_T}yes" >&6
# Line 3203 | Line 3351 | if test "$ac_test_PREPDEFFLAG" != "set"; then
3351    PREPDEFFLAG=""
3352    case "${host_cpu}-${host_os}" in
3353  
3354 <  *linux*) if test "$F90" = ifc; then
3354 >  *linux*) if test "$F90" = ifc -o "$F90" = ifort; then
3355                      PREPDEFFLAG=" "
3356                  fi;;
3357    *aix*)  if test "$F90" = xlf90 -o "$F90" = f90; then
# Line 3216 | Line 3364 | if test "$ac_test_PREPDEFFLAG" != "set"; then
3364    esac
3365  
3366    if test -z "$PREPDEFFLAG"; then
3367 <        echo ""
3368 <        echo "*************************************************************"
3221 <        echo "* WARNING: Don't know the best PREPDEFFLAG for this system  *"
3222 <        echo "* Use  make PREPDEFFLAG=..., or edit the top level Makefile *"
3223 <        echo "* (otherwise, an empty PREPDEFFLAG will be used)            *"
3224 <        echo "*************************************************************"
3225 <        echo ""
3367 >        { echo "$as_me:$LINENO: WARNING: \"Using empty PREPDEFFLAG\"" >&5
3368 > echo "$as_me: WARNING: \"Using empty PREPDEFFLAG\"" >&2;}
3369          PREPDEFFLAG=" "
3370    fi
3371  
# Line 3261 | Line 3404 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3404   _ACEOF
3405   rm -f conftest.$ac_objext
3406   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3407 <  (eval $ac_compile) 2>&5
3407 >  (eval $ac_compile) 2>conftest.er1
3408    ac_status=$?
3409 +  grep -v '^ *+' conftest.er1 >conftest.err
3410 +  rm -f conftest.er1
3411 +  cat conftest.err >&5
3412    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3413    (exit $ac_status); } &&
3414 <         { ac_try='test -s conftest.$ac_objext'
3414 >         { ac_try='test -z "$ac_f90_werror_flag"
3415 >                         || test ! -s conftest.err'
3416 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3417 >  (eval $ac_try) 2>&5
3418 >  ac_status=$?
3419 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3420 >  (exit $ac_status); }; } &&
3421 >         { ac_try='test -s conftest.$ac_objext'
3422    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3423    (eval $ac_try) 2>&5
3424    ac_status=$?
# Line 3278 | Line 3431 | rm -f conftest.$ac_objext conftest.$ac_ext
3431  
3432   prepdefflagworks=0
3433   fi
3434 < rm -f conftest.$ac_objext conftest.$ac_ext
3434 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3435  
3436    F90FLAGS=$ac_save_F90FLAGS
3437    ac_ext=$ac_save_ext
# Line 3330 | Line 3483 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3483   _ACEOF
3484   rm -f conftest.$ac_objext
3485   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3486 <  (eval $ac_compile) 2>&5
3486 >  (eval $ac_compile) 2>conftest.er1
3487    ac_status=$?
3488 +  grep -v '^ *+' conftest.er1 >conftest.err
3489 +  rm -f conftest.er1
3490 +  cat conftest.err >&5
3491    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3492    (exit $ac_status); } &&
3493 <         { ac_try='test -s conftest.$ac_objext'
3493 >         { ac_try='test -z "$ac_f90_werror_flag"
3494 >                         || test ! -s conftest.err'
3495 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3496 >  (eval $ac_try) 2>&5
3497 >  ac_status=$?
3498 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3499 >  (exit $ac_status); }; } &&
3500 >         { ac_try='test -s conftest.$ac_objext'
3501    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3502    (eval $ac_try) 2>&5
3503    ac_status=$?
# Line 3364 | Line 3527 | F90FLAGS="$F90FLAGS $ac_verb"
3527   ac_save_F90FLAGS=$F90FLAGS
3528   F90FLAGS="$F90FLAGS $ac_verb"
3529  
3530 < (eval echo $as_me:3367: \"$ac_link\") >&5
3530 > (eval echo $as_me:3530: \"$ac_link\") >&5
3531   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3532   echo "$ac_f90_v_output" >&5
3533   F90FLAGS=$ac_save_F90FLAGS
# Line 3406 | Line 3569 | rm -f conftest.$ac_objext conftest.$ac_ext
3569   { echo "$as_me:$LINENO: WARNING: compilation failed" >&5
3570   echo "$as_me: WARNING: compilation failed" >&2;}
3571   fi
3572 < rm -f conftest.$ac_objext conftest.$ac_ext
3572 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3573  
3574   fi
3575   echo "$as_me:$LINENO: result: $ac_cv_prog_f90_v" >&5
# Line 3441 | Line 3604 | F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3604   ac_save_F90FLAGS=$F90FLAGS
3605   F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3606  
3607 < (eval echo $as_me:3444: \"$ac_link\") >&5
3607 > (eval echo $as_me:3607: \"$ac_link\") >&5
3608   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3609   echo "$ac_f90_v_output" >&5
3610   F90FLAGS=$ac_save_F90FLAGS
# Line 3623 | Line 3786 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3786   _ACEOF
3787   rm -f conftest.$ac_objext
3788   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3789 <  (eval $ac_compile) 2>&5
3789 >  (eval $ac_compile) 2>conftest.er1
3790    ac_status=$?
3791 +  grep -v '^ *+' conftest.er1 >conftest.err
3792 +  rm -f conftest.er1
3793 +  cat conftest.err >&5
3794    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3795    (exit $ac_status); } &&
3796 <         { ac_try='test -s conftest.$ac_objext'
3796 >         { ac_try='test -z "$ac_f90_werror_flag"
3797 >                         || test ! -s conftest.err'
3798    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3799    (eval $ac_try) 2>&5
3800    ac_status=$?
3801    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3802 +  (exit $ac_status); }; } &&
3803 +         { ac_try='test -s conftest.$ac_objext'
3804 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3805 +  (eval $ac_try) 2>&5
3806 +  ac_status=$?
3807 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3808    (exit $ac_status); }; }; then
3809    mv conftest.$ac_objext cf90_test.$ac_objext
3810  
# Line 3649 | Line 3822 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
3822      for ac_underscore in "" "_"; do
3823        ac_func="$ac_foobar$ac_underscore"
3824        cat >conftest.$ac_ext <<_ACEOF
3652 – #line $LINENO "configure"
3825   /* confdefs.h.  */
3826   _ACEOF
3827   cat confdefs.h >>conftest.$ac_ext
# Line 3673 | Line 3845 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3845   _ACEOF
3846   rm -f conftest.$ac_objext conftest$ac_exeext
3847   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3848 <  (eval $ac_link) 2>&5
3848 >  (eval $ac_link) 2>conftest.er1
3849    ac_status=$?
3850 +  grep -v '^ *+' conftest.er1 >conftest.err
3851 +  rm -f conftest.er1
3852 +  cat conftest.err >&5
3853    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3854    (exit $ac_status); } &&
3855 <         { ac_try='test -s conftest$ac_exeext'
3855 >         { ac_try='test -z "$ac_c_werror_flag"
3856 >                         || test ! -s conftest.err'
3857    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3858    (eval $ac_try) 2>&5
3859    ac_status=$?
3860    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3861 +  (exit $ac_status); }; } &&
3862 +         { ac_try='test -s conftest$ac_exeext'
3863 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3864 +  (eval $ac_try) 2>&5
3865 +  ac_status=$?
3866 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3867    (exit $ac_status); }; }; then
3868    ac_success=yes; break 2
3869   else
# Line 3689 | Line 3871 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
3871   sed 's/^/| /' conftest.$ac_ext >&5
3872  
3873   fi
3874 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3874 > rm -f conftest.err conftest.$ac_objext \
3875 >      conftest$ac_exeext conftest.$ac_ext
3876      done
3877    done
3878  
# Line 3710 | Line 3893 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
3893          ac_func="$ac_foo_bar$ac_underscore$ac_extra"
3894  
3895          cat >conftest.$ac_ext <<_ACEOF
3713 – #line $LINENO "configure"
3896   /* confdefs.h.  */
3897   _ACEOF
3898   cat confdefs.h >>conftest.$ac_ext
# Line 3734 | Line 3916 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3916   _ACEOF
3917   rm -f conftest.$ac_objext conftest$ac_exeext
3918   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3919 <  (eval $ac_link) 2>&5
3919 >  (eval $ac_link) 2>conftest.er1
3920    ac_status=$?
3921 +  grep -v '^ *+' conftest.er1 >conftest.err
3922 +  rm -f conftest.er1
3923 +  cat conftest.err >&5
3924    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3925    (exit $ac_status); } &&
3926 <         { ac_try='test -s conftest$ac_exeext'
3926 >         { ac_try='test -z "$ac_c_werror_flag"
3927 >                         || test ! -s conftest.err'
3928 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3929 >  (eval $ac_try) 2>&5
3930 >  ac_status=$?
3931 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3932 >  (exit $ac_status); }; } &&
3933 >         { ac_try='test -s conftest$ac_exeext'
3934    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3935    (eval $ac_try) 2>&5
3936    ac_status=$?
# Line 3750 | Line 3942 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
3942   sed 's/^/| /' conftest.$ac_ext >&5
3943  
3944   fi
3945 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3945 > rm -f conftest.err conftest.$ac_objext \
3946 >      conftest$ac_exeext conftest.$ac_ext
3947       done
3948  
3949       if test "$ac_success_extra" = "yes"; then
# Line 3785 | Line 3978 | rm -f conftest.$ac_objext conftest.$ac_ext
3978   sed 's/^/| /' conftest.$ac_ext >&5
3979  
3980   fi
3981 < rm -f conftest.$ac_objext conftest.$ac_ext
3981 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3982   ac_ext=f90
3983   ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
3984   ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
# Line 4019 | Line 4212 | case $debug in
4212  
4213  
4214  
4215 +
4216 +
4217 + echo "$as_me:$LINENO: checking whether we are *really* using GNU cc" >&5
4218 + echo $ECHO_N "checking whether we are *really* using GNU cc... $ECHO_C" >&6
4219 + if test "${ac_cv_prog_really_gcc+set}" = set; then
4220 +  echo $ECHO_N "(cached) $ECHO_C" >&6
4221 + else
4222 +
4223 + cat > conftest.c <<EOF
4224 + #ifdef __GNUC__
4225 +  #ifndef __INTEL_COMPILER
4226 +     yes;
4227 +  #endif
4228 + #endif
4229 + EOF
4230 + if { ac_try='${CC-cc} -E conftest.c'
4231 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4232 +  (eval $ac_try) 2>&5
4233 +  ac_status=$?
4234 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4235 +  (exit $ac_status); }; } | egrep yes >/dev/null 2>&1; then
4236 +  ac_cv_prog_really_gcc=yes
4237 + else
4238 +  ac_cv_prog_really_gcc=no
4239 + fi
4240 +
4241 + fi
4242 + echo "$as_me:$LINENO: result: $ac_cv_prog_really_gcc" >&5
4243 + echo "${ECHO_T}$ac_cv_prog_really_gcc" >&6
4244 + if test "$ac_cv_prog_really_gcc" = yes; then
4245 +        :
4246 +
4247 + else
4248 +        :
4249 +
4250 + fi
4251 +
4252 +
4253   # Try to determine "good" native compiler flags if none specified on command
4254   # line
4255   if test "$ac_test_CFLAGS" != "set"; then
# Line 4072 | Line 4303 | if test "$ac_test_CFLAGS" != "set"; then
4303    esac
4304  
4305    # use default flags for gcc on all systems
4306 <  if test $ac_cv_c_compiler_gnu = yes; then
4306 >  if test $ac_cv_prog_really_gcc = yes; then
4307       CFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
4308    fi
4309  
4310    # test for gcc-specific flags:
4311 <  if test $ac_cv_c_compiler_gnu = yes; then
4311 >  if test $ac_cv_prog_really_gcc = yes; then
4312      # -malign-double for x86 systems
4313  
4314  
# Line 4135 | Line 4366 | fi
4366    fi
4367  
4368    CPU_FLAGS=""
4369 <  if test "$GCC" = "yes"; then
4369 >  if test $ac_cv_prog_really_gcc = yes; then
4370                    case "${host_cpu}" in
4371            i586*)
4372  
# Line 4281 | Line 4512 | cat > conftest.c <<EOF
4512   else
4513  
4514   cat > conftest.c <<EOF
4515 < #ifdef __GNUC__
4515 > #ifdef __GNUC__ && !defined (__INTEL_COMPILER)
4516   #  if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
4517       yes;
4518   #  endif
# Line 4444 | Line 4675 | fi
4675  
4676   fi
4677  
4678 +
4679 + fi
4680 +
4681 +
4682 +
4683 +
4684 +
4685 +
4686 +
4687 + echo "$as_me:$LINENO: checking whether we are *really* using GNU c++" >&5
4688 + echo $ECHO_N "checking whether we are *really* using GNU c++... $ECHO_C" >&6
4689 + if test "${ac_cv_prog_really_gxx+set}" = set; then
4690 +  echo $ECHO_N "(cached) $ECHO_C" >&6
4691 + else
4692  
4693 + cat > conftest.cpp <<EOF
4694 + #ifdef __GNUC__
4695 +  #ifndef __INTEL_COMPILER
4696 +     yes;
4697 +  #endif
4698 + #endif
4699 + EOF
4700 + if { ac_try='${CXX-c++} -E conftest.cpp'
4701 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4702 +  (eval $ac_try) 2>&5
4703 +  ac_status=$?
4704 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4705 +  (exit $ac_status); }; } | egrep yes >/dev/null 2>&1; then
4706 +  ac_cv_prog_really_gxx=yes
4707 + else
4708 +  ac_cv_prog_really_gxx=no
4709   fi
4710  
4711 + fi
4712 + echo "$as_me:$LINENO: result: $ac_cv_prog_really_gxx" >&5
4713 + echo "${ECHO_T}$ac_cv_prog_really_gxx" >&6
4714 + if test "$ac_cv_prog_really_gxx" = yes; then
4715 +        :
4716  
4717 + else
4718 +        :
4719  
4720 + fi
4721  
4722  
4723   # Try to determine "good" native compiler flags if none specified on command
# Line 4483 | Line 4752 | if test "$ac_test_CXXFLAGS" != "set"; then
4752          if test "$CXX" = xlC; then
4753                  CXXFLAGS="-O3 -qtune=auto -qansialias -w"
4754                  echo "*******************************************************"
4755 <                echo "*  You have AIX on an unknown powerpc system.  It is  *"
4756 <                echo "*  recommended that you use                           *"
4755 >                echo "*  You have Darwin on an unknown powerpc system.      *"
4756 >                echo "*  It is recommended that you use                     *"
4757                  echo "*                                                     *"
4758                  echo "*  CXXFLAGS=-O3 -qarch=ppc -qtune=xxx -qansialias -w  *"
4759                  echo "*                                 ^^^                 *"
# Line 4495 | Line 4764 | if test "$ac_test_CXXFLAGS" != "set"; then
4764    esac
4765  
4766    # use default flags for gcc on all systems
4767 <  if test $ac_cv_c_compiler_gnu = yes; then
4767 >  if test $ac_cv_prog_really_gxx = yes; then
4768       CXXFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
4769    fi
4770  
4771    # test for gcc-specific flags:
4772 <  if test $ac_cv_c_compiler_gnu = yes; then
4772 >  if test $ac_cv_prog_really_gxx = yes; then
4773      # -malign-double for x86 systems
4774  
4775  
# Line 4558 | Line 4827 | fi
4827    fi
4828  
4829    CPU_FLAGS=""
4830 <  if test "$GCC" = "yes"; then
4830 >  if test $ac_cv_prog_really_gxx = yes; then
4831                    case "${host_cpu}" in
4832            i586*)
4833  
4834 < echo "$as_me:$LINENO: checking whether ${CC-cc} accepts -mcpu=pentium" >&5
4835 < echo $ECHO_N "checking whether ${CC-cc} accepts -mcpu=pentium... $ECHO_C" >&6
4834 > echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mcpu=pentium" >&5
4835 > echo $ECHO_N "checking whether ${CXX-c++} accepts -mcpu=pentium... $ECHO_C" >&6
4836   if test "${ac_cpu_pentium+set}" = set; then
4837    echo $ECHO_N "(cached) $ECHO_C" >&6
4838   else
4839 <  echo 'void f(){}' > conftest.c
4840 < if test -z "`${CC-cc} -mcpu=pentium -c conftest.c 2>&1`"; then
4839 >  echo 'void f(){}' > conftest.cpp
4840 > if test -z "`${CXX-c++} -mcpu=pentium -c conftest.cpp 2>&1`"; then
4841          ac_cpu_pentium=yes
4842   else
4843          ac_cpu_pentium=no
# Line 4697 | Line 4966 | echo "$as_me:$LINENO: checking whether we are using gc
4966                  elif test "$cputype" = 750; then
4967  
4968  
4969 < echo "$as_me:$LINENO: checking whether we are using gcc 2.95 or later" >&5
4970 < echo $ECHO_N "checking whether we are using gcc 2.95 or later... $ECHO_C" >&6
4971 < if test "${ac_cv_prog_gcc_2_95+set}" = set; then
4969 > echo "$as_me:$LINENO: checking whether we are using g++ 2.95 or later" >&5
4970 > echo $ECHO_N "checking whether we are using g++ 2.95 or later... $ECHO_C" >&6
4971 > if test "${ac_cv_prog_gxx_2_95+set}" = set; then
4972    echo $ECHO_N "(cached) $ECHO_C" >&6
4973   else
4974  
4975 < cat > conftest.c <<EOF
4976 < #ifdef __GNUC__
4975 > cat > conftest.cpp <<EOF
4976 > #ifdef __GNUC__ && !defined (__INTEL_COMPILER)
4977   #  if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
4978       yes;
4979   #  endif
4980   #endif
4981   EOF
4982 < if { ac_try='${CC-cc} -E conftest.c'
4982 > if { ac_try='${CXX-c++} -E conftest.cpp'
4983    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4984    (eval $ac_try) 2>&5
4985    ac_status=$?
4986    echo "$as_me:$LINENO: \$? = $ac_status" >&5
4987    (exit $ac_status); }; } | egrep yes >/dev/null 2>&1; then
4988 <  ac_cv_prog_gcc_2_95=yes
4988 >  ac_cv_prog_gxx_2_95=yes
4989   else
4990 <  ac_cv_prog_gcc_2_95=no
4990 >  ac_cv_prog_gxx_2_95=no
4991   fi
4992  
4993   fi
4994 < echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_2_95" >&5
4995 < echo "${ECHO_T}$ac_cv_prog_gcc_2_95" >&6
4996 < if test "$ac_cv_prog_gcc_2_95" = yes; then
4994 > echo "$as_me:$LINENO: result: $ac_cv_prog_gxx_2_95" >&5
4995 > echo "${ECHO_T}$ac_cv_prog_gxx_2_95" >&6
4996 > if test "$ac_cv_prog_gxx_2_95" = yes; then
4997          :
4998  
4999  
# Line 4881 | Line 5150 | if test x"$F90FLAGS" = x ; then
5150    F90FLAGS=""
5151    case "${host_cpu}-${host_os}" in
5152  
5153 <  *linux*) if test "$F90" = ifc; then
5153 >  *linux*) if test "$F90" = ifc -o "$F90" = ifort; then
5154                      F90FLAGS="-O"
5155                  fi;;
5156     rs6000*-aix*)  if test "$F90" = xlf90 -o "$F90" = f90; then
# Line 5000 | Line 5269 | esac
5269   # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
5270   # AFS /usr/afsws/bin/install, which mishandles nonexistent args
5271   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
5272 + # OS/2's system install, which has a completely different semantic
5273   # ./install, which can be erroneously created by make from ./install.sh.
5274   echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
5275   echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
# Line 5016 | Line 5286 | case $as_dir/ in
5286   case $as_dir/ in
5287    ./ | .// | /cC/* | \
5288    /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
5289 +  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
5290    /usr/ucb/* ) ;;
5291    *)
5292      # OSF1 and SCO ODT 3.0 have their own names for install.
# Line 5023 | Line 5294 | case $as_dir/ in
5294      # by default.
5295      for ac_prog in ginstall scoinst install; do
5296        for ac_exec_ext in '' $ac_executable_extensions; do
5297 <        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5298 <          if test $ac_prog = install &&
5299 <            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5300 <            # AIX install.  It has an incompatible calling convention.
5301 <            :
5302 <          elif test $ac_prog = install &&
5303 <            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5304 <            # program-specific install script used by HP pwplus--don't use.
5305 <            :
5306 <          else
5307 <            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
5308 <            break 3
5309 <          fi
5310 <        fi
5297 >        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5298 >          if test $ac_prog = install &&
5299 >            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5300 >            # AIX install.  It has an incompatible calling convention.
5301 >            :
5302 >          elif test $ac_prog = install &&
5303 >            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5304 >            # program-specific install script used by HP pwplus--don't use.
5305 >            :
5306 >          else
5307 >            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
5308 >            break 3
5309 >          fi
5310 >        fi
5311        done
5312      done
5313      ;;
# Line 5079 | Line 5350 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./
5350  
5351   echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5352   echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
5353 < set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
5353 > set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
5354   if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
5355    echo $ECHO_N "(cached) $ECHO_C" >&6
5356   else
# Line 5287 | Line 5558 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5558   _ACEOF
5559   rm -f conftest.$ac_objext conftest$ac_exeext
5560   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5561 <  (eval $ac_link) 2>&5
5561 >  (eval $ac_link) 2>conftest.er1
5562    ac_status=$?
5563 +  grep -v '^ *+' conftest.er1 >conftest.err
5564 +  rm -f conftest.er1
5565 +  cat conftest.err >&5
5566    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5567    (exit $ac_status); } &&
5568 <         { ac_try='test -s conftest$ac_exeext'
5568 >         { ac_try='test -z "$ac_f90_werror_flag"
5569 >                         || test ! -s conftest.err'
5570 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5571 >  (eval $ac_try) 2>&5
5572 >  ac_status=$?
5573 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5574 >  (exit $ac_status); }; } &&
5575 >         { ac_try='test -s conftest$ac_exeext'
5576    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5577    (eval $ac_try) 2>&5
5578    ac_status=$?
# Line 5304 | Line 5585 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
5585  
5586   ac_cv_lib_fl_yywrap=no
5587   fi
5588 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5588 > rm -f conftest.err conftest.$ac_objext \
5589 >      conftest$ac_exeext conftest.$ac_ext
5590   LIBS=$ac_check_lib_save_LIBS
5591   fi
5592   echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
# Line 5329 | Line 5611 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5611   _ACEOF
5612   rm -f conftest.$ac_objext conftest$ac_exeext
5613   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5614 <  (eval $ac_link) 2>&5
5614 >  (eval $ac_link) 2>conftest.er1
5615    ac_status=$?
5616 +  grep -v '^ *+' conftest.er1 >conftest.err
5617 +  rm -f conftest.er1
5618 +  cat conftest.err >&5
5619    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5620    (exit $ac_status); } &&
5621 <         { ac_try='test -s conftest$ac_exeext'
5621 >         { ac_try='test -z "$ac_f90_werror_flag"
5622 >                         || test ! -s conftest.err'
5623    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5624    (eval $ac_try) 2>&5
5625    ac_status=$?
5626    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5627 +  (exit $ac_status); }; } &&
5628 +         { ac_try='test -s conftest$ac_exeext'
5629 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5630 +  (eval $ac_try) 2>&5
5631 +  ac_status=$?
5632 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5633    (exit $ac_status); }; }; then
5634    ac_cv_lib_l_yywrap=yes
5635   else
# Line 5346 | Line 5638 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
5638  
5639   ac_cv_lib_l_yywrap=no
5640   fi
5641 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5641 > rm -f conftest.err conftest.$ac_objext \
5642 >      conftest$ac_exeext conftest.$ac_ext
5643   LIBS=$ac_check_lib_save_LIBS
5644   fi
5645   echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
# Line 5408 | Line 5701 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5701   _ACEOF
5702   rm -f conftest.$ac_objext conftest$ac_exeext
5703   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5704 <  (eval $ac_link) 2>&5
5704 >  (eval $ac_link) 2>conftest.er1
5705    ac_status=$?
5706 +  grep -v '^ *+' conftest.er1 >conftest.err
5707 +  rm -f conftest.er1
5708 +  cat conftest.err >&5
5709    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5710    (exit $ac_status); } &&
5711 <         { ac_try='test -s conftest$ac_exeext'
5711 >         { ac_try='test -z "$ac_f90_werror_flag"
5712 >                         || test ! -s conftest.err'
5713    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5714    (eval $ac_try) 2>&5
5715    ac_status=$?
5716    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5717 +  (exit $ac_status); }; } &&
5718 +         { ac_try='test -s conftest$ac_exeext'
5719 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5720 +  (eval $ac_try) 2>&5
5721 +  ac_status=$?
5722 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5723    (exit $ac_status); }; }; then
5724    ac_cv_prog_lex_yytext_pointer=yes
5725   else
# Line 5424 | Line 5727 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
5727   sed 's/^/| /' conftest.$ac_ext >&5
5728  
5729   fi
5730 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5730 > rm -f conftest.err conftest.$ac_objext \
5731 >      conftest$ac_exeext conftest.$ac_ext
5732   LIBS=$ac_save_LIBS
5733   rm -f "${LEX_OUTPUT_ROOT}.c"
5734  
# Line 5508 | Line 5812 | _ACEOF
5812        # `set' does not quote correctly, so add quotes (double-quote
5813        # substitution turns \\\\ into \\, and sed turns \\ into \).
5814        sed -n \
5815 <        "s/'/'\\\\''/g;
5816 <          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
5815 >        "s/'/'\\\\''/g;
5816 >          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
5817        ;;
5818      *)
5819        # `set' quotes correctly as required by POSIX, so do not add quotes.
5820        sed -n \
5821 <        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
5821 >        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
5822        ;;
5823      esac;
5824   } |
# Line 5540 | Line 5844 | echo $ECHO_N "checking for mpi-directory... $ECHO_C" >
5844   echo "$as_me:$LINENO: checking for mpi-directory" >&5
5845   echo $ECHO_N "checking for mpi-directory... $ECHO_C" >&6
5846  
5847 < # Check whether --with-mpi_dir or --without-mpi_dir was given.
5848 < if test "${with_mpi_dir+set}" = set; then
5849 <  withval="$with_mpi_dir"
5847 > # Check whether --with-mpi or --without-mpi was given.
5848 > if test "${with_mpi+set}" = set; then
5849 >  withval="$with_mpi"
5850    MPI_DIR="$withval"
5851   else
5852    MPI_DIR="/usr/local"
# Line 5568 | Line 5872 | echo $ECHO_N "checking for mpi-inc-directory... $ECHO_
5872   echo "$as_me:$LINENO: checking for mpi-inc-directory" >&5
5873   echo $ECHO_N "checking for mpi-inc-directory... $ECHO_C" >&6
5874  
5875 < # Check whether --with-mpi_inc or --without-mpi_inc was given.
5875 > # Check whether --with-mpi-inc or --without-mpi-inc was given.
5876   if test "${with_mpi_inc+set}" = set; then
5877    withval="$with_mpi_inc"
5878    MPI_INC="$withval"
# Line 5579 | Line 5883 | echo "${ECHO_T}$MPI_INC" >&6
5883   echo "${ECHO_T}$MPI_INC" >&6
5884  
5885  
5886 <
5887 < echo "$as_me:$LINENO: checking for MPI library" >&5
5888 < echo $ECHO_N "checking for MPI library... $ECHO_C" >&6
5889 < MPI_LIB=""
5890 < case "$host" in
5891 <  *-ibm-aix*)
5892 <    echo "$as_me:$LINENO: checking whether to use signal-based MPI library" >&5
5893 < echo $ECHO_N "checking whether to use signal-based MPI library... $ECHO_C" >&6
5894 <    echo "$as_me:$LINENO: result: $PACX_SIGNAL" >&5
5895 < echo "${ECHO_T}$PACX_SIGNAL" >&6
5896 <    if test "x$PACX_SIGNAL" = "xyes" ; then
5897 <      if test -f "$MPI_LIBDIR/libmpi.a" ; then
5898 <        MPI_LIB="-lmpi"
5595 <      elif test -f "$MPI_LIBDIR/libmpi.so" ; then
5596 <        MPI_LIB="-lmpi"
5597 <      elif test -f "$MPI_LIBDIR/libmpich.a" ; then
5598 <        MPI_LIB="-lmpich"
5599 <      else
5600 <        { { echo "$as_me:$LINENO: error: neither libmpi nor libmpich found; check path for MPI package first..." >&5
5601 < echo "$as_me: error: neither libmpi nor libmpich found; check path for MPI package first..." >&2;}
5602 <   { (exit 1); exit 1; }; }
5603 <      fi
5604 <    else
5605 <      if test -f "$MPI_LIBDIR/libmpi_r.a" ; then
5606 <         MPI_LIB="-lmpi_r"
5607 <      else
5608 <         { { echo "$as_me:$LINENO: error: libmpi_r not found; check path for MPI package..." >&5
5609 < echo "$as_me: error: libmpi_r not found; check path for MPI package..." >&2;}
5610 <   { (exit 1); exit 1; }; }
5611 <      fi
5612 <    fi
5613 <    echo "$as_me:$LINENO: result: found $MPI_LIB" >&5
5614 < echo "${ECHO_T}found $MPI_LIB" >&6
5615 <  ;;
5616 <  *)                             if test -f "$MPI_LIBDIR/libmpi.a" ; then
5617 <      MPI_LIB="-lmpi"
5618 <    elif test -f "$MPI_LIBDIR/libmpi.so" ; then
5619 <      MPI_LIB="-lmpi"
5620 <    elif test -f "$MPI_LIBDIR/libmpich.a" ; then
5621 <      MPI_LIB="-lmpich"
5622 <    else
5623 <      { { echo "$as_me:$LINENO: error: neither libmpi nor libmpich found; check path for MPI package first..." >&5
5624 < echo "$as_me: error: neither libmpi nor libmpich found; check path for MPI package first..." >&2;}
5625 <   { (exit 1); exit 1; }; }
5626 <    fi
5627 <    echo "$as_me:$LINENO: result: found $MPI_LIB" >&5
5628 < echo "${ECHO_T}found $MPI_LIB" >&6
5629 <  ;;
5630 < esac
5886 > echo "$as_me:$LINENO: checking for mpi.h" >&5
5887 > echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
5888 > HAVE_MPIDOTH_C="no"
5889 > echo '#include <mpi.h>' > conftest.cc
5890 > if test -z "`${CXX} -I${MPI_INC} -c conftest.cc 2>&1`"; then
5891 >  echo "$as_me:$LINENO: result: yes" >&5
5892 > echo "${ECHO_T}yes" >&6
5893 >  HAVE_MPIDOTH_C="yes"
5894 > else
5895 >  echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5
5896 > echo "${ECHO_T}no! Check MPI include paths" >&6
5897 > fi
5898 > rm -f conftest*
5899  
5900 + echo "$as_me:$LINENO: checking whether mpif.h is usable" >&5
5901 + echo $ECHO_N "checking whether mpif.h is usable... $ECHO_C" >&6
5902 + HAVE_MPIFDOTH_F90="no"
5903 + rm -f conftest*
5904 + cat >conftest.f90 <<EOF
5905 + program main
5906 +  include 'mpif.h'
5907 + end
5908 + EOF
5909 + if $F90 -I$MPI_INC -c conftest.f90 > conftest.out 2>&1 ; then
5910 +   echo "$as_me:$LINENO: result: yes" >&5
5911 + echo "${ECHO_T}yes" >&6
5912 +   MPI_F90INC="$MPI_INC"
5913 +   HAVE_MPIFDOTH_F90="yes"
5914 + else
5915 +   if test -s conftest.out ; then cat conftest.out >> config.log ; fi
5916 +   echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5
5917 + echo "${ECHO_T}no! Check MPI include paths" >&6
5918 + fi
5919 + rm -f conftest*
5920  
5921  
5922 + ac_ext=c
5923 + ac_cpp='$CPP $CPPFLAGS'
5924 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5925 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5926 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
5927  
5928 + ac_save_LDFLAGS=$LDFLAGS
5929 + LDFLAGS="${LDFLAGS} -L${MPI_LIBDIR} "
5930  
5931 <
5932 <
5933 <        for ac_prog in mpif90 hf90 mpxlf90 mpf90 mpxlf95 mpxlf_r
5934 < do
5640 <  # Extract the first word of "$ac_prog", so it can be a program name with args.
5641 < set dummy $ac_prog; ac_word=$2
5642 < echo "$as_me:$LINENO: checking for $ac_word" >&5
5643 < echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5644 < if test "${ac_cv_prog_MPIF90+set}" = set; then
5931 > if test x = x"$MPI_LIB"; then
5932 >   echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
5933 > echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
5934 > if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
5935    echo $ECHO_N "(cached) $ECHO_C" >&6
5936   else
5937 <  if test -n "$MPIF90"; then
5938 <  ac_cv_prog_MPIF90="$MPIF90" # Let the user override the test.
5939 < else
5940 < as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5941 < for as_dir in $PATH
5942 < do
5943 <  IFS=$as_save_IFS
5944 <  test -z "$as_dir" && as_dir=.
5945 <  for ac_exec_ext in '' $ac_executable_extensions; do
5946 <  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5947 <    ac_cv_prog_MPIF90="$ac_prog"
5948 <    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5949 <    break 2
5950 <  fi
5951 < done
5952 < done
5953 <
5954 < fi
5955 < fi
5956 < MPIF90=$ac_cv_prog_MPIF90
5957 < if test -n "$MPIF90"; then
5958 <  echo "$as_me:$LINENO: result: $MPIF90" >&5
5959 < echo "${ECHO_T}$MPIF90" >&6
5937 >  ac_check_lib_save_LIBS=$LIBS
5938 > LIBS="-lmpi  $LIBS"
5939 > cat >conftest.$ac_ext <<_ACEOF
5940 > /* confdefs.h.  */
5941 > _ACEOF
5942 > cat confdefs.h >>conftest.$ac_ext
5943 > cat >>conftest.$ac_ext <<_ACEOF
5944 > /* end confdefs.h.  */
5945 >
5946 > /* Override any gcc2 internal prototype to avoid an error.  */
5947 > #ifdef __cplusplus
5948 > extern "C"
5949 > #endif
5950 > /* We use char because int might match the return type of a gcc2
5951 >   builtin and then its argument prototype would still apply.  */
5952 > char MPI_Init ();
5953 > int
5954 > main ()
5955 > {
5956 > MPI_Init ();
5957 >  ;
5958 >  return 0;
5959 > }
5960 > _ACEOF
5961 > rm -f conftest.$ac_objext conftest$ac_exeext
5962 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5963 >  (eval $ac_link) 2>conftest.er1
5964 >  ac_status=$?
5965 >  grep -v '^ *+' conftest.er1 >conftest.err
5966 >  rm -f conftest.er1
5967 >  cat conftest.err >&5
5968 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5969 >  (exit $ac_status); } &&
5970 >         { ac_try='test -z "$ac_c_werror_flag"
5971 >                         || test ! -s conftest.err'
5972 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5973 >  (eval $ac_try) 2>&5
5974 >  ac_status=$?
5975 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5976 >  (exit $ac_status); }; } &&
5977 >         { ac_try='test -s conftest$ac_exeext'
5978 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5979 >  (eval $ac_try) 2>&5
5980 >  ac_status=$?
5981 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5982 >  (exit $ac_status); }; }; then
5983 >  ac_cv_lib_mpi_MPI_Init=yes
5984   else
5985 <  echo "$as_me:$LINENO: result: no" >&5
5986 < echo "${ECHO_T}no" >&6
5985 >  echo "$as_me: failed program was:" >&5
5986 > sed 's/^/| /' conftest.$ac_ext >&5
5987 >
5988 > ac_cv_lib_mpi_MPI_Init=no
5989   fi
5990 + rm -f conftest.err conftest.$ac_objext \
5991 +      conftest$ac_exeext conftest.$ac_ext
5992 + LIBS=$ac_check_lib_save_LIBS
5993 + fi
5994 + echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
5995 + echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
5996 + if test $ac_cv_lib_mpi_MPI_Init = yes; then
5997 +  MPI_LIB="-lmpi"
5998 + fi
5999  
6000 <  test -n "$MPIF90" && break
6001 < done
6002 < test -n "$MPIF90" || MPIF90="$F90"
6000 > fi
6001 > if test x = x"$MPI_LIB"; then
6002 >   echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
6003 > echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
6004 > if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
6005 >  echo $ECHO_N "(cached) $ECHO_C" >&6
6006 > else
6007 >  ac_check_lib_save_LIBS=$LIBS
6008 > LIBS="-lmpich  $LIBS"
6009 > cat >conftest.$ac_ext <<_ACEOF
6010 > /* confdefs.h.  */
6011 > _ACEOF
6012 > cat confdefs.h >>conftest.$ac_ext
6013 > cat >>conftest.$ac_ext <<_ACEOF
6014 > /* end confdefs.h.  */
6015  
6016 <        acx_mpi_save_F90="$F90"
6017 <        F90="$MPIF90"
6018 <
6019 <
6020 <
6021 < if test x = x"$MPILIBS"; then
6022 <        echo "$as_me:$LINENO: checking for MPI_Init" >&5
6023 < echo $ECHO_N "checking for MPI_Init... $ECHO_C" >&6
6024 <                        cat >conftest.$ac_ext <<_ACEOF
6025 <
6026 < program main
6027 <
6028 <      call MPI_Init
6029 < end program main
5693 <
6016 > /* Override any gcc2 internal prototype to avoid an error.  */
6017 > #ifdef __cplusplus
6018 > extern "C"
6019 > #endif
6020 > /* We use char because int might match the return type of a gcc2
6021 >   builtin and then its argument prototype would still apply.  */
6022 > char MPI_Init ();
6023 > int
6024 > main ()
6025 > {
6026 > MPI_Init ();
6027 >  ;
6028 >  return 0;
6029 > }
6030   _ACEOF
6031   rm -f conftest.$ac_objext conftest$ac_exeext
6032   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6033 <  (eval $ac_link) 2>&5
6033 >  (eval $ac_link) 2>conftest.er1
6034    ac_status=$?
6035 +  grep -v '^ *+' conftest.er1 >conftest.err
6036 +  rm -f conftest.er1
6037 +  cat conftest.err >&5
6038    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6039    (exit $ac_status); } &&
6040 <         { ac_try='test -s conftest$ac_exeext'
6040 >         { ac_try='test -z "$ac_c_werror_flag"
6041 >                         || test ! -s conftest.err'
6042    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6043    (eval $ac_try) 2>&5
6044    ac_status=$?
6045    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6046 +  (exit $ac_status); }; } &&
6047 +         { ac_try='test -s conftest$ac_exeext'
6048 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6049 +  (eval $ac_try) 2>&5
6050 +  ac_status=$?
6051 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6052    (exit $ac_status); }; }; then
6053 <  MPILIBS=" "
5708 <                                echo "$as_me:$LINENO: result: yes" >&5
5709 < echo "${ECHO_T}yes" >&6
6053 >  ac_cv_lib_mpich_MPI_Init=yes
6054   else
6055    echo "$as_me: failed program was:" >&5
6056   sed 's/^/| /' conftest.$ac_ext >&5
6057  
6058 < echo "$as_me:$LINENO: result: no" >&5
5715 < echo "${ECHO_T}no" >&6
6058 > ac_cv_lib_mpich_MPI_Init=no
6059   fi
6060 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6060 > rm -f conftest.err conftest.$ac_objext \
6061 >      conftest$ac_exeext conftest.$ac_ext
6062 > LIBS=$ac_check_lib_save_LIBS
6063   fi
6064 < if test x = x"$MPILIBS"; then
6065 <        echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
6064 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
6065 > echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
6066 > if test $ac_cv_lib_mpich_MPI_Init = yes; then
6067 >  MPI_LIB="-lmpich"
6068 > fi
6069 >
6070 > fi
6071 > $as_unset ac_cv_lib_mpi_MPI_Init
6072 > if test x = x"$MPI_LIB"; then
6073 >   echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
6074   echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
6075   if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
6076    echo $ECHO_N "(cached) $ECHO_C" >&6
6077   else
6078    ac_check_lib_save_LIBS=$LIBS
6079 < LIBS="-lmpi  $LIBS"
6079 > LIBS="-lmpi "-llam" $LIBS"
6080   cat >conftest.$ac_ext <<_ACEOF
6081 + /* confdefs.h.  */
6082 + _ACEOF
6083 + cat confdefs.h >>conftest.$ac_ext
6084 + cat >>conftest.$ac_ext <<_ACEOF
6085 + /* end confdefs.h.  */
6086  
6087 < program main
6088 <
6089 < call MPI_Init
6090 < end program main
6091 <
6087 > /* Override any gcc2 internal prototype to avoid an error.  */
6088 > #ifdef __cplusplus
6089 > extern "C"
6090 > #endif
6091 > /* We use char because int might match the return type of a gcc2
6092 >   builtin and then its argument prototype would still apply.  */
6093 > char MPI_Init ();
6094 > int
6095 > main ()
6096 > {
6097 > MPI_Init ();
6098 >  ;
6099 >  return 0;
6100 > }
6101   _ACEOF
6102   rm -f conftest.$ac_objext conftest$ac_exeext
6103   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6104 <  (eval $ac_link) 2>&5
6104 >  (eval $ac_link) 2>conftest.er1
6105    ac_status=$?
6106 +  grep -v '^ *+' conftest.er1 >conftest.err
6107 +  rm -f conftest.er1
6108 +  cat conftest.err >&5
6109    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6110    (exit $ac_status); } &&
6111 <         { ac_try='test -s conftest$ac_exeext'
6111 >         { ac_try='test -z "$ac_c_werror_flag"
6112 >                         || test ! -s conftest.err'
6113    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6114    (eval $ac_try) 2>&5
6115    ac_status=$?
6116    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6117 +  (exit $ac_status); }; } &&
6118 +         { ac_try='test -s conftest$ac_exeext'
6119 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6120 +  (eval $ac_try) 2>&5
6121 +  ac_status=$?
6122 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6123    (exit $ac_status); }; }; then
6124    ac_cv_lib_mpi_MPI_Init=yes
6125   else
# Line 5751 | Line 6128 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
6128  
6129   ac_cv_lib_mpi_MPI_Init=no
6130   fi
6131 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6131 > rm -f conftest.err conftest.$ac_objext \
6132 >      conftest$ac_exeext conftest.$ac_ext
6133   LIBS=$ac_check_lib_save_LIBS
6134   fi
6135   echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
6136   echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
6137   if test $ac_cv_lib_mpi_MPI_Init = yes; then
6138 <  MPILIBS="-lmpi"
6138 >  MPI_LIB="-lmpi -llam"
6139   fi
6140  
6141   fi
6142 < if test x = x"$MPILIBS"; then
6143 <        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
6144 < echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
6145 < if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
6142 >
6143 > $as_unset ac_cv_lib_mpi_MPI_Init
6144 > if test x = x"$MPI_LIB"; then
6145 >   echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
6146 > echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
6147 > if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
6148    echo $ECHO_N "(cached) $ECHO_C" >&6
6149   else
6150    ac_check_lib_save_LIBS=$LIBS
6151 < LIBS="-lmpich  $LIBS"
6151 > LIBS="-lmpi -llam -lpthread $LIBS"
6152   cat >conftest.$ac_ext <<_ACEOF
6153 + /* confdefs.h.  */
6154 + _ACEOF
6155 + cat confdefs.h >>conftest.$ac_ext
6156 + cat >>conftest.$ac_ext <<_ACEOF
6157 + /* end confdefs.h.  */
6158  
6159 < program main
6160 <
6161 < call MPI_Init
6162 < end program main
6163 <
6159 > /* Override any gcc2 internal prototype to avoid an error.  */
6160 > #ifdef __cplusplus
6161 > extern "C"
6162 > #endif
6163 > /* We use char because int might match the return type of a gcc2
6164 >   builtin and then its argument prototype would still apply.  */
6165 > char MPI_Init ();
6166 > int
6167 > main ()
6168 > {
6169 > MPI_Init ();
6170 >  ;
6171 >  return 0;
6172 > }
6173   _ACEOF
6174   rm -f conftest.$ac_objext conftest$ac_exeext
6175   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6176 <  (eval $ac_link) 2>&5
6176 >  (eval $ac_link) 2>conftest.er1
6177    ac_status=$?
6178 +  grep -v '^ *+' conftest.er1 >conftest.err
6179 +  rm -f conftest.er1
6180 +  cat conftest.err >&5
6181    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6182    (exit $ac_status); } &&
6183 <         { ac_try='test -s conftest$ac_exeext'
6183 >         { ac_try='test -z "$ac_c_werror_flag"
6184 >                         || test ! -s conftest.err'
6185    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6186    (eval $ac_try) 2>&5
6187    ac_status=$?
6188    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6189 +  (exit $ac_status); }; } &&
6190 +         { ac_try='test -s conftest$ac_exeext'
6191 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6192 +  (eval $ac_try) 2>&5
6193 +  ac_status=$?
6194 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6195    (exit $ac_status); }; }; then
6196 <  ac_cv_lib_mpich_MPI_Init=yes
6196 >  ac_cv_lib_mpi_MPI_Init=yes
6197   else
6198    echo "$as_me: failed program was:" >&5
6199   sed 's/^/| /' conftest.$ac_ext >&5
6200  
6201 < ac_cv_lib_mpich_MPI_Init=no
6201 > ac_cv_lib_mpi_MPI_Init=no
6202   fi
6203 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6203 > rm -f conftest.err conftest.$ac_objext \
6204 >      conftest$ac_exeext conftest.$ac_ext
6205   LIBS=$ac_check_lib_save_LIBS
6206   fi
6207 < echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
6208 < echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
6209 < if test $ac_cv_lib_mpich_MPI_Init = yes; then
6210 <  MPILIBS="-lmpich"
6207 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
6208 > echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
6209 > if test $ac_cv_lib_mpi_MPI_Init = yes; then
6210 >  MPI_LIB="-lmpi -llam -lpthread"
6211 > else
6212 >  { { echo "$as_me:$LINENO: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&5
6213 > echo "$as_me: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&2;}
6214 >   { (exit 1); exit 1; }; }
6215   fi
6216  
6217   fi
6218  
6219 + echo "$as_me:$LINENO: result: found $MPI_LIB" >&5
6220 + echo "${ECHO_T}found $MPI_LIB" >&6
6221  
6222  
6223 < F90="$acx_mpi_save_F90"
6224 <
6225 <
6226 <
6227 < # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
6228 < if test x = x"$MPILIBS"; then
6229 <
5819 <        :
6223 > echo "$as_me:$LINENO: checking for MPI Fortran library" >&5
6224 > echo $ECHO_N "checking for MPI Fortran library... $ECHO_C" >&6
6225 > MPI_F90LIB=""
6226 > if test -f "$MPI_LIBDIR/libfmpich.a" ; then
6227 >  MPI_F90LIB="-lfmpich"
6228 > elif test -f "$MPI_LIBDIR/liblamf77mpi.a" ; then
6229 >  MPI_F90LIB="-llamf77mpi"
6230   else
6231 +  # nothing special found, we'll assume that the C library is all we need
6232 +  MPI_F90LIB="  "
6233 + fi
6234 + echo "$as_me:$LINENO: result: found $MPI_F90LIB" >&5
6235 + echo "${ECHO_T}found $MPI_F90LIB" >&6
6236  
5822 – cat >>confdefs.h <<\_ACEOF
5823 – #define HAVE_MPI 1
5824 – _ACEOF
6237  
5826 –        :
5827 – fi
6238  
6239  
6240   ac_ext=c
# Line 5855 | Line 6265 | do
6265    # On the NeXT, cc -E runs the code through the compiler's parser,
6266    # not just through cpp. "Syntax error" is here to catch this case.
6267    cat >conftest.$ac_ext <<_ACEOF
5858 – #line $LINENO "configure"
6268   /* confdefs.h.  */
6269   _ACEOF
6270   cat confdefs.h >>conftest.$ac_ext
# Line 5866 | Line 6275 | cat >>conftest.$ac_ext <<_ACEOF
6275   #else
6276   # include <assert.h>
6277   #endif
6278 <                     Syntax error
6278 >                     Syntax error
6279   _ACEOF
6280   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6281    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 5878 | Line 6287 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6287    (exit $ac_status); } >/dev/null; then
6288    if test -s conftest.err; then
6289      ac_cpp_err=$ac_c_preproc_warn_flag
6290 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6291    else
6292      ac_cpp_err=
6293    fi
# Line 5898 | Line 6308 | rm -f conftest.err conftest.$ac_ext
6308    # OK, works on sane cases.  Now check whether non-existent headers
6309    # can be detected and how.
6310    cat >conftest.$ac_ext <<_ACEOF
5901 – #line $LINENO "configure"
6311   /* confdefs.h.  */
6312   _ACEOF
6313   cat confdefs.h >>conftest.$ac_ext
# Line 5916 | Line 6325 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6325    (exit $ac_status); } >/dev/null; then
6326    if test -s conftest.err; then
6327      ac_cpp_err=$ac_c_preproc_warn_flag
6328 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6329    else
6330      ac_cpp_err=
6331    fi
# Line 5962 | Line 6372 | do
6372    # On the NeXT, cc -E runs the code through the compiler's parser,
6373    # not just through cpp. "Syntax error" is here to catch this case.
6374    cat >conftest.$ac_ext <<_ACEOF
5965 – #line $LINENO "configure"
6375   /* confdefs.h.  */
6376   _ACEOF
6377   cat confdefs.h >>conftest.$ac_ext
# Line 5973 | Line 6382 | cat >>conftest.$ac_ext <<_ACEOF
6382   #else
6383   # include <assert.h>
6384   #endif
6385 <                     Syntax error
6385 >                     Syntax error
6386   _ACEOF
6387   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6388    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 5985 | Line 6394 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6394    (exit $ac_status); } >/dev/null; then
6395    if test -s conftest.err; then
6396      ac_cpp_err=$ac_c_preproc_warn_flag
6397 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6398    else
6399      ac_cpp_err=
6400    fi
# Line 6005 | Line 6415 | rm -f conftest.err conftest.$ac_ext
6415    # OK, works on sane cases.  Now check whether non-existent headers
6416    # can be detected and how.
6417    cat >conftest.$ac_ext <<_ACEOF
6008 – #line $LINENO "configure"
6418   /* confdefs.h.  */
6419   _ACEOF
6420   cat confdefs.h >>conftest.$ac_ext
# Line 6023 | Line 6432 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6432    (exit $ac_status); } >/dev/null; then
6433    if test -s conftest.err; then
6434      ac_cpp_err=$ac_c_preproc_warn_flag
6435 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6436    else
6437      ac_cpp_err=
6438    fi
# Line 6083 | Line 6493 | else
6493    echo $ECHO_N "(cached) $ECHO_C" >&6
6494   else
6495    cat >conftest.$ac_ext <<_ACEOF
6086 – #line $LINENO "configure"
6496   /* confdefs.h.  */
6497   _ACEOF
6498   cat confdefs.h >>conftest.$ac_ext
# Line 6104 | Line 6513 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6513   _ACEOF
6514   rm -f conftest.$ac_objext
6515   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6516 <  (eval $ac_compile) 2>&5
6516 >  (eval $ac_compile) 2>conftest.er1
6517    ac_status=$?
6518 +  grep -v '^ *+' conftest.er1 >conftest.err
6519 +  rm -f conftest.er1
6520 +  cat conftest.err >&5
6521    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6522    (exit $ac_status); } &&
6523 <         { ac_try='test -s conftest.$ac_objext'
6523 >         { ac_try='test -z "$ac_c_werror_flag"
6524 >                         || test ! -s conftest.err'
6525    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6526    (eval $ac_try) 2>&5
6527    ac_status=$?
6528    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6529 +  (exit $ac_status); }; } &&
6530 +         { ac_try='test -s conftest.$ac_objext'
6531 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6532 +  (eval $ac_try) 2>&5
6533 +  ac_status=$?
6534 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6535    (exit $ac_status); }; }; then
6536    ac_cv_header_stdc=yes
6537   else
# Line 6121 | Line 6540 | rm -f conftest.$ac_objext conftest.$ac_ext
6540  
6541   ac_cv_header_stdc=no
6542   fi
6543 < rm -f conftest.$ac_objext conftest.$ac_ext
6543 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6544  
6545   if test $ac_cv_header_stdc = yes; then
6546    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
6547    cat >conftest.$ac_ext <<_ACEOF
6129 – #line $LINENO "configure"
6548   /* confdefs.h.  */
6549   _ACEOF
6550   cat confdefs.h >>conftest.$ac_ext
# Line 6148 | Line 6566 | if test $ac_cv_header_stdc = yes; then
6566   if test $ac_cv_header_stdc = yes; then
6567    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
6568    cat >conftest.$ac_ext <<_ACEOF
6151 – #line $LINENO "configure"
6569   /* confdefs.h.  */
6570   _ACEOF
6571   cat confdefs.h >>conftest.$ac_ext
# Line 6173 | Line 6590 | else
6590    :
6591   else
6592    cat >conftest.$ac_ext <<_ACEOF
6176 – #line $LINENO "configure"
6593   /* confdefs.h.  */
6594   _ACEOF
6595   cat confdefs.h >>conftest.$ac_ext
# Line 6185 | Line 6601 | cat >>conftest.$ac_ext <<_ACEOF
6601   # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
6602   #else
6603   # define ISLOWER(c) \
6604 <                   (('a' <= (c) && (c) <= 'i') \
6605 <                     || ('j' <= (c) && (c) <= 'r') \
6606 <                     || ('s' <= (c) && (c) <= 'z'))
6604 >                   (('a' <= (c) && (c) <= 'i') \
6605 >                     || ('j' <= (c) && (c) <= 'r') \
6606 >                     || ('s' <= (c) && (c) <= 'z'))
6607   # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
6608   #endif
6609  
# Line 6198 | Line 6614 | main ()
6614    int i;
6615    for (i = 0; i < 256; i++)
6616      if (XOR (islower (i), ISLOWER (i))
6617 <        || toupper (i) != TOUPPER (i))
6617 >        || toupper (i) != TOUPPER (i))
6618        exit(2);
6619    exit (0);
6620   }
# Line 6223 | Line 6639 | rm -f core core.* *.core gmon.out bb.out conftest$ac_e
6639   ( exit $ac_status )
6640   ac_cv_header_stdc=no
6641   fi
6642 < rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6642 > rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6643   fi
6644   fi
6645   fi
# Line 6248 | Line 6664 | for ac_header in sys/types.h sys/stat.h stdlib.h strin
6664  
6665  
6666   for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
6667 <                  inttypes.h stdint.h unistd.h
6667 >                  inttypes.h stdint.h unistd.h
6668   do
6669   as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6670   echo "$as_me:$LINENO: checking for $ac_header" >&5
# Line 6257 | Line 6673 | else
6673    echo $ECHO_N "(cached) $ECHO_C" >&6
6674   else
6675    cat >conftest.$ac_ext <<_ACEOF
6260 – #line $LINENO "configure"
6676   /* confdefs.h.  */
6677   _ACEOF
6678   cat confdefs.h >>conftest.$ac_ext
# Line 6269 | Line 6684 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6684   _ACEOF
6685   rm -f conftest.$ac_objext
6686   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6687 <  (eval $ac_compile) 2>&5
6687 >  (eval $ac_compile) 2>conftest.er1
6688    ac_status=$?
6689 +  grep -v '^ *+' conftest.er1 >conftest.err
6690 +  rm -f conftest.er1
6691 +  cat conftest.err >&5
6692    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6693    (exit $ac_status); } &&
6694 <         { ac_try='test -s conftest.$ac_objext'
6694 >         { ac_try='test -z "$ac_c_werror_flag"
6695 >                         || test ! -s conftest.err'
6696    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6697    (eval $ac_try) 2>&5
6698    ac_status=$?
6699    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6700 +  (exit $ac_status); }; } &&
6701 +         { ac_try='test -s conftest.$ac_objext'
6702 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6703 +  (eval $ac_try) 2>&5
6704 +  ac_status=$?
6705 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6706    (exit $ac_status); }; }; then
6707    eval "$as_ac_Header=yes"
6708   else
# Line 6286 | Line 6711 | rm -f conftest.$ac_objext conftest.$ac_ext
6711  
6712   eval "$as_ac_Header=no"
6713   fi
6714 < rm -f conftest.$ac_objext conftest.$ac_ext
6714 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6715   fi
6716   echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6717   echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
# Line 6390 | Line 6815 | cat >conftest.$ac_ext <<_ACEOF
6815   echo "$as_me:$LINENO: checking sprng.h usability" >&5
6816   echo $ECHO_N "checking sprng.h usability... $ECHO_C" >&6
6817   cat >conftest.$ac_ext <<_ACEOF
6393 – #line $LINENO "configure"
6818   /* confdefs.h.  */
6819   _ACEOF
6820   cat confdefs.h >>conftest.$ac_ext
# Line 6401 | Line 6825 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6825   _ACEOF
6826   rm -f conftest.$ac_objext
6827   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6828 <  (eval $ac_compile) 2>&5
6828 >  (eval $ac_compile) 2>conftest.er1
6829    ac_status=$?
6830 +  grep -v '^ *+' conftest.er1 >conftest.err
6831 +  rm -f conftest.er1
6832 +  cat conftest.err >&5
6833    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6834    (exit $ac_status); } &&
6835 <         { ac_try='test -s conftest.$ac_objext'
6835 >         { ac_try='test -z "$ac_c_werror_flag"
6836 >                         || test ! -s conftest.err'
6837    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6838    (eval $ac_try) 2>&5
6839    ac_status=$?
6840    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6841 +  (exit $ac_status); }; } &&
6842 +         { ac_try='test -s conftest.$ac_objext'
6843 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6844 +  (eval $ac_try) 2>&5
6845 +  ac_status=$?
6846 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6847    (exit $ac_status); }; }; then
6848    ac_header_compiler=yes
6849   else
# Line 6418 | Line 6852 | rm -f conftest.$ac_objext conftest.$ac_ext
6852  
6853   ac_header_compiler=no
6854   fi
6855 < rm -f conftest.$ac_objext conftest.$ac_ext
6855 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6856   echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6857   echo "${ECHO_T}$ac_header_compiler" >&6
6858  
# Line 6426 | Line 6860 | cat >conftest.$ac_ext <<_ACEOF
6860   echo "$as_me:$LINENO: checking sprng.h presence" >&5
6861   echo $ECHO_N "checking sprng.h presence... $ECHO_C" >&6
6862   cat >conftest.$ac_ext <<_ACEOF
6429 – #line $LINENO "configure"
6863   /* confdefs.h.  */
6864   _ACEOF
6865   cat confdefs.h >>conftest.$ac_ext
# Line 6444 | Line 6877 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6877    (exit $ac_status); } >/dev/null; then
6878    if test -s conftest.err; then
6879      ac_cpp_err=$ac_c_preproc_warn_flag
6880 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6881    else
6882      ac_cpp_err=
6883    fi
# Line 6463 | Line 6897 | case $ac_header_compiler:$ac_header_preproc in
6897   echo "${ECHO_T}$ac_header_preproc" >&6
6898  
6899   # So?  What about this header?
6900 < case $ac_header_compiler:$ac_header_preproc in
6901 <  yes:no )
6900 > case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
6901 >  yes:no: )
6902      { echo "$as_me:$LINENO: WARNING: sprng.h: accepted by the compiler, rejected by the preprocessor!" >&5
6903   echo "$as_me: WARNING: sprng.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
6904 <    { echo "$as_me:$LINENO: WARNING: sprng.h: proceeding with the preprocessor's result" >&5
6905 < echo "$as_me: WARNING: sprng.h: proceeding with the preprocessor's result" >&2;}
6906 <    (
6473 <      cat <<\_ASBOX
6474 < ## ------------------------------------ ##
6475 < ## Report this to bug-autoconf@gnu.org. ##
6476 < ## ------------------------------------ ##
6477 < _ASBOX
6478 <    ) |
6479 <      sed "s/^/$as_me: WARNING:     /" >&2
6904 >    { echo "$as_me:$LINENO: WARNING: sprng.h: proceeding with the compiler's result" >&5
6905 > echo "$as_me: WARNING: sprng.h: proceeding with the compiler's result" >&2;}
6906 >    ac_header_preproc=yes
6907      ;;
6908 <  no:yes )
6908 >  no:yes:* )
6909      { echo "$as_me:$LINENO: WARNING: sprng.h: present but cannot be compiled" >&5
6910   echo "$as_me: WARNING: sprng.h: present but cannot be compiled" >&2;}
6911 <    { echo "$as_me:$LINENO: WARNING: sprng.h: check for missing prerequisite headers?" >&5
6912 < echo "$as_me: WARNING: sprng.h: check for missing prerequisite headers?" >&2;}
6911 >    { echo "$as_me:$LINENO: WARNING: sprng.h:     check for missing prerequisite headers?" >&5
6912 > echo "$as_me: WARNING: sprng.h:     check for missing prerequisite headers?" >&2;}
6913 >    { echo "$as_me:$LINENO: WARNING: sprng.h: see the Autoconf documentation" >&5
6914 > echo "$as_me: WARNING: sprng.h: see the Autoconf documentation" >&2;}
6915 >    { echo "$as_me:$LINENO: WARNING: sprng.h:     section \"Present But Cannot Be Compiled\"" >&5
6916 > echo "$as_me: WARNING: sprng.h:     section \"Present But Cannot Be Compiled\"" >&2;}
6917      { echo "$as_me:$LINENO: WARNING: sprng.h: proceeding with the preprocessor's result" >&5
6918   echo "$as_me: WARNING: sprng.h: proceeding with the preprocessor's result" >&2;}
6919 +    { echo "$as_me:$LINENO: WARNING: sprng.h: in the future, the compiler will take precedence" >&5
6920 + echo "$as_me: WARNING: sprng.h: in the future, the compiler will take precedence" >&2;}
6921      (
6922        cat <<\_ASBOX
6923 < ## ------------------------------------ ##
6924 < ## Report this to bug-autoconf@gnu.org. ##
6925 < ## ------------------------------------ ##
6923 > ## ------------------------------ ##
6924 > ## Report this to gezelter@nd.edu ##
6925 > ## ------------------------------ ##
6926   _ASBOX
6927      ) |
6928        sed "s/^/$as_me: WARNING:     /" >&2
# Line 6516 | Line 6949 | cat >conftest.$ac_ext <<_ACEOF
6949    ac_check_lib_save_LIBS=$LIBS
6950   LIBS="-lsprng  $LIBS"
6951   cat >conftest.$ac_ext <<_ACEOF
6519 – #line $LINENO "configure"
6952   /* confdefs.h.  */
6953   _ACEOF
6954   cat confdefs.h >>conftest.$ac_ext
# Line 6540 | Line 6972 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6972   _ACEOF
6973   rm -f conftest.$ac_objext conftest$ac_exeext
6974   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6975 <  (eval $ac_link) 2>&5
6975 >  (eval $ac_link) 2>conftest.er1
6976    ac_status=$?
6977 +  grep -v '^ *+' conftest.er1 >conftest.err
6978 +  rm -f conftest.er1
6979 +  cat conftest.err >&5
6980    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6981    (exit $ac_status); } &&
6982 <         { ac_try='test -s conftest$ac_exeext'
6982 >         { ac_try='test -z "$ac_c_werror_flag"
6983 >                         || test ! -s conftest.err'
6984    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6985    (eval $ac_try) 2>&5
6986    ac_status=$?
6987    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6988 +  (exit $ac_status); }; } &&
6989 +         { ac_try='test -s conftest$ac_exeext'
6990 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6991 +  (eval $ac_try) 2>&5
6992 +  ac_status=$?
6993 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6994    (exit $ac_status); }; }; then
6995    ac_cv_lib_sprng_init_rng=yes
6996   else
# Line 6557 | Line 6999 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
6999  
7000   ac_cv_lib_sprng_init_rng=no
7001   fi
7002 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7002 > rm -f conftest.err conftest.$ac_objext \
7003 >      conftest$ac_exeext conftest.$ac_ext
7004   LIBS=$ac_check_lib_save_LIBS
7005   fi
7006   echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5
# Line 6573 | Line 7016 | fi
7016  
7017    CPPFLAGS=$ac_save_CPPFLAGS
7018    LDFLAGS=$ac_save_LDFLAGS
7019 <  ac_ext=f90
7020 < ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
7021 < ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7022 < ac_compiler_gnu=$ac_cv_f90_compiler_gnu
7019 >  ac_ext=c
7020 > ac_cpp='$CPP $CPPFLAGS'
7021 > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7022 > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7023 > ac_compiler_gnu=$ac_cv_c_compiler_gnu
7024  
7025  
7026    if test x_$HAVE_SPRNG != x_yes; then
# Line 6597 | Line 7041 | echo "${ECHO_T}yes" >&6
7041    withval="$with_mkl"
7042       echo "$as_me:$LINENO: result: yes" >&5
7043   echo "${ECHO_T}yes" >&6
7044 <    for dir in $withval /usr/local/intel/mkl60 /opt/intel/mkl60; do
7044 >    for dir in $withval /usr/local/intel/mkl61 /opt/intel/mkl61; do
7045          mkldir="$dir"
7046          if test -f "$dir/include/mkl.h"; then
7047              found_mkl="yes";
# Line 6637 | Line 7081 | cat >conftest.$ac_ext <<_ACEOF
7081   echo "$as_me:$LINENO: checking mkl.h usability" >&5
7082   echo $ECHO_N "checking mkl.h usability... $ECHO_C" >&6
7083   cat >conftest.$ac_ext <<_ACEOF
6640 – #line $LINENO "configure"
7084   /* confdefs.h.  */
7085   _ACEOF
7086   cat confdefs.h >>conftest.$ac_ext
# Line 6648 | Line 7091 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7091   _ACEOF
7092   rm -f conftest.$ac_objext
7093   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7094 <  (eval $ac_compile) 2>&5
7094 >  (eval $ac_compile) 2>conftest.er1
7095    ac_status=$?
7096 +  grep -v '^ *+' conftest.er1 >conftest.err
7097 +  rm -f conftest.er1
7098 +  cat conftest.err >&5
7099    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7100    (exit $ac_status); } &&
7101 <         { ac_try='test -s conftest.$ac_objext'
7101 >         { ac_try='test -z "$ac_c_werror_flag"
7102 >                         || test ! -s conftest.err'
7103    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7104    (eval $ac_try) 2>&5
7105    ac_status=$?
7106    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7107 +  (exit $ac_status); }; } &&
7108 +         { ac_try='test -s conftest.$ac_objext'
7109 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7110 +  (eval $ac_try) 2>&5
7111 +  ac_status=$?
7112 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7113    (exit $ac_status); }; }; then
7114    ac_header_compiler=yes
7115   else
# Line 6665 | Line 7118 | rm -f conftest.$ac_objext conftest.$ac_ext
7118  
7119   ac_header_compiler=no
7120   fi
7121 < rm -f conftest.$ac_objext conftest.$ac_ext
7121 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7122   echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7123   echo "${ECHO_T}$ac_header_compiler" >&6
7124  
# Line 6673 | Line 7126 | cat >conftest.$ac_ext <<_ACEOF
7126   echo "$as_me:$LINENO: checking mkl.h presence" >&5
7127   echo $ECHO_N "checking mkl.h presence... $ECHO_C" >&6
7128   cat >conftest.$ac_ext <<_ACEOF
6676 – #line $LINENO "configure"
7129   /* confdefs.h.  */
7130   _ACEOF
7131   cat confdefs.h >>conftest.$ac_ext
# Line 6691 | Line 7143 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
7143    (exit $ac_status); } >/dev/null; then
7144    if test -s conftest.err; then
7145      ac_cpp_err=$ac_c_preproc_warn_flag
7146 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
7147    else
7148      ac_cpp_err=
7149    fi
# Line 6710 | Line 7163 | case $ac_header_compiler:$ac_header_preproc in
7163   echo "${ECHO_T}$ac_header_preproc" >&6
7164  
7165   # So?  What about this header?
7166 < case $ac_header_compiler:$ac_header_preproc in
7167 <  yes:no )
7166 > case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7167 >  yes:no: )
7168      { echo "$as_me:$LINENO: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&5
7169   echo "$as_me: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
7170 <    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5
7171 < echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;}
7172 <    (
6720 <      cat <<\_ASBOX
6721 < ## ------------------------------------ ##
6722 < ## Report this to bug-autoconf@gnu.org. ##
6723 < ## ------------------------------------ ##
6724 < _ASBOX
6725 <    ) |
6726 <      sed "s/^/$as_me: WARNING:     /" >&2
7170 >    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the compiler's result" >&5
7171 > echo "$as_me: WARNING: mkl.h: proceeding with the compiler's result" >&2;}
7172 >    ac_header_preproc=yes
7173      ;;
7174 <  no:yes )
7174 >  no:yes:* )
7175      { echo "$as_me:$LINENO: WARNING: mkl.h: present but cannot be compiled" >&5
7176   echo "$as_me: WARNING: mkl.h: present but cannot be compiled" >&2;}
7177 <    { echo "$as_me:$LINENO: WARNING: mkl.h: check for missing prerequisite headers?" >&5
7178 < echo "$as_me: WARNING: mkl.h: check for missing prerequisite headers?" >&2;}
7177 >    { echo "$as_me:$LINENO: WARNING: mkl.h:     check for missing prerequisite headers?" >&5
7178 > echo "$as_me: WARNING: mkl.h:     check for missing prerequisite headers?" >&2;}
7179 >    { echo "$as_me:$LINENO: WARNING: mkl.h: see the Autoconf documentation" >&5
7180 > echo "$as_me: WARNING: mkl.h: see the Autoconf documentation" >&2;}
7181 >    { echo "$as_me:$LINENO: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&5
7182 > echo "$as_me: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
7183      { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5
7184   echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;}
7185 +    { echo "$as_me:$LINENO: WARNING: mkl.h: in the future, the compiler will take precedence" >&5
7186 + echo "$as_me: WARNING: mkl.h: in the future, the compiler will take precedence" >&2;}
7187      (
7188        cat <<\_ASBOX
7189 < ## ------------------------------------ ##
7190 < ## Report this to bug-autoconf@gnu.org. ##
7191 < ## ------------------------------------ ##
7189 > ## ------------------------------ ##
7190 > ## Report this to gezelter@nd.edu ##
7191 > ## ------------------------------ ##
7192   _ASBOX
7193      ) |
7194        sed "s/^/$as_me: WARNING:     /" >&2
# Line 6763 | Line 7215 | cat >conftest.$ac_ext <<_ACEOF
7215    ac_check_lib_save_LIBS=$LIBS
7216   LIBS="-lmkl  $LIBS"
7217   cat >conftest.$ac_ext <<_ACEOF
6766 – #line $LINENO "configure"
7218   /* confdefs.h.  */
7219   _ACEOF
7220   cat confdefs.h >>conftest.$ac_ext
# Line 6787 | Line 7238 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7238   _ACEOF
7239   rm -f conftest.$ac_objext conftest$ac_exeext
7240   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7241 <  (eval $ac_link) 2>&5
7241 >  (eval $ac_link) 2>conftest.er1
7242    ac_status=$?
7243 +  grep -v '^ *+' conftest.er1 >conftest.err
7244 +  rm -f conftest.er1
7245 +  cat conftest.err >&5
7246    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7247    (exit $ac_status); } &&
7248 <         { ac_try='test -s conftest$ac_exeext'
7248 >         { ac_try='test -z "$ac_c_werror_flag"
7249 >                         || test ! -s conftest.err'
7250    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7251    (eval $ac_try) 2>&5
7252    ac_status=$?
7253    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7254 +  (exit $ac_status); }; } &&
7255 +         { ac_try='test -s conftest$ac_exeext'
7256 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7257 +  (eval $ac_try) 2>&5
7258 +  ac_status=$?
7259 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7260    (exit $ac_status); }; }; then
7261    ac_cv_lib_mkl_vslNewStream=yes
7262   else
# Line 6804 | Line 7265 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
7265  
7266   ac_cv_lib_mkl_vslNewStream=no
7267   fi
7268 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7268 > rm -f conftest.err conftest.$ac_objext \
7269 >      conftest$ac_exeext conftest.$ac_ext
7270   LIBS=$ac_check_lib_save_LIBS
7271   fi
7272   echo "$as_me:$LINENO: result: $ac_cv_lib_mkl_vslNewStream" >&5
# Line 6823 | Line 7285 | fi
7285  
7286    CPPFLAGS=$ac_save_CPPFLAGS
7287    LDFLAGS=$ac_save_LDFLAGS
7288 <  ac_ext=f90
7289 < ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
7290 < ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7291 < ac_compiler_gnu=$ac_cv_f90_compiler_gnu
7288 >  ac_ext=c
7289 > ac_cpp='$CPP $CPPFLAGS'
7290 > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7291 > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7292 > ac_compiler_gnu=$ac_cv_c_compiler_gnu
7293  
7294  
7295    if test x_$HAVE_MKL != x_yes; then
# Line 6845 | Line 7308 | fi;
7308   echo "${ECHO_T}no" >&6
7309  
7310   fi;
6848 –
6849 –
6850 –
6851 –
6852 –
6853 – # Check whether --with-mpi_f90_mods or --without-mpi_f90_mods was given.
6854 – if test "${with_mpi_f90_mods+set}" = set; then
6855 –  withval="$with_mpi_f90_mods"
6856 –  mpi_f90_mods="$withval"
6857 – else
6858 –  mpi_f90_mods="/usr/local/include/f90choice"
6859 – fi;
6860 –
6861 –  echo "$as_me:$LINENO: checking for MPI F90 modules" >&5
6862 – echo $ECHO_N "checking for MPI F90 modules... $ECHO_C" >&6
6863 –
6864 –
6865 –  ac_ext=f90
6866 – ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
6867 – ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6868 – ac_compiler_gnu=$ac_cv_f90_compiler_gnu
6869 –
6870 –  ac_save_F90FLAGS=$F90FLAGS
6871 –
6872 –  if test "$mpi_f90_mods"; then
6873 –  F90FLAGS="${F90FLAGS} ${MODDIRFLAG}${mpi_f90_mods}"
6874 – fi
6875 –
6876 –    cat >conftest.$ac_ext <<_ACEOF
6877 –
6878 –
6879 – program main
6880 –
6881 – use mpi
6882 – integer :: ierr
6883 – call MPI_Init(ierr)
6884 –
6885 –
6886 – end program main
6887 –
6888 – _ACEOF
6889 – rm -f conftest.$ac_objext
6890 – if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6891 –  (eval $ac_compile) 2>&5
6892 –  ac_status=$?
6893 –  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6894 –  (exit $ac_status); } &&
6895 –         { ac_try='test -s conftest.$ac_objext'
6896 –  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6897 –  (eval $ac_try) 2>&5
6898 –  ac_status=$?
6899 –  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6900 –  (exit $ac_status); }; }; then
6901 –  HAVE_MPI_MOD=1
6902 – else
6903 –  echo "$as_me: failed program was:" >&5
6904 – sed 's/^/| /' conftest.$ac_ext >&5
6905 –
6906 – HAVE_MPI_MOD=0
6907 – fi
6908 – rm -f conftest.$ac_objext conftest.$ac_ext
6909 –
6910 –  F90FLAGS=$ac_save_F90FLAGS
6911 –  ac_ext=f90
6912 – ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
6913 – ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6914 – ac_compiler_gnu=$ac_cv_f90_compiler_gnu
6915 –
6916 –
6917 –  if test "$HAVE_MPI_MOD" = 1; then
6918 –    echo "$as_me:$LINENO: result: yes" >&5
6919 – echo "${ECHO_T}yes" >&6
6920 –
6921 – cat >>confdefs.h <<\_ACEOF
6922 – #define MPI_MOD 1
6923 – _ACEOF
7311  
6925 –    MPI_F90_MODS="${mpi_f90_mods}"
7312  
6927 –    # The library name:
6928 –    if test -z "$MPI_LIB" ; then
6929 –       MPI_LIBNAME=-lmpich
6930 –    else
6931 –       MPI_LIBNAME="$MPI_LIB"
6932 –    fi
6933 –    if test -z "$MPIMODLIBNAME" ; then
6934 –       MPIMODLIBNAME="${MPI_LIBNAME}f90"
6935 –    fi
7313  
6937 –  else
6938 –    echo "$as_me:$LINENO: result: no" >&5
6939 – echo "${ECHO_T}no" >&6
6940 –    { { echo "$as_me:$LINENO: error: Couldn't locate MPI F90 Modules" >&5
6941 – echo "$as_me: error: Couldn't locate MPI F90 Modules" >&2;}
6942 –   { (exit 1); exit 1; }; }
6943 –  fi
7314  
7315  
6946 –
6947 –
6948 –
7316   OBJEXT=".$OBJEXT"
7317  
7318   OOPSE=oopse
# Line 6969 | Line 7336 | SUBDIRS="libBASS libmdtools src forceFields samples ut
7336  
7337   MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
7338  
7339 < SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps"
7339 > SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps third-party"
7340  
7341   CFLAGS=${CFLAGS-""}
7342   CXXFLAGS=${CXXFLAGS-""}
# Line 7006 | Line 7373 | esac
7373  
7374            ac_config_headers="$ac_config_headers libmdtools/config.h"
7375  
7376 <                                                                                                                                                      ac_config_files="$ac_config_files Makefile libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile utils/sysbuilder/Makefile forceFields/Makefile samples/Makefile staticProps/Makefile samples/alkane/Makefile samples/argon/Makefile samples/beadLipid/Makefile samples/lipid/Makefile samples/metals/Makefile samples/water/Makefile"
7376 >                                                                                                                                                                ac_config_files="$ac_config_files Makefile libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile utils/sysbuilder/Makefile forceFields/Makefile samples/Makefile staticProps/Makefile third-party/Makefile samples/alkane/Makefile samples/argon/Makefile samples/beadLipid/Makefile samples/lipid/Makefile samples/metals/Makefile samples/water/Makefile"
7377  
7378  
7379   cat >confcache <<\_ACEOF
# Line 7037 | Line 7404 | _ACEOF
7404        # `set' does not quote correctly, so add quotes (double-quote
7405        # substitution turns \\\\ into \\, and sed turns \\ into \).
7406        sed -n \
7407 <        "s/'/'\\\\''/g;
7408 <          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
7407 >        "s/'/'\\\\''/g;
7408 >          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
7409        ;;
7410      *)
7411        # `set' quotes correctly as required by POSIX, so do not add quotes.
7412        sed -n \
7413 <        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
7413 >        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
7414        ;;
7415      esac;
7416   } |
# Line 7073 | Line 7440 | if test "x$srcdir" = x.; then
7440   # trailing colons and then remove the whole line if VPATH becomes empty
7441   # (actually we leave an empty line to preserve line numbers).
7442   if test "x$srcdir" = x.; then
7443 <  ac_vpsub='/^[         ]*VPATH[        ]*=/{
7443 >  ac_vpsub='/^[  ]*VPATH[        ]*=/{
7444   s/:*\$(srcdir):*/:/;
7445   s/:*\${srcdir}:*/:/;
7446   s/:*@srcdir@:*/:/;
7447 < s/^\([^=]*=[    ]*\):*/\1/;
7447 > s/^\([^=]*=[     ]*\):*/\1/;
7448   s/:*$//;
7449 < s/^[^=]*=[      ]*$//;
7449 > s/^[^=]*=[       ]*$//;
7450   }'
7451   fi
7452  
# Line 7090 | Line 7457 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && conti
7457   for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
7458    # 1. Remove the extension, and $U if already installed.
7459    ac_i=`echo "$ac_i" |
7460 <         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
7460 >         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
7461    # 2. Add them.
7462    ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
7463    ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
# Line 7134 | Line 7501 | fi
7501   elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
7502    set -o posix
7503   fi
7504 + DUALCASE=1; export DUALCASE # for MKS sh
7505  
7506   # Support unset when possible.
7507 < if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
7507 > if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
7508    as_unset=unset
7509   else
7510    as_unset=false
# Line 7155 | Line 7523 | do
7523    LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
7524    LC_TELEPHONE LC_TIME
7525   do
7526 <  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
7526 >  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
7527      eval $as_var=C; export $as_var
7528    else
7529      $as_unset $as_var
# Line 7334 | Line 7702 | else
7702   if mkdir -p . 2>/dev/null; then
7703    as_mkdir_p=:
7704   else
7705 +  test -d ./-p && rmdir ./-p
7706    as_mkdir_p=false
7707   fi
7708  
7709   as_executable_p="test -f"
7710  
7711   # Sed expression to map a string onto a valid CPP name.
7712 < as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
7712 > as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
7713  
7714   # Sed expression to map a string onto a valid variable name.
7715 < as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
7715 > as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
7716  
7717  
7718   # IFS
# Line 7370 | Line 7739 | generated by GNU Autoconf 2.57.  Invocation command li
7739   cat >&5 <<_CSEOF
7740  
7741   This file was extended by OOPSE $as_me 1.0, which was
7742 < generated by GNU Autoconf 2.57.  Invocation command line was
7742 > generated by GNU Autoconf 2.59.  Invocation command line was
7743  
7744    CONFIG_FILES    = $CONFIG_FILES
7745    CONFIG_HEADERS  = $CONFIG_HEADERS
# Line 7414 | Line 7783 | Usage: $0 [OPTIONS] [FILE]...
7783    -d, --debug      don't remove temporary files
7784        --recheck    update $as_me by reconfiguring in the same conditions
7785    --file=FILE[:TEMPLATE]
7786 <                   instantiate the configuration file FILE
7786 >                   instantiate the configuration file FILE
7787    --header=FILE[:TEMPLATE]
7788 <                   instantiate the configuration header FILE
7788 >                   instantiate the configuration header FILE
7789  
7790   Configuration files:
7791   $config_files
# Line 7430 | Line 7799 | configured by $0, generated by GNU Autoconf 2.57,
7799   cat >>$CONFIG_STATUS <<_ACEOF
7800   ac_cs_version="\\
7801   OOPSE config.status 1.0
7802 < configured by $0, generated by GNU Autoconf 2.57,
7802 > configured by $0, generated by GNU Autoconf 2.59,
7803    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
7804  
7805 < Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
7437 < Free Software Foundation, Inc.
7805 > Copyright (C) 2003 Free Software Foundation, Inc.
7806   This config.status script is free software; the Free Software Foundation
7807   gives unlimited permission to copy, distribute and modify it."
7808   srcdir=$srcdir
# Line 7542 | Line 7910 | do
7910    "forceFields/Makefile" ) CONFIG_FILES="$CONFIG_FILES forceFields/Makefile" ;;
7911    "samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
7912    "staticProps/Makefile" ) CONFIG_FILES="$CONFIG_FILES staticProps/Makefile" ;;
7913 +  "third-party/Makefile" ) CONFIG_FILES="$CONFIG_FILES third-party/Makefile" ;;
7914    "samples/alkane/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/alkane/Makefile" ;;
7915    "samples/argon/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/argon/Makefile" ;;
7916    "samples/beadLipid/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/beadLipid/Makefile" ;;
# Line 7679 | Line 8048 | s,@mpi_dir@,$mpi_dir,;t t
8048   s,@LEXLIB@,$LEXLIB,;t t
8049   s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
8050   s,@AR@,$AR,;t t
8051 < s,@mpi_dir@,$mpi_dir,;t t
8051 > s,@mpi@,$mpi,;t t
8052   s,@MPI_LIBDIR@,$MPI_LIBDIR,;t t
8053   s,@MPI_INC@,$MPI_INC,;t t
8054 + s,@MPI_F90INC@,$MPI_F90INC,;t t
8055   s,@MPI_LIB@,$MPI_LIB,;t t
8056 < s,@MPIF77@,$MPIF77,;t t
7687 < s,@MPIF90@,$MPIF90,;t t
7688 < s,@MPILIBS@,$MPILIBS,;t t
8056 > s,@MPI_F90LIB@,$MPI_F90LIB,;t t
8057   s,@CPP@,$CPP,;t t
8058   s,@EGREP@,$EGREP,;t t
8059   s,@SPRNG_LIBDIR@,$SPRNG_LIBDIR,;t t
# Line 7696 | Line 8064 | s,@MPI_F90_MODS@,$MPI_F90_MODS,;t t
8064   s,@MKL_LIB@,$MKL_LIB,;t t
8065   s,@MKL_INC@,$MKL_INC,;t t
8066   s,@HAVE_MKL@,$HAVE_MKL,;t t
7699 – s,@MPI_F90_MODS@,$MPI_F90_MODS,;t t
7700 – s,@MPIMODLIBNAME@,$MPIMODLIBNAME,;t t
8067   s,@BATEXT@,$BATEXT,;t t
8068   s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
8069   s,@OOPSE@,$OOPSE,;t t
# Line 7735 | Line 8101 | _ACEOF
8101        (echo ':t
8102    /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
8103        if test -z "$ac_sed_cmds"; then
8104 <        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
8104 >        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
8105        else
8106 <        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
8106 >        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
8107        fi
8108        ac_sed_frag=`expr $ac_sed_frag + 1`
8109        ac_beg=$ac_end
# Line 7755 | Line 8121 | for ac_file in : $CONFIG_FILES; do test "x$ac_file" =
8121    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
8122    case $ac_file in
8123    - | *:- | *:-:* ) # input from stdin
8124 <        cat >$tmp/stdin
8125 <        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8126 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8124 >        cat >$tmp/stdin
8125 >        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8126 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8127    *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8128 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8128 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8129    * )   ac_file_in=$ac_file.in ;;
8130    esac
8131  
8132    # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
8133    ac_dir=`(dirname "$ac_file") 2>/dev/null ||
8134   $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8135 <         X"$ac_file" : 'X\(//\)[^/]' \| \
8136 <         X"$ac_file" : 'X\(//\)$' \| \
8137 <         X"$ac_file" : 'X\(/\)' \| \
8138 <         .     : '\(.\)' 2>/dev/null ||
8135 >         X"$ac_file" : 'X\(//\)[^/]' \| \
8136 >         X"$ac_file" : 'X\(//\)$' \| \
8137 >         X"$ac_file" : 'X\(/\)' \| \
8138 >         .     : '\(.\)' 2>/dev/null ||
8139   echo X"$ac_file" |
8140      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8141            /^X\(\/\/\)[^/].*/{ s//\1/; q; }
# Line 7785 | Line 8151 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \|
8151        as_dirs="$as_dir $as_dirs"
8152        as_dir=`(dirname "$as_dir") 2>/dev/null ||
8153   $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8154 <         X"$as_dir" : 'X\(//\)[^/]' \| \
8155 <         X"$as_dir" : 'X\(//\)$' \| \
8156 <         X"$as_dir" : 'X\(/\)' \| \
8157 <         .     : '\(.\)' 2>/dev/null ||
8154 >         X"$as_dir" : 'X\(//\)[^/]' \| \
8155 >         X"$as_dir" : 'X\(//\)$' \| \
8156 >         X"$as_dir" : 'X\(/\)' \| \
8157 >         .     : '\(.\)' 2>/dev/null ||
8158   echo X"$as_dir" |
8159      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8160            /^X\(\/\/\)[^/].*/{ s//\1/; q; }
# Line 7826 | Line 8192 | esac
8192      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
8193      ac_top_srcdir=$ac_top_builddir$srcdir ;;
8194   esac
8195 < # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
8196 < # absolute.
8197 < ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
8198 < ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
8199 < ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
8200 < ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
8195 >
8196 > # Do not use `cd foo && pwd` to compute absolute paths, because
8197 > # the directories may not exist.
8198 > case `pwd` in
8199 > .) ac_abs_builddir="$ac_dir";;
8200 > *)
8201 >  case "$ac_dir" in
8202 >  .) ac_abs_builddir=`pwd`;;
8203 >  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
8204 >  *) ac_abs_builddir=`pwd`/"$ac_dir";;
8205 >  esac;;
8206 > esac
8207 > case $ac_abs_builddir in
8208 > .) ac_abs_top_builddir=${ac_top_builddir}.;;
8209 > *)
8210 >  case ${ac_top_builddir}. in
8211 >  .) ac_abs_top_builddir=$ac_abs_builddir;;
8212 >  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
8213 >  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
8214 >  esac;;
8215 > esac
8216 > case $ac_abs_builddir in
8217 > .) ac_abs_srcdir=$ac_srcdir;;
8218 > *)
8219 >  case $ac_srcdir in
8220 >  .) ac_abs_srcdir=$ac_abs_builddir;;
8221 >  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
8222 >  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
8223 >  esac;;
8224 > esac
8225 > case $ac_abs_builddir in
8226 > .) ac_abs_top_srcdir=$ac_top_srcdir;;
8227 > *)
8228 >  case $ac_top_srcdir in
8229 >  .) ac_abs_top_srcdir=$ac_abs_builddir;;
8230 >  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
8231 >  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
8232 >  esac;;
8233 > esac
8234  
8235  
8236    case $INSTALL in
# Line 7853 | Line 8252 | echo "$as_me: creating $ac_file" >&6;}
8252      configure_input="$ac_file.  "
8253    fi
8254    configure_input=$configure_input"Generated from `echo $ac_file_in |
8255 <                                     sed 's,.*/,,'` by configure."
8255 >                                     sed 's,.*/,,'` by configure."
8256  
8257    # First look for the input files in the build tree, otherwise in the
8258    # src tree.
# Line 7862 | Line 8261 | echo "$as_me: creating $ac_file" >&6;}
8261        case $f in
8262        -) echo $tmp/stdin ;;
8263        [\\/$]*)
8264 <         # Absolute (can't be DOS-style, as IFS=:)
8265 <         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8264 >         # Absolute (can't be DOS-style, as IFS=:)
8265 >         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8266   echo "$as_me: error: cannot find input file: $f" >&2;}
8267     { (exit 1); exit 1; }; }
8268 <         echo $f;;
8268 >         echo "$f";;
8269        *) # Relative
8270 <         if test -f "$f"; then
8271 <           # Build tree
8272 <           echo $f
8273 <         elif test -f "$srcdir/$f"; then
8274 <           # Source tree
8275 <           echo $srcdir/$f
8276 <         else
8277 <           # /dev/null tree
8278 <           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8270 >         if test -f "$f"; then
8271 >           # Build tree
8272 >           echo "$f"
8273 >         elif test -f "$srcdir/$f"; then
8274 >           # Source tree
8275 >           echo "$srcdir/$f"
8276 >         else
8277 >           # /dev/null tree
8278 >           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8279   echo "$as_me: error: cannot find input file: $f" >&2;}
8280     { (exit 1); exit 1; }; }
8281 <         fi;;
8281 >         fi;;
8282        esac
8283      done` || { (exit 1); exit 1; }
8284   _ACEOF
# Line 7921 | Line 8320 | ac_dA='s,^\([  ]*\)#\([        ]*define[       ][      ]*\)'
8320   # NAME is the cpp macro being defined and VALUE is the value it is being given.
8321   #
8322   # ac_d sets the value in "#define NAME VALUE" lines.
8323 < ac_dA='s,^\([   ]*\)#\([        ]*define[       ][      ]*\)'
8324 < ac_dB='[        ].*$,\1#\2'
8323 > ac_dA='s,^\([    ]*\)#\([        ]*define[       ][      ]*\)'
8324 > ac_dB='[         ].*$,\1#\2'
8325   ac_dC=' '
8326   ac_dD=',;t'
8327   # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
8328 < ac_uA='s,^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
8328 > ac_uA='s,^\([    ]*\)#\([        ]*\)undef\([    ][      ]*\)'
8329   ac_uB='$,\1#\2define\3'
8330   ac_uC=' '
8331   ac_uD=',;t'
# Line 7935 | Line 8334 | for ac_file in : $CONFIG_HEADERS; do test "x$ac_file"
8334    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
8335    case $ac_file in
8336    - | *:- | *:-:* ) # input from stdin
8337 <        cat >$tmp/stdin
8338 <        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8339 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8337 >        cat >$tmp/stdin
8338 >        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8339 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8340    *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8341 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8341 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8342    * )   ac_file_in=$ac_file.in ;;
8343    esac
8344  
# Line 7953 | Line 8352 | echo "$as_me: creating $ac_file" >&6;}
8352        case $f in
8353        -) echo $tmp/stdin ;;
8354        [\\/$]*)
8355 <         # Absolute (can't be DOS-style, as IFS=:)
8356 <         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8355 >         # Absolute (can't be DOS-style, as IFS=:)
8356 >         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8357   echo "$as_me: error: cannot find input file: $f" >&2;}
8358     { (exit 1); exit 1; }; }
8359 <         echo $f;;
8359 >         # Do quote $f, to prevent DOS paths from being IFS'd.
8360 >         echo "$f";;
8361        *) # Relative
8362 <         if test -f "$f"; then
8363 <           # Build tree
8364 <           echo $f
8365 <         elif test -f "$srcdir/$f"; then
8366 <           # Source tree
8367 <           echo $srcdir/$f
8368 <         else
8369 <           # /dev/null tree
8370 <           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8362 >         if test -f "$f"; then
8363 >           # Build tree
8364 >           echo "$f"
8365 >         elif test -f "$srcdir/$f"; then
8366 >           # Source tree
8367 >           echo "$srcdir/$f"
8368 >         else
8369 >           # /dev/null tree
8370 >           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8371   echo "$as_me: error: cannot find input file: $f" >&2;}
8372     { (exit 1); exit 1; }; }
8373 <         fi;;
8373 >         fi;;
8374        esac
8375      done` || { (exit 1); exit 1; }
8376    # Remove the trailing spaces.
8377 <  sed 's/[      ]*$//' $ac_file_inputs >$tmp/in
8377 >  sed 's/[       ]*$//' $ac_file_inputs >$tmp/in
8378  
8379   _ACEOF
8380  
# Line 7997 | Line 8397 | s,^[   ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*
8397   s,[\\$`],\\&,g
8398   t clear
8399   : clear
8400 < s,^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
8400 > s,^[     ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
8401   t end
8402 < s,^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
8402 > s,^[     ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
8403   : end
8404   _ACEOF
8405   # If some macros were called several times there might be several times
# Line 8013 | Line 8413 | s,^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/*
8413   # example, in the case of _POSIX_SOURCE, which is predefined and required
8414   # on some systems where configure will not decide to define it.
8415   cat >>conftest.undefs <<\_ACEOF
8416 < s,^[    ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
8416 > s,^[     ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
8417   _ACEOF
8418  
8419   # Break up conftest.defines because some shells have a limit on the size
8420   # of here documents, and old seds have small limits too (100 cmds).
8421   echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
8422 < echo '  if grep "^[     ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
8422 > echo '  if grep "^[      ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
8423   echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
8424   echo '  :' >>$CONFIG_STATUS
8425   rm -f conftest.tail
# Line 8028 | Line 8428 | do
8428    # Write a limited-size here document to $tmp/defines.sed.
8429    echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
8430    # Speed up: don't consider the non `#define' lines.
8431 <  echo '/^[     ]*#[    ]*define/!b' >>$CONFIG_STATUS
8431 >  echo '/^[      ]*#[    ]*define/!b' >>$CONFIG_STATUS
8432    # Work around the forget-to-reset-the-flag bug.
8433    echo 't clr' >>$CONFIG_STATUS
8434    echo ': clr' >>$CONFIG_STATUS
# Line 8055 | Line 8455 | do
8455    # Write a limited-size here document to $tmp/undefs.sed.
8456    echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
8457    # Speed up: don't consider the non `#undef'
8458 <  echo '/^[     ]*#[    ]*undef/!b' >>$CONFIG_STATUS
8458 >  echo '/^[      ]*#[    ]*undef/!b' >>$CONFIG_STATUS
8459    # Work around the forget-to-reset-the-flag bug.
8460    echo 't clr' >>$CONFIG_STATUS
8461    echo ': clr' >>$CONFIG_STATUS
# Line 8089 | Line 8489 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \|
8489      else
8490        ac_dir=`(dirname "$ac_file") 2>/dev/null ||
8491   $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8492 <         X"$ac_file" : 'X\(//\)[^/]' \| \
8493 <         X"$ac_file" : 'X\(//\)$' \| \
8494 <         X"$ac_file" : 'X\(/\)' \| \
8495 <         .     : '\(.\)' 2>/dev/null ||
8492 >         X"$ac_file" : 'X\(//\)[^/]' \| \
8493 >         X"$ac_file" : 'X\(//\)$' \| \
8494 >         X"$ac_file" : 'X\(/\)' \| \
8495 >         .     : '\(.\)' 2>/dev/null ||
8496   echo X"$ac_file" |
8497      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8498            /^X\(\/\/\)[^/].*/{ s//\1/; q; }
# Line 8108 | Line 8508 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \|
8508        as_dirs="$as_dir $as_dirs"
8509        as_dir=`(dirname "$as_dir") 2>/dev/null ||
8510   $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8511 <         X"$as_dir" : 'X\(//\)[^/]' \| \
8512 <         X"$as_dir" : 'X\(//\)$' \| \
8513 <         X"$as_dir" : 'X\(/\)' \| \
8514 <         .     : '\(.\)' 2>/dev/null ||
8511 >         X"$as_dir" : 'X\(//\)[^/]' \| \
8512 >         X"$as_dir" : 'X\(//\)$' \| \
8513 >         X"$as_dir" : 'X\(/\)' \| \
8514 >         .     : '\(.\)' 2>/dev/null ||
8515   echo X"$as_dir" |
8516      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8517            /^X\(\/\/\)[^/].*/{ s//\1/; q; }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines