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 896 by chuckv, Mon Jan 5 22:18:40 2004 UTC vs.
Revision 1238 by gezelter, Fri Jun 4 14:59:17 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 MPI_F90_MODS MPIMODLIBNAME EGREP CPP 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'
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_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI 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
878 <  --with-mpi-libdir=dir  give the path for MPI-libraries MPI_DIR/lib
879 <  --with-mpi_inc=dir  give the path for MPI-include-files MPI_DIR/include
880 <  --with-mpi_f90_mods=<dir>
881 <                          Location where MPI f90 modules are installed
874 >  --with-mpi=<prefix>     compile with MPI libraries in <prefix> [default=no]
875    --with-sprng_prefix=PREFIX
876                            Prefix where SPRNG is installed
877    --with-sprng-libdir=PREFIX  SPRNG library directory
878    --with-sprng-include=PREFIX
879                            SPRNG include directory
880 <  --with-mkl              Do we want MKL will check /usr/local/intel/mkl60 /opt/intel/mkl60
880 >  --with-mkl              Do we want MKL will check /usr/local/intel/mkl61 /opt/intel/mkl61
881  
882   Some influential environment variables:
883    CC          C compiler command
# Line 897 | Line 890 | Some influential environment variables:
890    CXXFLAGS    C++ compiler flags
891    F90         Fortran 90 compiler command
892    F90FLAGS    Fortran 90 compiler flags
900  MPIF77      MPI Fortran compiler command
893    CPP         C preprocessor
894  
895   Use these variables to override the choices made by `configure' or to help
# Line 937 | Line 929 | esac
929      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
930      ac_top_srcdir=$ac_top_builddir$srcdir ;;
931   esac
932 < # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
933 < # absolute.
934 < ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
935 < ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
936 < ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
937 < ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
932 >
933 > # Do not use `cd foo && pwd` to compute absolute paths, because
934 > # the directories may not exist.
935 > case `pwd` in
936 > .) ac_abs_builddir="$ac_dir";;
937 > *)
938 >  case "$ac_dir" in
939 >  .) ac_abs_builddir=`pwd`;;
940 >  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
941 >  *) ac_abs_builddir=`pwd`/"$ac_dir";;
942 >  esac;;
943 > esac
944 > case $ac_abs_builddir in
945 > .) ac_abs_top_builddir=${ac_top_builddir}.;;
946 > *)
947 >  case ${ac_top_builddir}. in
948 >  .) ac_abs_top_builddir=$ac_abs_builddir;;
949 >  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
950 >  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
951 >  esac;;
952 > esac
953 > case $ac_abs_builddir in
954 > .) ac_abs_srcdir=$ac_srcdir;;
955 > *)
956 >  case $ac_srcdir in
957 >  .) ac_abs_srcdir=$ac_abs_builddir;;
958 >  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
959 >  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
960 >  esac;;
961 > esac
962 > case $ac_abs_builddir in
963 > .) ac_abs_top_srcdir=$ac_top_srcdir;;
964 > *)
965 >  case $ac_top_srcdir in
966 >  .) ac_abs_top_srcdir=$ac_abs_builddir;;
967 >  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
968 >  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
969 >  esac;;
970 > esac
971  
972      cd $ac_dir
973      # Check for guested configure; otherwise get Cygnus style configure.
# Line 953 | Line 978 | ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir &
978        echo
979        $SHELL $ac_srcdir/configure  --help=recursive
980      elif test -f $ac_srcdir/configure.ac ||
981 <           test -f $ac_srcdir/configure.in; then
981 >           test -f $ac_srcdir/configure.in; then
982        echo
983        $ac_configure --help
984      else
# Line 967 | Line 992 | generated by GNU Autoconf 2.57
992   if $ac_init_version; then
993    cat <<\_ACEOF
994   OOPSE configure 1.0
995 < generated by GNU Autoconf 2.57
995 > generated by GNU Autoconf 2.59
996  
997 < Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
973 < Free Software Foundation, Inc.
997 > Copyright (C) 2003 Free Software Foundation, Inc.
998   This configure script is free software; the Free Software Foundation
999   gives unlimited permission to copy, distribute and modify it.
1000   _ACEOF
# Line 982 | Line 1006 | generated by GNU Autoconf 2.57.  Invocation command li
1006   running configure, to aid debugging if configure makes a mistake.
1007  
1008   It was created by OOPSE $as_me 1.0, which was
1009 < generated by GNU Autoconf 2.57.  Invocation command line was
1009 > generated by GNU Autoconf 2.59.  Invocation command line was
1010  
1011    $ $0 $@
1012  
# Line 1059 | Line 1083 | do
1083      2)
1084        ac_configure_args1="$ac_configure_args1 '$ac_arg'"
1085        if test $ac_must_keep_next = true; then
1086 <        ac_must_keep_next=false # Got value, back to normal.
1086 >        ac_must_keep_next=false # Got value, back to normal.
1087        else
1088 <        case $ac_arg in
1089 <          *=* | --config-cache | -C | -disable-* | --disable-* \
1090 <          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
1091 <          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
1092 <          | -with-* | --with-* | -without-* | --without-* | --x)
1093 <            case "$ac_configure_args0 " in
1094 <              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
1095 <            esac
1096 <            ;;
1097 <          -* ) ac_must_keep_next=true ;;
1098 <        esac
1088 >        case $ac_arg in
1089 >          *=* | --config-cache | -C | -disable-* | --disable-* \
1090 >          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
1091 >          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
1092 >          | -with-* | --with-* | -without-* | --without-* | --x)
1093 >            case "$ac_configure_args0 " in
1094 >              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
1095 >            esac
1096 >            ;;
1097 >          -* ) ac_must_keep_next=true ;;
1098 >        esac
1099        fi
1100        ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
1101        # Get rid of the leading space.
# Line 1105 | Line 1129 | _ASBOX
1129      case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
1130      *ac_space=\ *)
1131        sed -n \
1132 <        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1133 <          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1132 >        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1133 >          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1134        ;;
1135      *)
1136        sed -n \
1137 <        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1137 >        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1138        ;;
1139      esac;
1140   }
# Line 1139 | Line 1163 | _ASBOX
1163        for ac_var in $ac_subst_files
1164        do
1165          eval ac_val=$`echo $ac_var`
1166 <        echo "$ac_var='"'"'$ac_val'"'"'"
1166 >        echo "$ac_var='"'"'$ac_val'"'"'"
1167        done | sort
1168        echo
1169      fi
# Line 1158 | Line 1182 | _ASBOX
1182        echo "$as_me: caught signal $ac_signal"
1183      echo "$as_me: exit $exit_status"
1184    } >&5
1185 <  rm -f core core.* *.core &&
1185 >  rm -f core *.core &&
1186    rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
1187      exit $exit_status
1188       ' 0
# Line 1238 | Line 1262 | for ac_var in `(set) 2>&1 |
1262   # value.
1263   ac_cache_corrupted=false
1264   for ac_var in `(set) 2>&1 |
1265 <               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
1265 >               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
1266    eval ac_old_set=\$ac_cv_env_${ac_var}_set
1267    eval ac_new_set=\$ac_env_${ac_var}_set
1268    eval ac_old_val="\$ac_cv_env_${ac_var}_value"
# Line 1255 | Line 1279 | echo "$as_me: error: \`$ac_var' was not set in the pre
1279      ,);;
1280      *)
1281        if test "x$ac_old_val" != "x$ac_new_val"; then
1282 <        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1282 >        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1283   echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1284 <        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
1284 >        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
1285   echo "$as_me:   former value:  $ac_old_val" >&2;}
1286 <        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
1286 >        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
1287   echo "$as_me:   current value: $ac_new_val" >&2;}
1288 <        ac_cache_corrupted=:
1288 >        ac_cache_corrupted=:
1289        fi;;
1290    esac
1291    # Pass precious variables to config.status.
# Line 1792 | Line 1816 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1816   # $SHELLVAR to the Fortran 95 mangled name.  If the SHELLVAR
1817   # argument is not supplied, it defaults to NAME.
1818   # AC_F95_FUNC
1819 +
1820 +
1821  
1822  
1823  
# Line 1836 | Line 1862 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1862  
1863  
1864  
1865 +
1866 +
1867 +
1868 +
1869 +
1870   # set program name
1871   PROGNAME="oopse"
1872  
# Line 2034 | Line 2065 | cat >conftest.$ac_ext <<_ACEOF
2065    (exit $ac_status); }
2066  
2067   cat >conftest.$ac_ext <<_ACEOF
2037 #line $LINENO "configure"
2068   /* confdefs.h.  */
2069   _ACEOF
2070   cat confdefs.h >>conftest.$ac_ext
# Line 2054 | Line 2084 | echo "$as_me:$LINENO: checking for C compiler default
2084   # Try to create an executable without -o first, disregard a.out.
2085   # It will help us diagnose broken compilers, and finding out an intuition
2086   # of exeext.
2087 < echo "$as_me:$LINENO: checking for C compiler default output" >&5
2088 < echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
2087 > echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
2088 > echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
2089   ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2090   if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
2091    (eval $ac_link_default) 2>&5
# Line 2075 | Line 2105 | do
2105    test -f "$ac_file" || continue
2106    case $ac_file in
2107      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
2108 <        ;;
2108 >        ;;
2109      conftest.$ac_ext )
2110 <        # This is the source file.
2111 <        ;;
2110 >        # This is the source file.
2111 >        ;;
2112      [ab].out )
2113 <        # We found the default executable, but exeext='' is most
2114 <        # certainly right.
2115 <        break;;
2113 >        # We found the default executable, but exeext='' is most
2114 >        # certainly right.
2115 >        break;;
2116      *.* )
2117 <        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2118 <        # FIXME: I believe we export ac_cv_exeext for Libtool,
2119 <        # but it would be cool to find out if it's true.  Does anybody
2120 <        # maintain Libtool? --akim.
2121 <        export ac_cv_exeext
2122 <        break;;
2117 >        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2118 >        # FIXME: I believe we export ac_cv_exeext for Libtool,
2119 >        # but it would be cool to find out if it's true.  Does anybody
2120 >        # maintain Libtool? --akim.
2121 >        export ac_cv_exeext
2122 >        break;;
2123      * )
2124 <        break;;
2124 >        break;;
2125    esac
2126   done
2127   else
# Line 2165 | Line 2195 | for ac_file in conftest.exe conftest conftest.*; do
2195    case $ac_file in
2196      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
2197      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2198 <          export ac_cv_exeext
2199 <          break;;
2198 >          export ac_cv_exeext
2199 >          break;;
2200      * ) break;;
2201    esac
2202   done
# Line 2191 | Line 2221 | else
2221    echo $ECHO_N "(cached) $ECHO_C" >&6
2222   else
2223    cat >conftest.$ac_ext <<_ACEOF
2194 #line $LINENO "configure"
2224   /* confdefs.h.  */
2225   _ACEOF
2226   cat confdefs.h >>conftest.$ac_ext
# Line 2242 | Line 2271 | else
2271    echo $ECHO_N "(cached) $ECHO_C" >&6
2272   else
2273    cat >conftest.$ac_ext <<_ACEOF
2245 #line $LINENO "configure"
2274   /* confdefs.h.  */
2275   _ACEOF
2276   cat confdefs.h >>conftest.$ac_ext
# Line 2262 | Line 2290 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2290   _ACEOF
2291   rm -f conftest.$ac_objext
2292   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2293 <  (eval $ac_compile) 2>&5
2293 >  (eval $ac_compile) 2>conftest.er1
2294    ac_status=$?
2295 +  grep -v '^ *+' conftest.er1 >conftest.err
2296 +  rm -f conftest.er1
2297 +  cat conftest.err >&5
2298    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2299    (exit $ac_status); } &&
2300 <         { ac_try='test -s conftest.$ac_objext'
2300 >         { ac_try='test -z "$ac_c_werror_flag"
2301 >                         || test ! -s conftest.err'
2302    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2303    (eval $ac_try) 2>&5
2304    ac_status=$?
2305    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2306 +  (exit $ac_status); }; } &&
2307 +         { ac_try='test -s conftest.$ac_objext'
2308 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2309 +  (eval $ac_try) 2>&5
2310 +  ac_status=$?
2311 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2312    (exit $ac_status); }; }; then
2313    ac_compiler_gnu=yes
2314   else
# Line 2279 | Line 2317 | rm -f conftest.$ac_objext conftest.$ac_ext
2317  
2318   ac_compiler_gnu=no
2319   fi
2320 < rm -f conftest.$ac_objext conftest.$ac_ext
2320 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2321   ac_cv_c_compiler_gnu=$ac_compiler_gnu
2322  
2323   fi
# Line 2295 | Line 2333 | else
2333    echo $ECHO_N "(cached) $ECHO_C" >&6
2334   else
2335    cat >conftest.$ac_ext <<_ACEOF
2298 #line $LINENO "configure"
2336   /* confdefs.h.  */
2337   _ACEOF
2338   cat confdefs.h >>conftest.$ac_ext
# Line 2312 | Line 2349 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2349   _ACEOF
2350   rm -f conftest.$ac_objext
2351   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2352 <  (eval $ac_compile) 2>&5
2352 >  (eval $ac_compile) 2>conftest.er1
2353    ac_status=$?
2354 +  grep -v '^ *+' conftest.er1 >conftest.err
2355 +  rm -f conftest.er1
2356 +  cat conftest.err >&5
2357    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2358    (exit $ac_status); } &&
2359 <         { ac_try='test -s conftest.$ac_objext'
2359 >         { ac_try='test -z "$ac_c_werror_flag"
2360 >                         || test ! -s conftest.err'
2361 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2362 >  (eval $ac_try) 2>&5
2363 >  ac_status=$?
2364 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2365 >  (exit $ac_status); }; } &&
2366 >         { ac_try='test -s conftest.$ac_objext'
2367    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2368    (eval $ac_try) 2>&5
2369    ac_status=$?
# Line 2329 | Line 2376 | rm -f conftest.$ac_objext conftest.$ac_ext
2376  
2377   ac_cv_prog_cc_g=no
2378   fi
2379 < rm -f conftest.$ac_objext conftest.$ac_ext
2379 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2380   fi
2381   echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2382   echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
# Line 2356 | Line 2403 | cat >conftest.$ac_ext <<_ACEOF
2403    ac_cv_prog_cc_stdc=no
2404   ac_save_CC=$CC
2405   cat >conftest.$ac_ext <<_ACEOF
2359 #line $LINENO "configure"
2406   /* confdefs.h.  */
2407   _ACEOF
2408   cat confdefs.h >>conftest.$ac_ext
# Line 2384 | Line 2430 | int test (int i, double x);
2430    va_end (v);
2431    return s;
2432   }
2433 +
2434 + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
2435 +   function prototypes and stuff, but not '\xHH' hex character constants.
2436 +   These don't provoke an error unfortunately, instead are silently treated
2437 +   as 'x'.  The following induces an error, until -std1 is added to get
2438 +   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
2439 +   array size at least.  It's necessary to write '\x00'==0 to get something
2440 +   that's true only with -std1.  */
2441 + int osf4_cc_array ['\x00' == 0 ? 1 : -1];
2442 +
2443   int test (int i, double x);
2444   struct s1 {int (*f) (int a);};
2445   struct s2 {int (*f) (double a);};
# Line 2410 | Line 2466 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2466    CC="$ac_save_CC $ac_arg"
2467    rm -f conftest.$ac_objext
2468   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2469 <  (eval $ac_compile) 2>&5
2469 >  (eval $ac_compile) 2>conftest.er1
2470    ac_status=$?
2471 +  grep -v '^ *+' conftest.er1 >conftest.err
2472 +  rm -f conftest.er1
2473 +  cat conftest.err >&5
2474    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2475    (exit $ac_status); } &&
2476 <         { ac_try='test -s conftest.$ac_objext'
2476 >         { ac_try='test -z "$ac_c_werror_flag"
2477 >                         || test ! -s conftest.err'
2478    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2479    (eval $ac_try) 2>&5
2480    ac_status=$?
2481    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2482 +  (exit $ac_status); }; } &&
2483 +         { ac_try='test -s conftest.$ac_objext'
2484 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2485 +  (eval $ac_try) 2>&5
2486 +  ac_status=$?
2487 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2488    (exit $ac_status); }; }; then
2489    ac_cv_prog_cc_stdc=$ac_arg
2490   break
# Line 2427 | Line 2493 | rm -f conftest.$ac_objext
2493   sed 's/^/| /' conftest.$ac_ext >&5
2494  
2495   fi
2496 < rm -f conftest.$ac_objext
2496 > rm -f conftest.err conftest.$ac_objext
2497   done
2498   rm -f conftest.$ac_ext conftest.$ac_objext
2499   CC=$ac_save_CC
# Line 2455 | Line 2521 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2521   _ACEOF
2522   rm -f conftest.$ac_objext
2523   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2524 <  (eval $ac_compile) 2>&5
2524 >  (eval $ac_compile) 2>conftest.er1
2525    ac_status=$?
2526 +  grep -v '^ *+' conftest.er1 >conftest.err
2527 +  rm -f conftest.er1
2528 +  cat conftest.err >&5
2529    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2530    (exit $ac_status); } &&
2531 <         { ac_try='test -s conftest.$ac_objext'
2531 >         { ac_try='test -z "$ac_c_werror_flag"
2532 >                         || test ! -s conftest.err'
2533    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2534    (eval $ac_try) 2>&5
2535    ac_status=$?
2536    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2537 +  (exit $ac_status); }; } &&
2538 +         { ac_try='test -s conftest.$ac_objext'
2539 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2540 +  (eval $ac_try) 2>&5
2541 +  ac_status=$?
2542 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2543    (exit $ac_status); }; }; then
2544    for ac_declaration in \
2545 <   ''\
2470 <   '#include <stdlib.h>' \
2545 >   '' \
2546     'extern "C" void std::exit (int) throw (); using std::exit;' \
2547     'extern "C" void std::exit (int); using std::exit;' \
2548     'extern "C" void exit (int) throw ();' \
# Line 2475 | Line 2550 | do
2550     'void exit (int);'
2551   do
2552    cat >conftest.$ac_ext <<_ACEOF
2478 #line $LINENO "configure"
2553   /* confdefs.h.  */
2554   _ACEOF
2555   cat confdefs.h >>conftest.$ac_ext
2556   cat >>conftest.$ac_ext <<_ACEOF
2557   /* end confdefs.h.  */
2484 #include <stdlib.h>
2558   $ac_declaration
2559 + #include <stdlib.h>
2560   int
2561   main ()
2562   {
# Line 2493 | Line 2567 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2567   _ACEOF
2568   rm -f conftest.$ac_objext
2569   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2570 <  (eval $ac_compile) 2>&5
2570 >  (eval $ac_compile) 2>conftest.er1
2571    ac_status=$?
2572 +  grep -v '^ *+' conftest.er1 >conftest.err
2573 +  rm -f conftest.er1
2574 +  cat conftest.err >&5
2575    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2576    (exit $ac_status); } &&
2577 <         { ac_try='test -s conftest.$ac_objext'
2577 >         { ac_try='test -z "$ac_c_werror_flag"
2578 >                         || test ! -s conftest.err'
2579 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2580 >  (eval $ac_try) 2>&5
2581 >  ac_status=$?
2582 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2583 >  (exit $ac_status); }; } &&
2584 >         { ac_try='test -s conftest.$ac_objext'
2585    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2586    (eval $ac_try) 2>&5
2587    ac_status=$?
# Line 2510 | Line 2594 | rm -f conftest.$ac_objext conftest.$ac_ext
2594  
2595   continue
2596   fi
2597 < rm -f conftest.$ac_objext conftest.$ac_ext
2597 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2598    cat >conftest.$ac_ext <<_ACEOF
2515 #line $LINENO "configure"
2599   /* confdefs.h.  */
2600   _ACEOF
2601   cat confdefs.h >>conftest.$ac_ext
# Line 2529 | Line 2612 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2612   _ACEOF
2613   rm -f conftest.$ac_objext
2614   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2615 <  (eval $ac_compile) 2>&5
2615 >  (eval $ac_compile) 2>conftest.er1
2616    ac_status=$?
2617 +  grep -v '^ *+' conftest.er1 >conftest.err
2618 +  rm -f conftest.er1
2619 +  cat conftest.err >&5
2620    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2621    (exit $ac_status); } &&
2622 <         { ac_try='test -s conftest.$ac_objext'
2622 >         { ac_try='test -z "$ac_c_werror_flag"
2623 >                         || test ! -s conftest.err'
2624    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2625    (eval $ac_try) 2>&5
2626    ac_status=$?
2627    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2628 +  (exit $ac_status); }; } &&
2629 +         { ac_try='test -s conftest.$ac_objext'
2630 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2631 +  (eval $ac_try) 2>&5
2632 +  ac_status=$?
2633 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2634    (exit $ac_status); }; }; then
2635    break
2636   else
# Line 2545 | Line 2638 | rm -f conftest.$ac_objext conftest.$ac_ext
2638   sed 's/^/| /' conftest.$ac_ext >&5
2639  
2640   fi
2641 < rm -f conftest.$ac_objext conftest.$ac_ext
2641 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2642   done
2643   rm -f conftest*
2644   if test -n "$ac_declaration"; then
# Line 2559 | Line 2652 | rm -f conftest.$ac_objext conftest.$ac_ext
2652   sed 's/^/| /' conftest.$ac_ext >&5
2653  
2654   fi
2655 < rm -f conftest.$ac_objext conftest.$ac_ext
2655 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2656   ac_ext=c
2657   ac_cpp='$CPP $CPPFLAGS'
2658   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 2573 | Line 2666 | if test -n "$ac_tool_prefix"; then
2666   ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2667   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2668   if test -n "$ac_tool_prefix"; then
2669 <  for ac_prog in $CCC icpc icc xlC CC g++ c++
2669 >  for ac_prog in $CCC icpc icc xlc++ xlC CC g++ c++
2670    do
2671      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2672   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 2615 | Line 2708 | if test -z "$CXX"; then
2708   fi
2709   if test -z "$CXX"; then
2710    ac_ct_CXX=$CXX
2711 <  for ac_prog in $CCC icpc icc xlC CC g++ c++
2711 >  for ac_prog in $CCC icpc icc xlc++ xlC CC g++ c++
2712   do
2713    # Extract the first word of "$ac_prog", so it can be a program name with args.
2714   set dummy $ac_prog; ac_word=$2
# Line 2686 | Line 2779 | else
2779    echo $ECHO_N "(cached) $ECHO_C" >&6
2780   else
2781    cat >conftest.$ac_ext <<_ACEOF
2689 #line $LINENO "configure"
2782   /* confdefs.h.  */
2783   _ACEOF
2784   cat confdefs.h >>conftest.$ac_ext
# Line 2706 | Line 2798 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2798   _ACEOF
2799   rm -f conftest.$ac_objext
2800   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2801 <  (eval $ac_compile) 2>&5
2801 >  (eval $ac_compile) 2>conftest.er1
2802    ac_status=$?
2803 +  grep -v '^ *+' conftest.er1 >conftest.err
2804 +  rm -f conftest.er1
2805 +  cat conftest.err >&5
2806    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2807    (exit $ac_status); } &&
2808 <         { ac_try='test -s conftest.$ac_objext'
2808 >         { ac_try='test -z "$ac_cxx_werror_flag"
2809 >                         || test ! -s conftest.err'
2810    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2811    (eval $ac_try) 2>&5
2812    ac_status=$?
2813    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2814 +  (exit $ac_status); }; } &&
2815 +         { ac_try='test -s conftest.$ac_objext'
2816 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2817 +  (eval $ac_try) 2>&5
2818 +  ac_status=$?
2819 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2820    (exit $ac_status); }; }; then
2821    ac_compiler_gnu=yes
2822   else
# Line 2723 | Line 2825 | rm -f conftest.$ac_objext conftest.$ac_ext
2825  
2826   ac_compiler_gnu=no
2827   fi
2828 < rm -f conftest.$ac_objext conftest.$ac_ext
2828 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2829   ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
2830  
2831   fi
# Line 2739 | Line 2841 | else
2841    echo $ECHO_N "(cached) $ECHO_C" >&6
2842   else
2843    cat >conftest.$ac_ext <<_ACEOF
2742 #line $LINENO "configure"
2844   /* confdefs.h.  */
2845   _ACEOF
2846   cat confdefs.h >>conftest.$ac_ext
# Line 2756 | Line 2857 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2857   _ACEOF
2858   rm -f conftest.$ac_objext
2859   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2860 <  (eval $ac_compile) 2>&5
2860 >  (eval $ac_compile) 2>conftest.er1
2861    ac_status=$?
2862 +  grep -v '^ *+' conftest.er1 >conftest.err
2863 +  rm -f conftest.er1
2864 +  cat conftest.err >&5
2865    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2866    (exit $ac_status); } &&
2867 <         { ac_try='test -s conftest.$ac_objext'
2867 >         { ac_try='test -z "$ac_cxx_werror_flag"
2868 >                         || test ! -s conftest.err'
2869    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2870    (eval $ac_try) 2>&5
2871    ac_status=$?
2872    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2873 +  (exit $ac_status); }; } &&
2874 +         { ac_try='test -s conftest.$ac_objext'
2875 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2876 +  (eval $ac_try) 2>&5
2877 +  ac_status=$?
2878 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2879    (exit $ac_status); }; }; then
2880    ac_cv_prog_cxx_g=yes
2881   else
# Line 2773 | Line 2884 | rm -f conftest.$ac_objext conftest.$ac_ext
2884  
2885   ac_cv_prog_cxx_g=no
2886   fi
2887 < rm -f conftest.$ac_objext conftest.$ac_ext
2887 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2888   fi
2889   echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
2890   echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
# Line 2793 | Line 2904 | for ac_declaration in \
2904    fi
2905   fi
2906   for ac_declaration in \
2907 <   ''\
2797 <   '#include <stdlib.h>' \
2907 >   '' \
2908     'extern "C" void std::exit (int) throw (); using std::exit;' \
2909     'extern "C" void std::exit (int); using std::exit;' \
2910     'extern "C" void exit (int) throw ();' \
# Line 2802 | Line 2912 | do
2912     'void exit (int);'
2913   do
2914    cat >conftest.$ac_ext <<_ACEOF
2805 #line $LINENO "configure"
2915   /* confdefs.h.  */
2916   _ACEOF
2917   cat confdefs.h >>conftest.$ac_ext
2918   cat >>conftest.$ac_ext <<_ACEOF
2919   /* end confdefs.h.  */
2811 #include <stdlib.h>
2920   $ac_declaration
2921 + #include <stdlib.h>
2922   int
2923   main ()
2924   {
# Line 2820 | Line 2929 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2929   _ACEOF
2930   rm -f conftest.$ac_objext
2931   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2932 <  (eval $ac_compile) 2>&5
2932 >  (eval $ac_compile) 2>conftest.er1
2933    ac_status=$?
2934 +  grep -v '^ *+' conftest.er1 >conftest.err
2935 +  rm -f conftest.er1
2936 +  cat conftest.err >&5
2937    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2938    (exit $ac_status); } &&
2939 <         { ac_try='test -s conftest.$ac_objext'
2939 >         { ac_try='test -z "$ac_cxx_werror_flag"
2940 >                         || test ! -s conftest.err'
2941    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2942    (eval $ac_try) 2>&5
2943    ac_status=$?
2944    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2945 +  (exit $ac_status); }; } &&
2946 +         { ac_try='test -s conftest.$ac_objext'
2947 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2948 +  (eval $ac_try) 2>&5
2949 +  ac_status=$?
2950 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2951    (exit $ac_status); }; }; then
2952    :
2953   else
# Line 2837 | Line 2956 | rm -f conftest.$ac_objext conftest.$ac_ext
2956  
2957   continue
2958   fi
2959 < rm -f conftest.$ac_objext conftest.$ac_ext
2959 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2960    cat >conftest.$ac_ext <<_ACEOF
2842 #line $LINENO "configure"
2961   /* confdefs.h.  */
2962   _ACEOF
2963   cat confdefs.h >>conftest.$ac_ext
# Line 2856 | Line 2974 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2974   _ACEOF
2975   rm -f conftest.$ac_objext
2976   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2977 <  (eval $ac_compile) 2>&5
2977 >  (eval $ac_compile) 2>conftest.er1
2978    ac_status=$?
2979 +  grep -v '^ *+' conftest.er1 >conftest.err
2980 +  rm -f conftest.er1
2981 +  cat conftest.err >&5
2982    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2983    (exit $ac_status); } &&
2984 <         { ac_try='test -s conftest.$ac_objext'
2984 >         { ac_try='test -z "$ac_cxx_werror_flag"
2985 >                         || test ! -s conftest.err'
2986    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2987    (eval $ac_try) 2>&5
2988    ac_status=$?
2989    echo "$as_me:$LINENO: \$? = $ac_status" >&5
2990 +  (exit $ac_status); }; } &&
2991 +         { ac_try='test -s conftest.$ac_objext'
2992 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2993 +  (eval $ac_try) 2>&5
2994 +  ac_status=$?
2995 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2996    (exit $ac_status); }; }; then
2997    break
2998   else
# Line 2872 | Line 3000 | rm -f conftest.$ac_objext conftest.$ac_ext
3000   sed 's/^/| /' conftest.$ac_ext >&5
3001  
3002   fi
3003 < rm -f conftest.$ac_objext conftest.$ac_ext
3003 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3004   done
3005   rm -f conftest*
3006   if test -n "$ac_declaration"; then
# Line 2887 | Line 3015 | OOPSE_TEMPLATE_FLAGS=""
3015   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3016   ac_compiler_gnu=$ac_cv_c_compiler_gnu
3017  
3018 +
3019   OOPSE_TEMPLATE_FLAGS=""
3020   if test $ac_cv_cxx_compiler_gnu = no; then
3021    echo "$as_me:$LINENO: checking checking whether ${CXX} accepts -ptused -no_prelink" >&5
# Line 2931 | Line 3060 | echo "${ECHO_T}yes" >&6
3060    if test -z "`${CXX} -LANG:std -c conftest.cc 2>&1`"; then
3061      echo "$as_me:$LINENO: result: yes" >&5
3062   echo "${ECHO_T}yes" >&6
3063 +
3064 +
3065      EXTRA_CC_FLAG=${EXTRA_CC_FLAG}" -LANG:std"
3066    else
3067      echo "$as_me:$LINENO: result: no" >&5
# Line 2946 | Line 3077 | if test -n "$ac_tool_prefix"; then
3077   ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3078   ac_compiler_gnu=$ac_cv_f90_compiler_gnu
3079   if test -n "$ac_tool_prefix"; then
3080 <  for ac_prog in ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3080 >  for ac_prog in ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3081    do
3082      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3083   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 2988 | Line 3119 | if test -z "$F90"; then
3119   fi
3120   if test -z "$F90"; then
3121    ac_ct_F90=$F90
3122 <  for ac_prog in ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3122 >  for ac_prog in ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95
3123   do
3124    # Extract the first word of "$ac_prog", so it can be a program name with args.
3125   set dummy $ac_prog; ac_word=$2
# Line 3054 | Line 3185 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3185   _ACEOF
3186   rm -f conftest.$ac_objext
3187   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3188 <  (eval $ac_compile) 2>&5
3188 >  (eval $ac_compile) 2>conftest.er1
3189    ac_status=$?
3190 +  grep -v '^ *+' conftest.er1 >conftest.err
3191 +  rm -f conftest.er1
3192 +  cat conftest.err >&5
3193    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3194    (exit $ac_status); } &&
3195 <         { ac_try='test -s conftest.$ac_objext'
3195 >         { ac_try='test -z "$ac_f90_werror_flag"
3196 >                         || test ! -s conftest.err'
3197 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3198 >  (eval $ac_try) 2>&5
3199 >  ac_status=$?
3200 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3201 >  (exit $ac_status); }; } &&
3202 >         { ac_try='test -s conftest.$ac_objext'
3203    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3204    (eval $ac_try) 2>&5
3205    ac_status=$?
# Line 3071 | Line 3212 | rm -f conftest.$ac_objext conftest.$ac_ext
3212  
3213   ac_compiler_gnu=no
3214   fi
3215 < rm -f conftest.$ac_objext conftest.$ac_ext
3215 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3216   ac_cv_f90_compiler_gnu=$ac_compiler_gnu
3217  
3218   fi
# Line 3096 | Line 3237 | if test "$ac_test_PREPFLAG" != "set"; then
3237    PREPFLAG=""
3238    case "${host_cpu}-${host_os}" in
3239  
3240 <  *linux*) if test "$F90" = ifc; then
3240 >  *linux*) if test "$F90" = ifc -o "$F90" = ifort; then
3241                      PREPFLAG="-fpp1 "
3242                  fi;;
3243    *aix*)  if test "$F90" = xlf90 -o "$F90" = f90; then
# Line 3145 | Line 3286 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3286   _ACEOF
3287   rm -f conftest.$ac_objext
3288   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3289 <  (eval $ac_compile) 2>&5
3289 >  (eval $ac_compile) 2>conftest.er1
3290    ac_status=$?
3291 +  grep -v '^ *+' conftest.er1 >conftest.err
3292 +  rm -f conftest.er1
3293 +  cat conftest.err >&5
3294    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3295    (exit $ac_status); } &&
3296 <         { ac_try='test -s conftest.$ac_objext'
3296 >         { ac_try='test -z "$ac_f90_werror_flag"
3297 >                         || test ! -s conftest.err'
3298    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3299    (eval $ac_try) 2>&5
3300    ac_status=$?
3301    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3302 +  (exit $ac_status); }; } &&
3303 +         { ac_try='test -s conftest.$ac_objext'
3304 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3305 +  (eval $ac_try) 2>&5
3306 +  ac_status=$?
3307 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3308    (exit $ac_status); }; }; then
3309    prepflagworks=1
3310   else
# Line 3162 | Line 3313 | rm -f conftest.$ac_objext conftest.$ac_ext
3313  
3314   prepflagworks=0
3315   fi
3316 < rm -f conftest.$ac_objext conftest.$ac_ext
3316 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3317  
3318    F90FLAGS=$ac_save_F90FLAGS
3319    ac_ext=$ac_save_ext
# Line 3173 | Line 3324 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
3324   ac_compiler_gnu=$ac_cv_c_compiler_gnu
3325  
3326  
3176
3327    if test "$prepflagworks" = 1; then
3328      echo "$as_me:$LINENO: result: yes" >&5
3329   echo "${ECHO_T}yes" >&6
# Line 3198 | Line 3348 | if test "$ac_test_PREPDEFFLAG" != "set"; then
3348    PREPDEFFLAG=""
3349    case "${host_cpu}-${host_os}" in
3350  
3351 <  *linux*) if test "$F90" = ifc; then
3351 >  *linux*) if test "$F90" = ifc -o "$F90" = ifort; then
3352                      PREPDEFFLAG=" "
3353                  fi;;
3354    *aix*)  if test "$F90" = xlf90 -o "$F90" = f90; then
# Line 3251 | Line 3401 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3401   _ACEOF
3402   rm -f conftest.$ac_objext
3403   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3404 <  (eval $ac_compile) 2>&5
3404 >  (eval $ac_compile) 2>conftest.er1
3405    ac_status=$?
3406 +  grep -v '^ *+' conftest.er1 >conftest.err
3407 +  rm -f conftest.er1
3408 +  cat conftest.err >&5
3409    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3410    (exit $ac_status); } &&
3411 <         { ac_try='test -s conftest.$ac_objext'
3411 >         { ac_try='test -z "$ac_f90_werror_flag"
3412 >                         || test ! -s conftest.err'
3413    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3414    (eval $ac_try) 2>&5
3415    ac_status=$?
3416    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3417 +  (exit $ac_status); }; } &&
3418 +         { ac_try='test -s conftest.$ac_objext'
3419 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3420 +  (eval $ac_try) 2>&5
3421 +  ac_status=$?
3422 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3423    (exit $ac_status); }; }; then
3424    prepdefflagworks=1
3425   else
# Line 3268 | Line 3428 | rm -f conftest.$ac_objext conftest.$ac_ext
3428  
3429   prepdefflagworks=0
3430   fi
3431 < rm -f conftest.$ac_objext conftest.$ac_ext
3431 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3432  
3433    F90FLAGS=$ac_save_F90FLAGS
3434    ac_ext=$ac_save_ext
# Line 3320 | Line 3480 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3480   _ACEOF
3481   rm -f conftest.$ac_objext
3482   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3483 <  (eval $ac_compile) 2>&5
3483 >  (eval $ac_compile) 2>conftest.er1
3484    ac_status=$?
3485 +  grep -v '^ *+' conftest.er1 >conftest.err
3486 +  rm -f conftest.er1
3487 +  cat conftest.err >&5
3488    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3489    (exit $ac_status); } &&
3490 <         { ac_try='test -s conftest.$ac_objext'
3490 >         { ac_try='test -z "$ac_f90_werror_flag"
3491 >                         || test ! -s conftest.err'
3492    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3493    (eval $ac_try) 2>&5
3494    ac_status=$?
3495    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3496 +  (exit $ac_status); }; } &&
3497 +         { ac_try='test -s conftest.$ac_objext'
3498 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3499 +  (eval $ac_try) 2>&5
3500 +  ac_status=$?
3501 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3502    (exit $ac_status); }; }; then
3503    ac_cv_prog_f90_v=
3504   # Try some options frequently used verbose output
# Line 3354 | Line 3524 | F90FLAGS="$F90FLAGS $ac_verb"
3524   ac_save_F90FLAGS=$F90FLAGS
3525   F90FLAGS="$F90FLAGS $ac_verb"
3526  
3527 < (eval echo $as_me:3357: \"$ac_link\") >&5
3527 > (eval echo $as_me:3527: \"$ac_link\") >&5
3528   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3529   echo "$ac_f90_v_output" >&5
3530   F90FLAGS=$ac_save_F90FLAGS
# Line 3396 | Line 3566 | rm -f conftest.$ac_objext conftest.$ac_ext
3566   { echo "$as_me:$LINENO: WARNING: compilation failed" >&5
3567   echo "$as_me: WARNING: compilation failed" >&2;}
3568   fi
3569 < rm -f conftest.$ac_objext conftest.$ac_ext
3569 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3570  
3571   fi
3572   echo "$as_me:$LINENO: result: $ac_cv_prog_f90_v" >&5
# Line 3431 | Line 3601 | F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3601   ac_save_F90FLAGS=$F90FLAGS
3602   F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3603  
3604 < (eval echo $as_me:3434: \"$ac_link\") >&5
3604 > (eval echo $as_me:3604: \"$ac_link\") >&5
3605   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3606   echo "$ac_f90_v_output" >&5
3607   F90FLAGS=$ac_save_F90FLAGS
# Line 3613 | Line 3783 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3783   _ACEOF
3784   rm -f conftest.$ac_objext
3785   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3786 <  (eval $ac_compile) 2>&5
3786 >  (eval $ac_compile) 2>conftest.er1
3787    ac_status=$?
3788 +  grep -v '^ *+' conftest.er1 >conftest.err
3789 +  rm -f conftest.er1
3790 +  cat conftest.err >&5
3791    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3792    (exit $ac_status); } &&
3793 <         { ac_try='test -s conftest.$ac_objext'
3793 >         { ac_try='test -z "$ac_f90_werror_flag"
3794 >                         || test ! -s conftest.err'
3795    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3796    (eval $ac_try) 2>&5
3797    ac_status=$?
3798    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3799 +  (exit $ac_status); }; } &&
3800 +         { ac_try='test -s conftest.$ac_objext'
3801 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3802 +  (eval $ac_try) 2>&5
3803 +  ac_status=$?
3804 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3805    (exit $ac_status); }; }; then
3806    mv conftest.$ac_objext cf90_test.$ac_objext
3807  
# Line 3639 | Line 3819 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
3819      for ac_underscore in "" "_"; do
3820        ac_func="$ac_foobar$ac_underscore"
3821        cat >conftest.$ac_ext <<_ACEOF
3642 #line $LINENO "configure"
3822   /* confdefs.h.  */
3823   _ACEOF
3824   cat confdefs.h >>conftest.$ac_ext
# Line 3663 | Line 3842 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3842   _ACEOF
3843   rm -f conftest.$ac_objext conftest$ac_exeext
3844   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3845 <  (eval $ac_link) 2>&5
3845 >  (eval $ac_link) 2>conftest.er1
3846    ac_status=$?
3847 +  grep -v '^ *+' conftest.er1 >conftest.err
3848 +  rm -f conftest.er1
3849 +  cat conftest.err >&5
3850    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3851    (exit $ac_status); } &&
3852 <         { ac_try='test -s conftest$ac_exeext'
3852 >         { ac_try='test -z "$ac_c_werror_flag"
3853 >                         || test ! -s conftest.err'
3854    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3855    (eval $ac_try) 2>&5
3856    ac_status=$?
3857    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3858 +  (exit $ac_status); }; } &&
3859 +         { ac_try='test -s conftest$ac_exeext'
3860 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3861 +  (eval $ac_try) 2>&5
3862 +  ac_status=$?
3863 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3864    (exit $ac_status); }; }; then
3865    ac_success=yes; break 2
3866   else
# Line 3679 | Line 3868 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
3868   sed 's/^/| /' conftest.$ac_ext >&5
3869  
3870   fi
3871 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3871 > rm -f conftest.err conftest.$ac_objext \
3872 >      conftest$ac_exeext conftest.$ac_ext
3873      done
3874    done
3875  
# Line 3700 | Line 3890 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
3890          ac_func="$ac_foo_bar$ac_underscore$ac_extra"
3891  
3892          cat >conftest.$ac_ext <<_ACEOF
3703 #line $LINENO "configure"
3893   /* confdefs.h.  */
3894   _ACEOF
3895   cat confdefs.h >>conftest.$ac_ext
# Line 3724 | Line 3913 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3913   _ACEOF
3914   rm -f conftest.$ac_objext conftest$ac_exeext
3915   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3916 <  (eval $ac_link) 2>&5
3916 >  (eval $ac_link) 2>conftest.er1
3917    ac_status=$?
3918 +  grep -v '^ *+' conftest.er1 >conftest.err
3919 +  rm -f conftest.er1
3920 +  cat conftest.err >&5
3921    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3922    (exit $ac_status); } &&
3923 <         { ac_try='test -s conftest$ac_exeext'
3923 >         { ac_try='test -z "$ac_c_werror_flag"
3924 >                         || test ! -s conftest.err'
3925 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3926 >  (eval $ac_try) 2>&5
3927 >  ac_status=$?
3928 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3929 >  (exit $ac_status); }; } &&
3930 >         { ac_try='test -s conftest$ac_exeext'
3931    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3932    (eval $ac_try) 2>&5
3933    ac_status=$?
# Line 3740 | Line 3939 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
3939   sed 's/^/| /' conftest.$ac_ext >&5
3940  
3941   fi
3942 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3942 > rm -f conftest.err conftest.$ac_objext \
3943 >      conftest$ac_exeext conftest.$ac_ext
3944       done
3945  
3946       if test "$ac_success_extra" = "yes"; then
# Line 3775 | Line 3975 | rm -f conftest.$ac_objext conftest.$ac_ext
3975   sed 's/^/| /' conftest.$ac_ext >&5
3976  
3977   fi
3978 < rm -f conftest.$ac_objext conftest.$ac_ext
3978 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3979   ac_ext=f90
3980   ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
3981   ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
# Line 4005 | Line 4205 | case $debug in
4205    1)
4206       ;;
4207    *)
4208 +
4209 +
4210 +
4211  
4212  
4213  
4214 + echo "$as_me:$LINENO: checking whether we are *really* using GNU cc" >&5
4215 + echo $ECHO_N "checking whether we are *really* using GNU cc... $ECHO_C" >&6
4216 + if test "${ac_cv_prog_really_gcc+set}" = set; then
4217 +  echo $ECHO_N "(cached) $ECHO_C" >&6
4218 + else
4219  
4220 + cat > conftest.c <<EOF
4221 + #ifdef __GNUC__
4222 +  #ifndef __INTEL_COMPILER
4223 +     yes;
4224 +  #endif
4225 + #endif
4226 + EOF
4227 + if { ac_try='${CC-cc} -E conftest.c'
4228 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4229 +  (eval $ac_try) 2>&5
4230 +  ac_status=$?
4231 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4232 +  (exit $ac_status); }; } | egrep yes >/dev/null 2>&1; then
4233 +  ac_cv_prog_really_gcc=yes
4234 + else
4235 +  ac_cv_prog_really_gcc=no
4236 + fi
4237 +
4238 + fi
4239 + echo "$as_me:$LINENO: result: $ac_cv_prog_really_gcc" >&5
4240 + echo "${ECHO_T}$ac_cv_prog_really_gcc" >&6
4241 + if test "$ac_cv_prog_really_gcc" = yes; then
4242 +        :
4243 +
4244 + else
4245 +        :
4246 +
4247 + fi
4248 +
4249 +
4250   # Try to determine "good" native compiler flags if none specified on command
4251   # line
4252   if test "$ac_test_CFLAGS" != "set"; then
# Line 4048 | Line 4286 | if test "$ac_test_CFLAGS" != "set"; then
4286          fi;;
4287     *darwin*)
4288          if test "$CC" = xlc -o "$CC" = cc; then
4289 <                CFLAGS="-O3 -qtune=auto -w"
4052 <                echo "*******************************************************"
4053 <                echo "*  You have Darwin on an unknown powerpc system.      *"
4054 <                echo "*  It is recommended that you use                     *"
4055 <                echo "*                                                     *"
4056 <                echo "*  CFLAGS=-O3 -qarch=ppc -qtune=xxx -qansialias -w    *"
4057 <                echo "*                               ^^^                   *"
4058 <                echo "*  where xxx is 601, 603, 604, or whatever kind of    *"
4059 <                echo "*  PowerPC CPU you have.   For more info, man cc.     *"
4060 <                echo "*******************************************************"
4289 >                CFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
4290          fi;;
4291    esac
4292  
4293    # use default flags for gcc on all systems
4294 <  if test $ac_cv_c_compiler_gnu = yes; then
4294 >  if test $ac_cv_prog_really_gcc = yes; then
4295       CFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
4296    fi
4297  
4298    # test for gcc-specific flags:
4299 <  if test $ac_cv_c_compiler_gnu = yes; then
4299 >  if test $ac_cv_prog_really_gcc = yes; then
4300      # -malign-double for x86 systems
4301  
4302  
# Line 4125 | Line 4354 | fi
4354    fi
4355  
4356    CPU_FLAGS=""
4357 <  if test "$GCC" = "yes"; then
4357 >  if test $ac_cv_prog_really_gcc = yes; then
4358                    case "${host_cpu}" in
4359            i586*)
4360  
# Line 4271 | Line 4500 | cat > conftest.c <<EOF
4500   else
4501  
4502   cat > conftest.c <<EOF
4503 < #ifdef __GNUC__
4503 > #ifdef __GNUC__ && !defined (__INTEL_COMPILER)
4504   #  if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
4505       yes;
4506   #  endif
# Line 4431 | Line 4660 | else
4660          echo "********************************************************"
4661          echo ""
4662          CFLAGS=""
4663 +
4664 + fi
4665 +
4666  
4667   fi
4668  
4669 +
4670 +
4671 +
4672 +
4673 +
4674 +
4675 + echo "$as_me:$LINENO: checking whether we are *really* using GNU c++" >&5
4676 + echo $ECHO_N "checking whether we are *really* using GNU c++... $ECHO_C" >&6
4677 + if test "${ac_cv_prog_really_gxx+set}" = set; then
4678 +  echo $ECHO_N "(cached) $ECHO_C" >&6
4679 + else
4680  
4681 + cat > conftest.cpp <<EOF
4682 + #ifdef __GNUC__
4683 +  #ifndef __INTEL_COMPILER
4684 +     yes;
4685 +  #endif
4686 + #endif
4687 + EOF
4688 + if { ac_try='${CXX-c++} -E conftest.cpp'
4689 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4690 +  (eval $ac_try) 2>&5
4691 +  ac_status=$?
4692 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4693 +  (exit $ac_status); }; } | egrep yes >/dev/null 2>&1; then
4694 +  ac_cv_prog_really_gxx=yes
4695 + else
4696 +  ac_cv_prog_really_gxx=no
4697   fi
4698  
4699 + fi
4700 + echo "$as_me:$LINENO: result: $ac_cv_prog_really_gxx" >&5
4701 + echo "${ECHO_T}$ac_cv_prog_really_gxx" >&6
4702 + if test "$ac_cv_prog_really_gxx" = yes; then
4703 +        :
4704  
4705 + else
4706 +        :
4707  
4708 + fi
4709  
4710  
4711   # Try to determine "good" native compiler flags if none specified on command
# Line 4470 | Line 4737 | if test "$ac_test_CXXFLAGS" != "set"; then
4737                  echo "*******************************************************"
4738          fi;;
4739     *darwin*)
4740 <        if test "$CXX" = xlC; then
4741 <                CXXFLAGS="-O3 -qtune=auto -qansialias -w"
4475 <                echo "*******************************************************"
4476 <                echo "*  You have AIX on an unknown powerpc system.  It is  *"
4477 <                echo "*  recommended that you use                           *"
4478 <                echo "*                                                     *"
4479 <                echo "*  CXXFLAGS=-O3 -qarch=ppc -qtune=xxx -qansialias -w  *"
4480 <                echo "*                                 ^^^                 *"
4481 <                echo "*  where xxx is 601, 603, 604, or whatever kind of    *"
4482 <                echo "*  PowerPC CPU you have.   For more info, man cc.     *"
4483 <                echo "*******************************************************"
4740 >        if test "$CXX" = xlc++; then
4741 >                CXXFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
4742          fi;;
4743    esac
4744  
4745    # use default flags for gcc on all systems
4746 <  if test $ac_cv_c_compiler_gnu = yes; then
4746 >  if test $ac_cv_prog_really_gxx = yes; then
4747       CXXFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
4748    fi
4749  
4750    # test for gcc-specific flags:
4751 <  if test $ac_cv_c_compiler_gnu = yes; then
4751 >  if test $ac_cv_prog_really_gxx = yes; then
4752      # -malign-double for x86 systems
4753  
4754  
# Line 4548 | Line 4806 | fi
4806    fi
4807  
4808    CPU_FLAGS=""
4809 <  if test "$GCC" = "yes"; then
4809 >  if test $ac_cv_prog_really_gxx = yes; then
4810                    case "${host_cpu}" in
4811            i586*)
4812  
4813 < echo "$as_me:$LINENO: checking whether ${CC-cc} accepts -mcpu=pentium" >&5
4814 < echo $ECHO_N "checking whether ${CC-cc} accepts -mcpu=pentium... $ECHO_C" >&6
4813 > echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mcpu=pentium" >&5
4814 > echo $ECHO_N "checking whether ${CXX-c++} accepts -mcpu=pentium... $ECHO_C" >&6
4815   if test "${ac_cpu_pentium+set}" = set; then
4816    echo $ECHO_N "(cached) $ECHO_C" >&6
4817   else
4818 <  echo 'void f(){}' > conftest.c
4819 < if test -z "`${CC-cc} -mcpu=pentium -c conftest.c 2>&1`"; then
4818 >  echo 'void f(){}' > conftest.cpp
4819 > if test -z "`${CXX-c++} -mcpu=pentium -c conftest.cpp 2>&1`"; then
4820          ac_cpu_pentium=yes
4821   else
4822          ac_cpu_pentium=no
# Line 4687 | Line 4945 | echo "$as_me:$LINENO: checking whether we are using gc
4945                  elif test "$cputype" = 750; then
4946  
4947  
4948 < echo "$as_me:$LINENO: checking whether we are using gcc 2.95 or later" >&5
4949 < echo $ECHO_N "checking whether we are using gcc 2.95 or later... $ECHO_C" >&6
4950 < if test "${ac_cv_prog_gcc_2_95+set}" = set; then
4948 > echo "$as_me:$LINENO: checking whether we are using g++ 2.95 or later" >&5
4949 > echo $ECHO_N "checking whether we are using g++ 2.95 or later... $ECHO_C" >&6
4950 > if test "${ac_cv_prog_gxx_2_95+set}" = set; then
4951    echo $ECHO_N "(cached) $ECHO_C" >&6
4952   else
4953  
4954 < cat > conftest.c <<EOF
4955 < #ifdef __GNUC__
4954 > cat > conftest.cpp <<EOF
4955 > #ifdef __GNUC__ && !defined (__INTEL_COMPILER)
4956   #  if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
4957       yes;
4958   #  endif
4959   #endif
4960   EOF
4961 < if { ac_try='${CC-cc} -E conftest.c'
4961 > if { ac_try='${CXX-c++} -E conftest.cpp'
4962    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4963    (eval $ac_try) 2>&5
4964    ac_status=$?
4965    echo "$as_me:$LINENO: \$? = $ac_status" >&5
4966    (exit $ac_status); }; } | egrep yes >/dev/null 2>&1; then
4967 <  ac_cv_prog_gcc_2_95=yes
4967 >  ac_cv_prog_gxx_2_95=yes
4968   else
4969 <  ac_cv_prog_gcc_2_95=no
4969 >  ac_cv_prog_gxx_2_95=no
4970   fi
4971  
4972   fi
4973 < echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_2_95" >&5
4974 < echo "${ECHO_T}$ac_cv_prog_gcc_2_95" >&6
4975 < if test "$ac_cv_prog_gcc_2_95" = yes; then
4973 > echo "$as_me:$LINENO: result: $ac_cv_prog_gxx_2_95" >&5
4974 > echo "${ECHO_T}$ac_cv_prog_gxx_2_95" >&6
4975 > if test "$ac_cv_prog_gxx_2_95" = yes; then
4976          :
4977  
4978  
# Line 4871 | Line 5129 | if test x"$F90FLAGS" = x ; then
5129    F90FLAGS=""
5130    case "${host_cpu}-${host_os}" in
5131  
5132 <  *linux*) if test "$F90" = ifc; then
5132 >  *linux*) if test "$F90" = ifc -o "$F90" = ifort; then
5133                      F90FLAGS="-O"
5134                  fi;;
5135     rs6000*-aix*)  if test "$F90" = xlf90 -o "$F90" = f90; then
# Line 4891 | Line 5149 | if test x"$F90FLAGS" = x ; then
5149                  echo "*******************************************************"
5150          fi;;
5151     *darwin*)
5152 <        if test "$F90" = f90 -o "$F90" = xlf90; then
5153 <                F90FLAGS="-O3 -qtune=auto -w"
4896 <                echo "*********************************************************"
4897 <                echo "*  You have Darwin on an unknown powerpc system.  It is *"
4898 <                echo "*  recommended that you use                             *"
4899 <                echo "*                                                       *"
4900 <                echo "*  CXXFLAGS=-O3 -qarch=ppc -qtune=xxx -qansialias -w    *"
4901 <                echo "*                                 ^^^                   *"
4902 <                echo "*  where xxx is 601, 603, 604, or whatever kind of      *"
4903 <                echo "*  PowerPC CPU you have.   For more info, man xlf.      *"
4904 <                echo "*********************************************************"
5152 >        if test "$F90" = f90 -o "$F90" = xlf90 -o "$F90" = xlf95; then
5153 >                F90FLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto"
5154          fi;;
5155    esac
5156  
# Line 4990 | Line 5239 | esac
5239   # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
5240   # AFS /usr/afsws/bin/install, which mishandles nonexistent args
5241   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
5242 + # OS/2's system install, which has a completely different semantic
5243   # ./install, which can be erroneously created by make from ./install.sh.
5244   echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
5245   echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
# Line 5006 | Line 5256 | case $as_dir/ in
5256   case $as_dir/ in
5257    ./ | .// | /cC/* | \
5258    /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
5259 +  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
5260    /usr/ucb/* ) ;;
5261    *)
5262      # OSF1 and SCO ODT 3.0 have their own names for install.
# Line 5013 | Line 5264 | case $as_dir/ in
5264      # by default.
5265      for ac_prog in ginstall scoinst install; do
5266        for ac_exec_ext in '' $ac_executable_extensions; do
5267 <        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5268 <          if test $ac_prog = install &&
5269 <            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5270 <            # AIX install.  It has an incompatible calling convention.
5271 <            :
5272 <          elif test $ac_prog = install &&
5273 <            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5274 <            # program-specific install script used by HP pwplus--don't use.
5275 <            :
5276 <          else
5277 <            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
5278 <            break 3
5279 <          fi
5280 <        fi
5267 >        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5268 >          if test $ac_prog = install &&
5269 >            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5270 >            # AIX install.  It has an incompatible calling convention.
5271 >            :
5272 >          elif test $ac_prog = install &&
5273 >            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5274 >            # program-specific install script used by HP pwplus--don't use.
5275 >            :
5276 >          else
5277 >            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
5278 >            break 3
5279 >          fi
5280 >        fi
5281        done
5282      done
5283      ;;
# Line 5069 | Line 5320 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./
5320  
5321   echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5322   echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
5323 < set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
5323 > set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
5324   if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
5325    echo $ECHO_N "(cached) $ECHO_C" >&6
5326   else
# Line 5277 | Line 5528 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5528   _ACEOF
5529   rm -f conftest.$ac_objext conftest$ac_exeext
5530   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5531 <  (eval $ac_link) 2>&5
5531 >  (eval $ac_link) 2>conftest.er1
5532    ac_status=$?
5533 +  grep -v '^ *+' conftest.er1 >conftest.err
5534 +  rm -f conftest.er1
5535 +  cat conftest.err >&5
5536    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5537    (exit $ac_status); } &&
5538 <         { ac_try='test -s conftest$ac_exeext'
5538 >         { ac_try='test -z "$ac_f90_werror_flag"
5539 >                         || test ! -s conftest.err'
5540    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5541    (eval $ac_try) 2>&5
5542    ac_status=$?
5543    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5544 +  (exit $ac_status); }; } &&
5545 +         { ac_try='test -s conftest$ac_exeext'
5546 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5547 +  (eval $ac_try) 2>&5
5548 +  ac_status=$?
5549 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5550    (exit $ac_status); }; }; then
5551    ac_cv_lib_fl_yywrap=yes
5552   else
# Line 5294 | Line 5555 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
5555  
5556   ac_cv_lib_fl_yywrap=no
5557   fi
5558 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5558 > rm -f conftest.err conftest.$ac_objext \
5559 >      conftest$ac_exeext conftest.$ac_ext
5560   LIBS=$ac_check_lib_save_LIBS
5561   fi
5562   echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
# Line 5319 | Line 5581 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5581   _ACEOF
5582   rm -f conftest.$ac_objext conftest$ac_exeext
5583   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5584 <  (eval $ac_link) 2>&5
5584 >  (eval $ac_link) 2>conftest.er1
5585    ac_status=$?
5586 +  grep -v '^ *+' conftest.er1 >conftest.err
5587 +  rm -f conftest.er1
5588 +  cat conftest.err >&5
5589    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5590    (exit $ac_status); } &&
5591 <         { ac_try='test -s conftest$ac_exeext'
5591 >         { ac_try='test -z "$ac_f90_werror_flag"
5592 >                         || test ! -s conftest.err'
5593    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5594    (eval $ac_try) 2>&5
5595    ac_status=$?
5596    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5597 +  (exit $ac_status); }; } &&
5598 +         { ac_try='test -s conftest$ac_exeext'
5599 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5600 +  (eval $ac_try) 2>&5
5601 +  ac_status=$?
5602 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5603    (exit $ac_status); }; }; then
5604    ac_cv_lib_l_yywrap=yes
5605   else
# Line 5336 | Line 5608 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
5608  
5609   ac_cv_lib_l_yywrap=no
5610   fi
5611 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5611 > rm -f conftest.err conftest.$ac_objext \
5612 >      conftest$ac_exeext conftest.$ac_ext
5613   LIBS=$ac_check_lib_save_LIBS
5614   fi
5615   echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
# Line 5398 | Line 5671 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5671   _ACEOF
5672   rm -f conftest.$ac_objext conftest$ac_exeext
5673   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5674 <  (eval $ac_link) 2>&5
5674 >  (eval $ac_link) 2>conftest.er1
5675    ac_status=$?
5676 +  grep -v '^ *+' conftest.er1 >conftest.err
5677 +  rm -f conftest.er1
5678 +  cat conftest.err >&5
5679    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5680    (exit $ac_status); } &&
5681 <         { ac_try='test -s conftest$ac_exeext'
5681 >         { ac_try='test -z "$ac_f90_werror_flag"
5682 >                         || test ! -s conftest.err'
5683    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5684    (eval $ac_try) 2>&5
5685    ac_status=$?
5686    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5687 +  (exit $ac_status); }; } &&
5688 +         { ac_try='test -s conftest$ac_exeext'
5689 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5690 +  (eval $ac_try) 2>&5
5691 +  ac_status=$?
5692 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5693    (exit $ac_status); }; }; then
5694    ac_cv_prog_lex_yytext_pointer=yes
5695   else
# Line 5414 | Line 5697 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
5697   sed 's/^/| /' conftest.$ac_ext >&5
5698  
5699   fi
5700 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5700 > rm -f conftest.err conftest.$ac_objext \
5701 >      conftest$ac_exeext conftest.$ac_ext
5702   LIBS=$ac_save_LIBS
5703   rm -f "${LEX_OUTPUT_ROOT}.c"
5704  
# Line 5498 | Line 5782 | _ACEOF
5782        # `set' does not quote correctly, so add quotes (double-quote
5783        # substitution turns \\\\ into \\, and sed turns \\ into \).
5784        sed -n \
5785 <        "s/'/'\\\\''/g;
5786 <          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
5785 >        "s/'/'\\\\''/g;
5786 >          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
5787        ;;
5788      *)
5789        # `set' quotes correctly as required by POSIX, so do not add quotes.
5790        sed -n \
5791 <        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
5791 >        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
5792        ;;
5793      esac;
5794   } |
# Line 5527 | Line 5811 | echo "$as_me:$LINENO: checking for mpi-directory" >&5
5811    exit 1
5812   fi
5813  
5530 echo "$as_me:$LINENO: checking for mpi-directory" >&5
5531 echo $ECHO_N "checking for mpi-directory... $ECHO_C" >&6
5814  
5533 # Check whether --with-mpi_dir or --without-mpi_dir was given.
5534 if test "${with_mpi_dir+set}" = set; then
5535  withval="$with_mpi_dir"
5536  MPI_DIR="$withval"
5537 else
5538  MPI_DIR="/usr/local"
5539 fi;
5540 echo "$as_me:$LINENO: result: $MPI_DIR" >&5
5541 echo "${ECHO_T}$MPI_DIR" >&6
5815  
5816 <
5817 < echo "$as_me:$LINENO: checking for mpi-lib-directory" >&5
5818 < echo $ECHO_N "checking for mpi-lib-directory... $ECHO_C" >&6
5819 <
5547 < # Check whether --with-mpi_libdir or --without-mpi_libdir was given.
5548 < if test "${with_mpi_libdir+set}" = set; then
5549 <  withval="$with_mpi_libdir"
5550 <  MPI_LIBDIR="$withval"
5816 > # Check whether --with-mpi or --without-mpi was given.
5817 > if test "${with_mpi+set}" = set; then
5818 >  withval="$with_mpi"
5819 >  with_mpi=$withval
5820   else
5821 <  MPI_LIBDIR="$MPI_DIR/lib"
5821 >  with_mpi="no"
5822   fi;
5554 echo "$as_me:$LINENO: result: $MPI_LIBDIR" >&5
5555 echo "${ECHO_T}$MPI_LIBDIR" >&6
5823  
5824 <
5825 < echo "$as_me:$LINENO: checking for mpi-inc-directory" >&5
5826 < echo $ECHO_N "checking for mpi-inc-directory... $ECHO_C" >&6
5827 <
5561 < # Check whether --with-mpi_inc or --without-mpi_inc was given.
5562 < if test "${with_mpi_inc+set}" = set; then
5563 <  withval="$with_mpi_inc"
5564 <  MPI_INC="$withval"
5565 < else
5566 <  MPI_INC="$MPI_DIR/include"
5567 < fi;
5568 < echo "$as_me:$LINENO: result: $MPI_INC" >&5
5569 < echo "${ECHO_T}$MPI_INC" >&6
5570 <
5571 <
5572 <
5573 < echo "$as_me:$LINENO: checking for MPI library" >&5
5574 < echo $ECHO_N "checking for MPI library... $ECHO_C" >&6
5575 < MPI_LIB=""
5576 < case "$host" in
5577 <  *-ibm-aix*)
5578 <    echo "$as_me:$LINENO: checking whether to use signal-based MPI library" >&5
5579 < echo $ECHO_N "checking whether to use signal-based MPI library... $ECHO_C" >&6
5580 <    echo "$as_me:$LINENO: result: $PACX_SIGNAL" >&5
5581 < echo "${ECHO_T}$PACX_SIGNAL" >&6
5582 <    if test "x$PACX_SIGNAL" = "xyes" ; then
5583 <      if test -f "$MPI_LIBDIR/libmpi.a" ; then
5584 <        MPI_LIB="-lmpi"
5585 <      elif test -f "$MPI_LIBDIR/libmpi.so" ; then
5586 <        MPI_LIB="-lmpi"
5587 <      elif test -f "$MPI_LIBDIR/libmpich.a" ; then
5588 <        MPI_LIB="-lmpich"
5589 <      else
5590 <        { { echo "$as_me:$LINENO: error: neither libmpi nor libmpich found; check path for MPI package first..." >&5
5591 < echo "$as_me: error: neither libmpi nor libmpich found; check path for MPI package first..." >&2;}
5592 <   { (exit 1); exit 1; }; }
5593 <      fi
5594 <    else
5595 <      if test -f "$MPI_LIBDIR/libmpi_r.a" ; then
5596 <         MPI_LIB="-lmpi_r"
5597 <      else
5598 <         { { echo "$as_me:$LINENO: error: libmpi_r not found; check path for MPI package..." >&5
5599 < echo "$as_me: error: libmpi_r not found; check path for MPI package..." >&2;}
5600 <   { (exit 1); exit 1; }; }
5601 <      fi
5602 <    fi
5603 <    echo "$as_me:$LINENO: result: found $MPI_LIB" >&5
5604 < echo "${ECHO_T}found $MPI_LIB" >&6
5605 <  ;;
5606 <  *)                             if test -f "$MPI_LIBDIR/libmpich.a" ; then
5607 <      MPI_LIB="-lmpich"
5608 <    elif test -f "$MPI_LIBDIR/libmpi.so" ; then
5609 <      MPI_LIB="-lmpi"
5610 <    elif test -f "$MPI_LIBDIR/libmpi.a" ; then
5611 <      MPI_LIB="-lmpi"
5612 <    else
5613 <      { { echo "$as_me:$LINENO: error: neither libmpi nor libmpich found; check path for MPI package first..." >&5
5614 < echo "$as_me: error: neither libmpi nor libmpich found; check path for MPI package first..." >&2;}
5615 <   { (exit 1); exit 1; }; }
5616 <    fi
5617 <    echo "$as_me:$LINENO: result: found $MPI_LIB" >&5
5618 < echo "${ECHO_T}found $MPI_LIB" >&6
5619 <  ;;
5824 > case "x$with_mpi" in
5825 >        xyes | "x")  USE_MPI=yes;;
5826 >        xno) USE_MPI=no ;;
5827 >        *) MPI="$with_mpi"; USE_MPI=yes ;;
5828   esac
5829 + if test "$USE_MPI" = "yes" -a -z "$with_mpi"; then
5830 +        MPI="/usr/local"
5831 + fi
5832 + if test "$USE_MPI" = "yes"; then
5833 +        echo "MPI = $MPI"
5834  
5835  
5836 + # Set variables...
5837 + MPI_LIB_DIR="$MPI/lib"
5838 + MPI_INC_DIR="$MPI/include"
5839  
5840  
5841  
5842 <
5843 <
5844 <        for ac_prog in mpif90 hf90 mpxlf90 mpf90 mpxlf95 mpxlf_r
5845 < do
5846 <  # Extract the first word of "$ac_prog", so it can be a program name with args.
5847 < set dummy $ac_prog; ac_word=$2
5848 < echo "$as_me:$LINENO: checking for $ac_word" >&5
5849 < echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5634 < if test "${ac_cv_prog_MPIF90+set}" = set; then
5635 <  echo $ECHO_N "(cached) $ECHO_C" >&6
5842 > echo "$as_me:$LINENO: checking for mpi.h" >&5
5843 > echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
5844 > have_mpi_h=0
5845 > echo '#include <mpi.h>' > conftest.cc
5846 > if test -z "`${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1`"; then
5847 >        echo "$as_me:$LINENO: result: yes" >&5
5848 > echo "${ECHO_T}yes" >&6
5849 >        have_mpi_h=1
5850   else
5851 <  if test -n "$MPIF90"; then
5852 <  ac_cv_prog_MPIF90="$MPIF90" # Let the user override the test.
5853 < else
5640 < as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5641 < for as_dir in $PATH
5642 < do
5643 <  IFS=$as_save_IFS
5644 <  test -z "$as_dir" && as_dir=.
5645 <  for ac_exec_ext in '' $ac_executable_extensions; do
5646 <  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5647 <    ac_cv_prog_MPIF90="$ac_prog"
5648 <    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5649 <    break 2
5650 <  fi
5651 < done
5652 < done
5653 <
5851 >        echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5
5852 > echo "${ECHO_T}no! Check MPI include paths" >&6
5853 >        USE_MPI="no"
5854   fi
5855 < fi
5856 < MPIF90=$ac_cv_prog_MPIF90
5657 < if test -n "$MPIF90"; then
5658 <  echo "$as_me:$LINENO: result: $MPIF90" >&5
5659 < echo "${ECHO_T}$MPIF90" >&6
5660 < else
5661 <  echo "$as_me:$LINENO: result: no" >&5
5662 < echo "${ECHO_T}no" >&6
5663 < fi
5855 > rm -f conftest*
5856 > if test "$have_mpi_h" = 1; then
5857  
5858 <  test -n "$MPIF90" && break
5859 < done
5860 < test -n "$MPIF90" || MPIF90="$F90"
5858 > cat >>confdefs.h <<\_ACEOF
5859 > #define HAVE_MPI_H 1
5860 > _ACEOF
5861  
5862 <        acx_mpi_save_F90="$F90"
5670 <        F90="$MPIF90"
5862 > fi
5863  
5864 <
5865 <
5866 < if test x = x"$MPILIBS"; then
5867 <        echo "$as_me:$LINENO: checking for MPI_Init" >&5
5868 < echo $ECHO_N "checking for MPI_Init... $ECHO_C" >&6
5677 <                        cat >conftest.$ac_ext <<_ACEOF
5678 <
5864 > echo "$as_me:$LINENO: checking whether mpif.h is usable" >&5
5865 > echo $ECHO_N "checking whether mpif.h is usable... $ECHO_C" >&6
5866 > have_mpif_h=0
5867 > rm -f conftest*
5868 > cat >conftest.f90 <<EOF
5869   program main
5870 +   include 'mpif.h'
5871 + end
5872 + EOF
5873 + if $F90 -I$MPI_INC_DIR -c conftest.f90 > conftest.out 2>&1 ; then
5874 +        echo "$as_me:$LINENO: result: yes" >&5
5875 + echo "${ECHO_T}yes" >&6
5876 +        MPI_F90_INC="$MPI_INC_DIR"
5877 +        have_mpif_h=1
5878 + else
5879 +        if test -s conftest.out ; then
5880 +                cat conftest.out >> config.log
5881 +        fi
5882 +        echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5
5883 + echo "${ECHO_T}no! Check MPI include paths" >&6
5884 +        USE_MPI="no"
5885 + fi
5886 + rm -f conftest*
5887  
5888 <      call MPI_Init
5682 < end program main
5888 > if test "$have_mpif_h" = 1; then
5889  
5890 + cat >>confdefs.h <<\_ACEOF
5891 + #define HAVE_MPIF_H 1
5892   _ACEOF
5685 rm -f conftest.$ac_objext conftest$ac_exeext
5686 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5687  (eval $ac_link) 2>&5
5688  ac_status=$?
5689  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5690  (exit $ac_status); } &&
5691         { ac_try='test -s conftest$ac_exeext'
5692  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5693  (eval $ac_try) 2>&5
5694  ac_status=$?
5695  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5696  (exit $ac_status); }; }; then
5697  MPILIBS=" "
5698                                echo "$as_me:$LINENO: result: yes" >&5
5699 echo "${ECHO_T}yes" >&6
5700 else
5701  echo "$as_me: failed program was:" >&5
5702 sed 's/^/| /' conftest.$ac_ext >&5
5893  
5704 echo "$as_me:$LINENO: result: no" >&5
5705 echo "${ECHO_T}no" >&6
5894   fi
5895 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5896 < fi
5897 < if test x = x"$MPILIBS"; then
5895 >
5896 > ac_ext=c
5897 > ac_cpp='$CPP $CPPFLAGS'
5898 > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5899 > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5900 > ac_compiler_gnu=$ac_cv_c_compiler_gnu
5901 >
5902 > ac_save_LDFLAGS=$LDFLAGS
5903 > LDFLAGS="${LDFLAGS} -L${MPI_LIB_DIR} "
5904 >
5905 > if test x = x"$MPI_LIB"; then
5906          echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
5907   echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
5908   if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
# Line 5715 | Line 5911 | cat >conftest.$ac_ext <<_ACEOF
5911    ac_check_lib_save_LIBS=$LIBS
5912   LIBS="-lmpi  $LIBS"
5913   cat >conftest.$ac_ext <<_ACEOF
5914 + /* confdefs.h.  */
5915 + _ACEOF
5916 + cat confdefs.h >>conftest.$ac_ext
5917 + cat >>conftest.$ac_ext <<_ACEOF
5918 + /* end confdefs.h.  */
5919  
5920 < program main
5921 <
5922 < call MPI_Init
5923 < end program main
5924 <
5920 > /* Override any gcc2 internal prototype to avoid an error.  */
5921 > #ifdef __cplusplus
5922 > extern "C"
5923 > #endif
5924 > /* We use char because int might match the return type of a gcc2
5925 >   builtin and then its argument prototype would still apply.  */
5926 > char MPI_Init ();
5927 > int
5928 > main ()
5929 > {
5930 > MPI_Init ();
5931 >  ;
5932 >  return 0;
5933 > }
5934   _ACEOF
5935   rm -f conftest.$ac_objext conftest$ac_exeext
5936   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5937 <  (eval $ac_link) 2>&5
5937 >  (eval $ac_link) 2>conftest.er1
5938    ac_status=$?
5939 +  grep -v '^ *+' conftest.er1 >conftest.err
5940 +  rm -f conftest.er1
5941 +  cat conftest.err >&5
5942    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5943    (exit $ac_status); } &&
5944 <         { ac_try='test -s conftest$ac_exeext'
5944 >         { ac_try='test -z "$ac_c_werror_flag"
5945 >                         || test ! -s conftest.err'
5946    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5947    (eval $ac_try) 2>&5
5948    ac_status=$?
5949    echo "$as_me:$LINENO: \$? = $ac_status" >&5
5950 +  (exit $ac_status); }; } &&
5951 +         { ac_try='test -s conftest$ac_exeext'
5952 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5953 +  (eval $ac_try) 2>&5
5954 +  ac_status=$?
5955 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5956    (exit $ac_status); }; }; then
5957    ac_cv_lib_mpi_MPI_Init=yes
5958   else
# Line 5741 | Line 5961 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
5961  
5962   ac_cv_lib_mpi_MPI_Init=no
5963   fi
5964 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5964 > rm -f conftest.err conftest.$ac_objext \
5965 >      conftest$ac_exeext conftest.$ac_ext
5966   LIBS=$ac_check_lib_save_LIBS
5967   fi
5968   echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
5969   echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
5970   if test $ac_cv_lib_mpi_MPI_Init = yes; then
5971 <  MPILIBS="-lmpi"
5971 >  MPI_LIB="-lmpi"
5972   fi
5973  
5974   fi
5975 < if test x = x"$MPILIBS"; then
5975 > if test x = x"$MPI_LIB"; then
5976          echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
5977   echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
5978   if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
# Line 5760 | Line 5981 | cat >conftest.$ac_ext <<_ACEOF
5981    ac_check_lib_save_LIBS=$LIBS
5982   LIBS="-lmpich  $LIBS"
5983   cat >conftest.$ac_ext <<_ACEOF
5984 + /* confdefs.h.  */
5985 + _ACEOF
5986 + cat confdefs.h >>conftest.$ac_ext
5987 + cat >>conftest.$ac_ext <<_ACEOF
5988 + /* end confdefs.h.  */
5989  
5990 < program main
5991 <
5992 < call MPI_Init
5993 < end program main
5994 <
5990 > /* Override any gcc2 internal prototype to avoid an error.  */
5991 > #ifdef __cplusplus
5992 > extern "C"
5993 > #endif
5994 > /* We use char because int might match the return type of a gcc2
5995 >   builtin and then its argument prototype would still apply.  */
5996 > char MPI_Init ();
5997 > int
5998 > main ()
5999 > {
6000 > MPI_Init ();
6001 >  ;
6002 >  return 0;
6003 > }
6004   _ACEOF
6005   rm -f conftest.$ac_objext conftest$ac_exeext
6006   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6007 <  (eval $ac_link) 2>&5
6007 >  (eval $ac_link) 2>conftest.er1
6008    ac_status=$?
6009 +  grep -v '^ *+' conftest.er1 >conftest.err
6010 +  rm -f conftest.er1
6011 +  cat conftest.err >&5
6012    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6013    (exit $ac_status); } &&
6014 <         { ac_try='test -s conftest$ac_exeext'
6014 >         { ac_try='test -z "$ac_c_werror_flag"
6015 >                         || test ! -s conftest.err'
6016    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6017    (eval $ac_try) 2>&5
6018    ac_status=$?
6019    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6020 +  (exit $ac_status); }; } &&
6021 +         { ac_try='test -s conftest$ac_exeext'
6022 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6023 +  (eval $ac_try) 2>&5
6024 +  ac_status=$?
6025 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6026    (exit $ac_status); }; }; then
6027    ac_cv_lib_mpich_MPI_Init=yes
6028   else
# Line 5786 | Line 6031 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
6031  
6032   ac_cv_lib_mpich_MPI_Init=no
6033   fi
6034 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6034 > rm -f conftest.err conftest.$ac_objext \
6035 >      conftest$ac_exeext conftest.$ac_ext
6036   LIBS=$ac_check_lib_save_LIBS
6037   fi
6038   echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
6039   echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
6040   if test $ac_cv_lib_mpich_MPI_Init = yes; then
6041 <  MPILIBS="-lmpich"
6041 >  MPI_LIB="-lmpich"
6042   fi
6043  
6044   fi
6045 <
6046 <
6047 <
6048 < F90="$acx_mpi_save_F90"
6049 <
6050 <
5805 <
5806 < # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
5807 < if test x = x"$MPILIBS"; then
5808 <
5809 <        :
6045 > $as_unset ac_cv_lib_mpi_MPI_Init
6046 > if test x = x"$MPI_LIB"; then
6047 >        echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
6048 > echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
6049 > if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
6050 >  echo $ECHO_N "(cached) $ECHO_C" >&6
6051   else
6052 <
6053 < cat >>confdefs.h <<\_ACEOF
6054 < #define HAVE_MPI 1
6052 >  ac_check_lib_save_LIBS=$LIBS
6053 > LIBS="-lmpi "-llam" $LIBS"
6054 > cat >conftest.$ac_ext <<_ACEOF
6055 > /* confdefs.h.  */
6056   _ACEOF
6057 + cat confdefs.h >>conftest.$ac_ext
6058 + cat >>conftest.$ac_ext <<_ACEOF
6059 + /* end confdefs.h.  */
6060  
6061 <        :
6062 < fi
6063 <
6064 <
6065 <
6066 <
6067 <
6068 < # Check whether --with-mpi_f90_mods or --without-mpi_f90_mods was given.
6069 < if test "${with_mpi_f90_mods+set}" = set; then
6070 <  withval="$with_mpi_f90_mods"
6071 <  mpi_f90_mods="$withval"
6072 < else
6073 <  mpi_f90_mods="/usr/local/include/f90choice"
6074 < fi;
5830 <
5831 <  echo "$as_me:$LINENO: checking for MPI F90 modules" >&5
5832 < echo $ECHO_N "checking for MPI F90 modules... $ECHO_C" >&6
5833 <
5834 <
5835 <  ac_ext=f90
5836 < ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
5837 < ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5838 < ac_compiler_gnu=$ac_cv_f90_compiler_gnu
5839 <
5840 <  ac_save_F90FLAGS=$F90FLAGS
5841 <
5842 <  if test "$mpi_f90_mods"; then
5843 <  F90FLAGS="${F90FLAGS} ${MODDIRFLAG}${mpi_f90_mods}"
5844 < fi
5845 <
5846 <    cat >conftest.$ac_ext <<_ACEOF
5847 <
5848 <
5849 < program main
5850 <
5851 < use mpi
5852 < integer :: ierr
5853 < call MPI_Init(ierr)
5854 <
5855 <
5856 < end program main
5857 <
6061 > /* Override any gcc2 internal prototype to avoid an error.  */
6062 > #ifdef __cplusplus
6063 > extern "C"
6064 > #endif
6065 > /* We use char because int might match the return type of a gcc2
6066 >   builtin and then its argument prototype would still apply.  */
6067 > char MPI_Init ();
6068 > int
6069 > main ()
6070 > {
6071 > MPI_Init ();
6072 >  ;
6073 >  return 0;
6074 > }
6075   _ACEOF
6076 < rm -f conftest.$ac_objext
6077 < if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6078 <  (eval $ac_compile) 2>&5
6076 > rm -f conftest.$ac_objext conftest$ac_exeext
6077 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6078 >  (eval $ac_link) 2>conftest.er1
6079    ac_status=$?
6080 +  grep -v '^ *+' conftest.er1 >conftest.err
6081 +  rm -f conftest.er1
6082 +  cat conftest.err >&5
6083    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6084    (exit $ac_status); } &&
6085 <         { ac_try='test -s conftest.$ac_objext'
6085 >         { ac_try='test -z "$ac_c_werror_flag"
6086 >                         || test ! -s conftest.err'
6087    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6088    (eval $ac_try) 2>&5
6089    ac_status=$?
6090    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6091 <  (exit $ac_status); }; }; then
6092 <  HAVE_MPI_MOD=1
5872 < else
5873 <  echo "$as_me: failed program was:" >&5
5874 < sed 's/^/| /' conftest.$ac_ext >&5
5875 <
5876 < HAVE_MPI_MOD=0
5877 < fi
5878 < rm -f conftest.$ac_objext conftest.$ac_ext
5879 <
5880 <  F90FLAGS=$ac_save_F90FLAGS
5881 <  ac_ext=f90
5882 < ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
5883 < ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5884 < ac_compiler_gnu=$ac_cv_f90_compiler_gnu
5885 <
5886 <
5887 <  if test "$HAVE_MPI_MOD" = 1; then
5888 <    echo "$as_me:$LINENO: result: yes" >&5
5889 < echo "${ECHO_T}yes" >&6
5890 <
5891 < cat >>confdefs.h <<\_ACEOF
5892 < #define MPI_MOD 1
5893 < _ACEOF
5894 <
5895 <    MPI_F90_MODS="${mpi_f90_mods}"
5896 <
5897 <    # The library name:
5898 <    if test -z "$MPI_LIB" ; then
5899 <       MPI_LIBNAME=-lmpich
5900 <    else
5901 <       MPI_LIBNAME="$MPI_LIB"
5902 <    fi
5903 <    if test -z "$MPIMODLIBNAME" ; then
5904 <       MPIMODLIBNAME="${MPI_LIBNAME}f90"
5905 <    fi
5906 <
5907 <  else
5908 <    echo "$as_me:$LINENO: result: no" >&5
5909 < echo "${ECHO_T}no" >&6
5910 <    { echo "$as_me:$LINENO: WARNING: Couldn't locate MPI F90 Modules" >&5
5911 < echo "$as_me: WARNING: Couldn't locate MPI F90 Modules" >&2;}
5912 <  fi
5913 <
5914 <
5915 <
5916 < if test "$HAVE_MPI_MOD" = 1; then
5917 <
5918 < cat >>confdefs.h <<\_ACEOF
5919 < #define MPI_MOD 1
5920 < _ACEOF
5921 <
5922 < else
5923 <        ac_ext=f90
5924 < ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
5925 < ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5926 < ac_compiler_gnu=$ac_cv_f90_compiler_gnu
5927 <
5928 <        echo "$as_me:$LINENO: checking for egrep" >&5
5929 < echo $ECHO_N "checking for egrep... $ECHO_C" >&6
5930 < if test "${ac_cv_prog_egrep+set}" = set; then
5931 <  echo $ECHO_N "(cached) $ECHO_C" >&6
5932 < else
5933 <  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
5934 <    then ac_cv_prog_egrep='grep -E'
5935 <    else ac_cv_prog_egrep='egrep'
5936 <    fi
5937 < fi
5938 < echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
5939 < echo "${ECHO_T}$ac_cv_prog_egrep" >&6
5940 < EGREP=$ac_cv_prog_egrep
5941 <
5942 <
5943 < echo "$as_me:$LINENO: checking for ANSI C header files" >&5
5944 < echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
5945 < if test "${ac_cv_header_stdc+set}" = set; then
5946 <  echo $ECHO_N "(cached) $ECHO_C" >&6
5947 < else
5948 <  cat >conftest.$ac_ext <<_ACEOF
5949 <
5950 < program main
5951 < #include <stdlib.h>
5952 < #include <stdarg.h>
5953 < #include <string.h>
5954 < #include <float.h>
5955 <
5956 <
5957 < end program main
5958 <
5959 < _ACEOF
5960 < rm -f conftest.$ac_objext
5961 < if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5962 <  (eval $ac_compile) 2>&5
5963 <  ac_status=$?
5964 <  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5965 <  (exit $ac_status); } &&
5966 <         { ac_try='test -s conftest.$ac_objext'
6091 >  (exit $ac_status); }; } &&
6092 >         { ac_try='test -s conftest$ac_exeext'
6093    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6094    (eval $ac_try) 2>&5
6095    ac_status=$?
6096    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6097    (exit $ac_status); }; }; then
6098 <  ac_cv_header_stdc=yes
6098 >  ac_cv_lib_mpi_MPI_Init=yes
6099   else
6100    echo "$as_me: failed program was:" >&5
6101   sed 's/^/| /' conftest.$ac_ext >&5
6102  
6103 < ac_cv_header_stdc=no
6103 > ac_cv_lib_mpi_MPI_Init=no
6104   fi
6105 < rm -f conftest.$ac_objext conftest.$ac_ext
6106 <
6107 < if test $ac_cv_header_stdc = yes; then
5982 <  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
5983 <  cat >conftest.$ac_ext <<_ACEOF
5984 < #include <string.h>
5985 <
5986 < _ACEOF
5987 < if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
5988 <  $EGREP "memchr" >/dev/null 2>&1; then
5989 <  :
5990 < else
5991 <  ac_cv_header_stdc=no
6105 > rm -f conftest.err conftest.$ac_objext \
6106 >      conftest$ac_exeext conftest.$ac_ext
6107 > LIBS=$ac_check_lib_save_LIBS
6108   fi
6109 < rm -f conftest*
6110 <
6109 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
6110 > echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
6111 > if test $ac_cv_lib_mpi_MPI_Init = yes; then
6112 >  MPI_LIB="-lmpi -llam"
6113   fi
6114  
5997 if test $ac_cv_header_stdc = yes; then
5998  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
5999  cat >conftest.$ac_ext <<_ACEOF
6000 #include <stdlib.h>
6001
6002 _ACEOF
6003 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
6004  $EGREP "free" >/dev/null 2>&1; then
6005  :
6006 else
6007  ac_cv_header_stdc=no
6115   fi
6009 rm -f conftest*
6116  
6117 < fi
6118 <
6119 < if test $ac_cv_header_stdc = yes; then
6120 <  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
6121 <  if test "$cross_compiling" = yes; then
6122 <  :
6117 > $as_unset ac_cv_lib_mpi_MPI_Init
6118 > if test x = x"$MPI_LIB"; then
6119 > echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
6120 > echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
6121 > if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
6122 >  echo $ECHO_N "(cached) $ECHO_C" >&6
6123   else
6124 <  cat >conftest.$ac_ext <<_ACEOF
6125 < #include <ctype.h>
6126 < #if ((' ' & 0x0FF) == 0x020)
6127 < # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
6128 < # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
6129 < #else
6130 < # define ISLOWER(c) \
6131 <                   (('a' <= (c) && (c) <= 'i') \
6026 <                     || ('j' <= (c) && (c) <= 'r') \
6027 <                     || ('s' <= (c) && (c) <= 'z'))
6028 < # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
6029 < #endif
6124 >  ac_check_lib_save_LIBS=$LIBS
6125 > LIBS="-lmpi -llam -lpthread $LIBS"
6126 > cat >conftest.$ac_ext <<_ACEOF
6127 > /* confdefs.h.  */
6128 > _ACEOF
6129 > cat confdefs.h >>conftest.$ac_ext
6130 > cat >>conftest.$ac_ext <<_ACEOF
6131 > /* end confdefs.h.  */
6132  
6133 < #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
6133 > /* Override any gcc2 internal prototype to avoid an error.  */
6134 > #ifdef __cplusplus
6135 > extern "C"
6136 > #endif
6137 > /* We use char because int might match the return type of a gcc2
6138 >   builtin and then its argument prototype would still apply.  */
6139 > char MPI_Init ();
6140   int
6141   main ()
6142   {
6143 <  int i;
6144 <  for (i = 0; i < 256; i++)
6145 <    if (XOR (islower (i), ISLOWER (i))
6038 <        || toupper (i) != TOUPPER (i))
6039 <      exit(2);
6040 <  exit (0);
6143 > MPI_Init ();
6144 >  ;
6145 >  return 0;
6146   }
6147   _ACEOF
6148 < rm -f conftest$ac_exeext
6148 > rm -f conftest.$ac_objext conftest$ac_exeext
6149   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6150 <  (eval $ac_link) 2>&5
6150 >  (eval $ac_link) 2>conftest.er1
6151    ac_status=$?
6152 +  grep -v '^ *+' conftest.er1 >conftest.err
6153 +  rm -f conftest.er1
6154 +  cat conftest.err >&5
6155    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6156 <  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6156 >  (exit $ac_status); } &&
6157 >         { ac_try='test -z "$ac_c_werror_flag"
6158 >                         || test ! -s conftest.err'
6159    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6160    (eval $ac_try) 2>&5
6161    ac_status=$?
6162    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6163 <  (exit $ac_status); }; }; then
6164 <  :
6055 < else
6056 <  echo "$as_me: program exited with status $ac_status" >&5
6057 < echo "$as_me: failed program was:" >&5
6058 < sed 's/^/| /' conftest.$ac_ext >&5
6059 <
6060 < ( exit $ac_status )
6061 < ac_cv_header_stdc=no
6062 < fi
6063 < rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6064 < fi
6065 < fi
6066 < fi
6067 < echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
6068 < echo "${ECHO_T}$ac_cv_header_stdc" >&6
6069 < if test $ac_cv_header_stdc = yes; then
6070 <
6071 < cat >>confdefs.h <<\_ACEOF
6072 < #define STDC_HEADERS 1
6073 < _ACEOF
6074 <
6075 < fi
6076 <
6077 < # On IRIX 5.3, sys/types and inttypes.h are conflicting.
6078 <
6079 <
6080 <
6081 <
6082 <
6083 <
6084 <
6085 <
6086 <
6087 < for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
6088 <                  inttypes.h stdint.h unistd.h
6089 < do
6090 < as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6091 < echo "$as_me:$LINENO: checking for $ac_header" >&5
6092 < echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6093 < if eval "test \"\${$as_ac_Header+set}\" = set"; then
6094 <  echo $ECHO_N "(cached) $ECHO_C" >&6
6095 < else
6096 <  cat >conftest.$ac_ext <<_ACEOF
6097 < $ac_includes_default
6098 <
6099 < #include <$ac_header>
6100 < _ACEOF
6101 < rm -f conftest.$ac_objext
6102 < if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6103 <  (eval $ac_compile) 2>&5
6104 <  ac_status=$?
6105 <  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6106 <  (exit $ac_status); } &&
6107 <         { ac_try='test -s conftest.$ac_objext'
6163 >  (exit $ac_status); }; } &&
6164 >         { ac_try='test -s conftest$ac_exeext'
6165    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6166    (eval $ac_try) 2>&5
6167    ac_status=$?
6168    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6169    (exit $ac_status); }; }; then
6170 <  eval "$as_ac_Header=yes"
6170 >  ac_cv_lib_mpi_MPI_Init=yes
6171   else
6172    echo "$as_me: failed program was:" >&5
6173   sed 's/^/| /' conftest.$ac_ext >&5
6174  
6175 < eval "$as_ac_Header=no"
6175 > ac_cv_lib_mpi_MPI_Init=no
6176   fi
6177 < rm -f conftest.$ac_objext conftest.$ac_ext
6177 > rm -f conftest.err conftest.$ac_objext \
6178 >      conftest$ac_exeext conftest.$ac_ext
6179 > LIBS=$ac_check_lib_save_LIBS
6180   fi
6181 < echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6182 < echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6183 < if test `eval echo '${'$as_ac_Header'}'` = yes; then
6184 <  cat >>confdefs.h <<_ACEOF
6185 < #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
6127 < _ACEOF
6181 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
6182 > echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
6183 > if test $ac_cv_lib_mpi_MPI_Init = yes; then
6184 >  MPI_LIB="-lmpi -llam -lpthread"
6185 > else
6186  
6187 +             { { echo "$as_me:$LINENO: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&5
6188 + echo "$as_me: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&2;}
6189 +   { (exit 1); exit 1; }; }
6190 +             USE_MPI="no"
6191 +
6192   fi
6193  
6194 < done
6194 > fi
6195  
6196  
6197  
6198 < for ac_header in mpif.h
6199 < do
6200 < as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6201 < if eval "test \"\${$as_ac_Header+set}\" = set"; then
6202 <  echo "$as_me:$LINENO: checking for $ac_header" >&5
6203 < echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6204 < if eval "test \"\${$as_ac_Header+set}\" = set"; then
6142 <  echo $ECHO_N "(cached) $ECHO_C" >&6
6143 < fi
6144 < echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6145 < echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6198 > echo "$as_me:$LINENO: checking for MPI Fortran library" >&5
6199 > echo $ECHO_N "checking for MPI Fortran library... $ECHO_C" >&6
6200 > MPI_F90_LIB=""
6201 > if test -f "$MPI_LIB_DIR/libfmpich.a" ; then
6202 >        MPI_F90_LIB="-lfmpich"
6203 > elif test -f "$MPI_LIB_DIR/liblamf77mpi.a" ; then
6204 >        MPI_F90_LIB="-llamf77mpi"
6205   else
6206 <  # Is the header compilable?
6148 < echo "$as_me:$LINENO: checking $ac_header usability" >&5
6149 < echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
6150 < cat >conftest.$ac_ext <<_ACEOF
6151 < $ac_includes_default
6152 < #include <$ac_header>
6153 < _ACEOF
6154 < rm -f conftest.$ac_objext
6155 < if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6156 <  (eval $ac_compile) 2>&5
6157 <  ac_status=$?
6158 <  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6159 <  (exit $ac_status); } &&
6160 <         { ac_try='test -s conftest.$ac_objext'
6161 <  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6162 <  (eval $ac_try) 2>&5
6163 <  ac_status=$?
6164 <  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6165 <  (exit $ac_status); }; }; then
6166 <  ac_header_compiler=yes
6167 < else
6168 <  echo "$as_me: failed program was:" >&5
6169 < sed 's/^/| /' conftest.$ac_ext >&5
6170 <
6171 < ac_header_compiler=no
6206 >                        MPI_F90_LIB="  "
6207   fi
6208 < rm -f conftest.$ac_objext conftest.$ac_ext
6209 < echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6175 < echo "${ECHO_T}$ac_header_compiler" >&6
6176 <
6177 < # Is the header present?
6178 < echo "$as_me:$LINENO: checking $ac_header presence" >&5
6179 < echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
6180 < cat >conftest.$ac_ext <<_ACEOF
6181 < #include <$ac_header>
6182 < _ACEOF
6183 < if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6184 <  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6185 <  ac_status=$?
6186 <  grep -v '^ *+' conftest.er1 >conftest.err
6187 <  rm -f conftest.er1
6188 <  cat conftest.err >&5
6189 <  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6190 <  (exit $ac_status); } >/dev/null; then
6191 <  if test -s conftest.err; then
6192 <    ac_cpp_err=$ac_f90_preproc_warn_flag
6193 <  else
6194 <    ac_cpp_err=
6195 <  fi
6196 < else
6197 <  ac_cpp_err=yes
6198 < fi
6199 < if test -z "$ac_cpp_err"; then
6200 <  ac_header_preproc=yes
6201 < else
6202 <  echo "$as_me: failed program was:" >&5
6203 < sed 's/^/| /' conftest.$ac_ext >&5
6204 <
6205 <  ac_header_preproc=no
6206 < fi
6207 < rm -f conftest.err conftest.$ac_ext
6208 < echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6209 < echo "${ECHO_T}$ac_header_preproc" >&6
6210 <
6211 < # So?  What about this header?
6212 < case $ac_header_compiler:$ac_header_preproc in
6213 <  yes:no )
6214 <    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
6215 < echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
6216 <    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
6217 < echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
6218 <    (
6219 <      cat <<\_ASBOX
6220 < ## ------------------------------------ ##
6221 < ## Report this to bug-autoconf@gnu.org. ##
6222 < ## ------------------------------------ ##
6223 < _ASBOX
6224 <    ) |
6225 <      sed "s/^/$as_me: WARNING:     /" >&2
6226 <    ;;
6227 <  no:yes )
6228 <    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
6229 < echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
6230 <    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
6231 < echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
6232 <    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
6233 < echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
6234 <    (
6235 <      cat <<\_ASBOX
6236 < ## ------------------------------------ ##
6237 < ## Report this to bug-autoconf@gnu.org. ##
6238 < ## ------------------------------------ ##
6239 < _ASBOX
6240 <    ) |
6241 <      sed "s/^/$as_me: WARNING:     /" >&2
6242 <    ;;
6243 < esac
6244 < echo "$as_me:$LINENO: checking for $ac_header" >&5
6245 < echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6246 < if eval "test \"\${$as_ac_Header+set}\" = set"; then
6247 <  echo $ECHO_N "(cached) $ECHO_C" >&6
6248 < else
6249 <  eval "$as_ac_Header=$ac_header_preproc"
6250 < fi
6251 < echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6252 < echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6208 > echo "$as_me:$LINENO: result: found $MPI_F90_LIB" >&5
6209 > echo "${ECHO_T}found $MPI_F90_LIB" >&6
6210  
6254 fi
6255 if test `eval echo '${'$as_ac_Header'}'` = yes; then
6256  cat >>confdefs.h <<_ACEOF
6257 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
6258 _ACEOF
6211  
6212   fi
6213  
6262 done
6214  
6264        ac_ext=c
6265 ac_cpp='$CPP $CPPFLAGS'
6266 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6267 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6268 ac_compiler_gnu=$ac_cv_c_compiler_gnu
6215  
6270
6271 cat >>confdefs.h <<\_ACEOF
6272 #define MPI_H 1
6273 _ACEOF
6274
6275 fi
6276
6216   ac_ext=c
6217   ac_cpp='$CPP $CPPFLAGS'
6218   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 6302 | Line 6241 | do
6241    # On the NeXT, cc -E runs the code through the compiler's parser,
6242    # not just through cpp. "Syntax error" is here to catch this case.
6243    cat >conftest.$ac_ext <<_ACEOF
6305 #line $LINENO "configure"
6244   /* confdefs.h.  */
6245   _ACEOF
6246   cat confdefs.h >>conftest.$ac_ext
# Line 6313 | Line 6251 | cat >>conftest.$ac_ext <<_ACEOF
6251   #else
6252   # include <assert.h>
6253   #endif
6254 <                     Syntax error
6254 >                     Syntax error
6255   _ACEOF
6256   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6257    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 6325 | Line 6263 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6263    (exit $ac_status); } >/dev/null; then
6264    if test -s conftest.err; then
6265      ac_cpp_err=$ac_c_preproc_warn_flag
6266 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6267    else
6268      ac_cpp_err=
6269    fi
# Line 6345 | Line 6284 | rm -f conftest.err conftest.$ac_ext
6284    # OK, works on sane cases.  Now check whether non-existent headers
6285    # can be detected and how.
6286    cat >conftest.$ac_ext <<_ACEOF
6348 #line $LINENO "configure"
6287   /* confdefs.h.  */
6288   _ACEOF
6289   cat confdefs.h >>conftest.$ac_ext
# Line 6363 | Line 6301 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6301    (exit $ac_status); } >/dev/null; then
6302    if test -s conftest.err; then
6303      ac_cpp_err=$ac_c_preproc_warn_flag
6304 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6305    else
6306      ac_cpp_err=
6307    fi
# Line 6409 | Line 6348 | do
6348    # On the NeXT, cc -E runs the code through the compiler's parser,
6349    # not just through cpp. "Syntax error" is here to catch this case.
6350    cat >conftest.$ac_ext <<_ACEOF
6412 #line $LINENO "configure"
6351   /* confdefs.h.  */
6352   _ACEOF
6353   cat confdefs.h >>conftest.$ac_ext
# Line 6420 | Line 6358 | cat >>conftest.$ac_ext <<_ACEOF
6358   #else
6359   # include <assert.h>
6360   #endif
6361 <                     Syntax error
6361 >                     Syntax error
6362   _ACEOF
6363   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6364    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 6432 | Line 6370 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6370    (exit $ac_status); } >/dev/null; then
6371    if test -s conftest.err; then
6372      ac_cpp_err=$ac_c_preproc_warn_flag
6373 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6374    else
6375      ac_cpp_err=
6376    fi
# Line 6452 | Line 6391 | rm -f conftest.err conftest.$ac_ext
6391    # OK, works on sane cases.  Now check whether non-existent headers
6392    # can be detected and how.
6393    cat >conftest.$ac_ext <<_ACEOF
6455 #line $LINENO "configure"
6394   /* confdefs.h.  */
6395   _ACEOF
6396   cat confdefs.h >>conftest.$ac_ext
# Line 6470 | Line 6408 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6408    (exit $ac_status); } >/dev/null; then
6409    if test -s conftest.err; then
6410      ac_cpp_err=$ac_c_preproc_warn_flag
6411 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6412    else
6413      ac_cpp_err=
6414    fi
# Line 6509 | Line 6448 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
6448   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6449  
6450  
6451 + echo "$as_me:$LINENO: checking for egrep" >&5
6452 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6
6453 + if test "${ac_cv_prog_egrep+set}" = set; then
6454 +  echo $ECHO_N "(cached) $ECHO_C" >&6
6455 + else
6456 +  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
6457 +    then ac_cv_prog_egrep='grep -E'
6458 +    else ac_cv_prog_egrep='egrep'
6459 +    fi
6460 + fi
6461 + echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
6462 + echo "${ECHO_T}$ac_cv_prog_egrep" >&6
6463 + EGREP=$ac_cv_prog_egrep
6464  
6465  
6466 + echo "$as_me:$LINENO: checking for ANSI C header files" >&5
6467 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
6468 + if test "${ac_cv_header_stdc+set}" = set; then
6469 +  echo $ECHO_N "(cached) $ECHO_C" >&6
6470 + else
6471 +  cat >conftest.$ac_ext <<_ACEOF
6472 + /* confdefs.h.  */
6473 + _ACEOF
6474 + cat confdefs.h >>conftest.$ac_ext
6475 + cat >>conftest.$ac_ext <<_ACEOF
6476 + /* end confdefs.h.  */
6477 + #include <stdlib.h>
6478 + #include <stdarg.h>
6479 + #include <string.h>
6480 + #include <float.h>
6481  
6482 + int
6483 + main ()
6484 + {
6485 +
6486 +  ;
6487 +  return 0;
6488 + }
6489 + _ACEOF
6490 + rm -f conftest.$ac_objext
6491 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6492 +  (eval $ac_compile) 2>conftest.er1
6493 +  ac_status=$?
6494 +  grep -v '^ *+' conftest.er1 >conftest.err
6495 +  rm -f conftest.er1
6496 +  cat conftest.err >&5
6497 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6498 +  (exit $ac_status); } &&
6499 +         { ac_try='test -z "$ac_c_werror_flag"
6500 +                         || test ! -s conftest.err'
6501 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6502 +  (eval $ac_try) 2>&5
6503 +  ac_status=$?
6504 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6505 +  (exit $ac_status); }; } &&
6506 +         { ac_try='test -s conftest.$ac_objext'
6507 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6508 +  (eval $ac_try) 2>&5
6509 +  ac_status=$?
6510 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6511 +  (exit $ac_status); }; }; then
6512 +  ac_cv_header_stdc=yes
6513 + else
6514 +  echo "$as_me: failed program was:" >&5
6515 + sed 's/^/| /' conftest.$ac_ext >&5
6516 +
6517 + ac_cv_header_stdc=no
6518 + fi
6519 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6520 +
6521 + if test $ac_cv_header_stdc = yes; then
6522 +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
6523 +  cat >conftest.$ac_ext <<_ACEOF
6524 + /* confdefs.h.  */
6525 + _ACEOF
6526 + cat confdefs.h >>conftest.$ac_ext
6527 + cat >>conftest.$ac_ext <<_ACEOF
6528 + /* end confdefs.h.  */
6529 + #include <string.h>
6530 +
6531 + _ACEOF
6532 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
6533 +  $EGREP "memchr" >/dev/null 2>&1; then
6534 +  :
6535 + else
6536 +  ac_cv_header_stdc=no
6537 + fi
6538 + rm -f conftest*
6539 +
6540 + fi
6541 +
6542 + if test $ac_cv_header_stdc = yes; then
6543 +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
6544 +  cat >conftest.$ac_ext <<_ACEOF
6545 + /* confdefs.h.  */
6546 + _ACEOF
6547 + cat confdefs.h >>conftest.$ac_ext
6548 + cat >>conftest.$ac_ext <<_ACEOF
6549 + /* end confdefs.h.  */
6550 + #include <stdlib.h>
6551 +
6552 + _ACEOF
6553 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
6554 +  $EGREP "free" >/dev/null 2>&1; then
6555 +  :
6556 + else
6557 +  ac_cv_header_stdc=no
6558 + fi
6559 + rm -f conftest*
6560 +
6561 + fi
6562 +
6563 + if test $ac_cv_header_stdc = yes; then
6564 +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
6565 +  if test "$cross_compiling" = yes; then
6566 +  :
6567 + else
6568 +  cat >conftest.$ac_ext <<_ACEOF
6569 + /* confdefs.h.  */
6570 + _ACEOF
6571 + cat confdefs.h >>conftest.$ac_ext
6572 + cat >>conftest.$ac_ext <<_ACEOF
6573 + /* end confdefs.h.  */
6574 + #include <ctype.h>
6575 + #if ((' ' & 0x0FF) == 0x020)
6576 + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
6577 + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
6578 + #else
6579 + # define ISLOWER(c) \
6580 +                   (('a' <= (c) && (c) <= 'i') \
6581 +                     || ('j' <= (c) && (c) <= 'r') \
6582 +                     || ('s' <= (c) && (c) <= 'z'))
6583 + # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
6584 + #endif
6585 +
6586 + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
6587 + int
6588 + main ()
6589 + {
6590 +  int i;
6591 +  for (i = 0; i < 256; i++)
6592 +    if (XOR (islower (i), ISLOWER (i))
6593 +        || toupper (i) != TOUPPER (i))
6594 +      exit(2);
6595 +  exit (0);
6596 + }
6597 + _ACEOF
6598 + rm -f conftest$ac_exeext
6599 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6600 +  (eval $ac_link) 2>&5
6601 +  ac_status=$?
6602 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6603 +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6604 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6605 +  (eval $ac_try) 2>&5
6606 +  ac_status=$?
6607 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6608 +  (exit $ac_status); }; }; then
6609 +  :
6610 + else
6611 +  echo "$as_me: program exited with status $ac_status" >&5
6612 + echo "$as_me: failed program was:" >&5
6613 + sed 's/^/| /' conftest.$ac_ext >&5
6614 +
6615 + ( exit $ac_status )
6616 + ac_cv_header_stdc=no
6617 + fi
6618 + rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6619 + fi
6620 + fi
6621 + fi
6622 + echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
6623 + echo "${ECHO_T}$ac_cv_header_stdc" >&6
6624 + if test $ac_cv_header_stdc = yes; then
6625 +
6626 + cat >>confdefs.h <<\_ACEOF
6627 + #define STDC_HEADERS 1
6628 + _ACEOF
6629 +
6630 + fi
6631 +
6632 + # On IRIX 5.3, sys/types and inttypes.h are conflicting.
6633 +
6634 +
6635 +
6636 +
6637 +
6638 +
6639 +
6640 +
6641 +
6642 + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
6643 +                  inttypes.h stdint.h unistd.h
6644 + do
6645 + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6646 + echo "$as_me:$LINENO: checking for $ac_header" >&5
6647 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6648 + if eval "test \"\${$as_ac_Header+set}\" = set"; then
6649 +  echo $ECHO_N "(cached) $ECHO_C" >&6
6650 + else
6651 +  cat >conftest.$ac_ext <<_ACEOF
6652 + /* confdefs.h.  */
6653 + _ACEOF
6654 + cat confdefs.h >>conftest.$ac_ext
6655 + cat >>conftest.$ac_ext <<_ACEOF
6656 + /* end confdefs.h.  */
6657 + $ac_includes_default
6658 +
6659 + #include <$ac_header>
6660 + _ACEOF
6661 + rm -f conftest.$ac_objext
6662 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6663 +  (eval $ac_compile) 2>conftest.er1
6664 +  ac_status=$?
6665 +  grep -v '^ *+' conftest.er1 >conftest.err
6666 +  rm -f conftest.er1
6667 +  cat conftest.err >&5
6668 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6669 +  (exit $ac_status); } &&
6670 +         { ac_try='test -z "$ac_c_werror_flag"
6671 +                         || test ! -s conftest.err'
6672 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6673 +  (eval $ac_try) 2>&5
6674 +  ac_status=$?
6675 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6676 +  (exit $ac_status); }; } &&
6677 +         { ac_try='test -s conftest.$ac_objext'
6678 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6679 +  (eval $ac_try) 2>&5
6680 +  ac_status=$?
6681 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6682 +  (exit $ac_status); }; }; then
6683 +  eval "$as_ac_Header=yes"
6684 + else
6685 +  echo "$as_me: failed program was:" >&5
6686 + sed 's/^/| /' conftest.$ac_ext >&5
6687 +
6688 + eval "$as_ac_Header=no"
6689 + fi
6690 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6691 + fi
6692 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6693 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6694 + if test `eval echo '${'$as_ac_Header'}'` = yes; then
6695 +  cat >>confdefs.h <<_ACEOF
6696 + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
6697 + _ACEOF
6698 +
6699 + fi
6700 +
6701 + done
6702 +
6703 +
6704 +
6705 +
6706 +
6707   # Check whether --with-sprng_prefix or --without-sprng_prefix was given.
6708   if test "${with_sprng_prefix+set}" = set; then
6709    withval="$with_sprng_prefix"
# Line 6599 | Line 6791 | cat >conftest.$ac_ext <<_ACEOF
6791   echo "$as_me:$LINENO: checking sprng.h usability" >&5
6792   echo $ECHO_N "checking sprng.h usability... $ECHO_C" >&6
6793   cat >conftest.$ac_ext <<_ACEOF
6602 #line $LINENO "configure"
6794   /* confdefs.h.  */
6795   _ACEOF
6796   cat confdefs.h >>conftest.$ac_ext
# Line 6610 | Line 6801 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6801   _ACEOF
6802   rm -f conftest.$ac_objext
6803   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6804 <  (eval $ac_compile) 2>&5
6804 >  (eval $ac_compile) 2>conftest.er1
6805    ac_status=$?
6806 +  grep -v '^ *+' conftest.er1 >conftest.err
6807 +  rm -f conftest.er1
6808 +  cat conftest.err >&5
6809    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6810    (exit $ac_status); } &&
6811 <         { ac_try='test -s conftest.$ac_objext'
6811 >         { ac_try='test -z "$ac_c_werror_flag"
6812 >                         || test ! -s conftest.err'
6813    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6814    (eval $ac_try) 2>&5
6815    ac_status=$?
6816    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6817 +  (exit $ac_status); }; } &&
6818 +         { ac_try='test -s conftest.$ac_objext'
6819 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6820 +  (eval $ac_try) 2>&5
6821 +  ac_status=$?
6822 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6823    (exit $ac_status); }; }; then
6824    ac_header_compiler=yes
6825   else
# Line 6627 | Line 6828 | rm -f conftest.$ac_objext conftest.$ac_ext
6828  
6829   ac_header_compiler=no
6830   fi
6831 < rm -f conftest.$ac_objext conftest.$ac_ext
6831 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6832   echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6833   echo "${ECHO_T}$ac_header_compiler" >&6
6834  
# Line 6635 | Line 6836 | cat >conftest.$ac_ext <<_ACEOF
6836   echo "$as_me:$LINENO: checking sprng.h presence" >&5
6837   echo $ECHO_N "checking sprng.h presence... $ECHO_C" >&6
6838   cat >conftest.$ac_ext <<_ACEOF
6638 #line $LINENO "configure"
6839   /* confdefs.h.  */
6840   _ACEOF
6841   cat confdefs.h >>conftest.$ac_ext
# Line 6653 | Line 6853 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
6853    (exit $ac_status); } >/dev/null; then
6854    if test -s conftest.err; then
6855      ac_cpp_err=$ac_c_preproc_warn_flag
6856 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6857    else
6858      ac_cpp_err=
6859    fi
# Line 6672 | Line 6873 | case $ac_header_compiler:$ac_header_preproc in
6873   echo "${ECHO_T}$ac_header_preproc" >&6
6874  
6875   # So?  What about this header?
6876 < case $ac_header_compiler:$ac_header_preproc in
6877 <  yes:no )
6876 > case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
6877 >  yes:no: )
6878      { echo "$as_me:$LINENO: WARNING: sprng.h: accepted by the compiler, rejected by the preprocessor!" >&5
6879   echo "$as_me: WARNING: sprng.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
6880 <    { echo "$as_me:$LINENO: WARNING: sprng.h: proceeding with the preprocessor's result" >&5
6881 < echo "$as_me: WARNING: sprng.h: proceeding with the preprocessor's result" >&2;}
6882 <    (
6682 <      cat <<\_ASBOX
6683 < ## ------------------------------------ ##
6684 < ## Report this to bug-autoconf@gnu.org. ##
6685 < ## ------------------------------------ ##
6686 < _ASBOX
6687 <    ) |
6688 <      sed "s/^/$as_me: WARNING:     /" >&2
6880 >    { echo "$as_me:$LINENO: WARNING: sprng.h: proceeding with the compiler's result" >&5
6881 > echo "$as_me: WARNING: sprng.h: proceeding with the compiler's result" >&2;}
6882 >    ac_header_preproc=yes
6883      ;;
6884 <  no:yes )
6884 >  no:yes:* )
6885      { echo "$as_me:$LINENO: WARNING: sprng.h: present but cannot be compiled" >&5
6886   echo "$as_me: WARNING: sprng.h: present but cannot be compiled" >&2;}
6887 <    { echo "$as_me:$LINENO: WARNING: sprng.h: check for missing prerequisite headers?" >&5
6888 < echo "$as_me: WARNING: sprng.h: check for missing prerequisite headers?" >&2;}
6887 >    { echo "$as_me:$LINENO: WARNING: sprng.h:     check for missing prerequisite headers?" >&5
6888 > echo "$as_me: WARNING: sprng.h:     check for missing prerequisite headers?" >&2;}
6889 >    { echo "$as_me:$LINENO: WARNING: sprng.h: see the Autoconf documentation" >&5
6890 > echo "$as_me: WARNING: sprng.h: see the Autoconf documentation" >&2;}
6891 >    { echo "$as_me:$LINENO: WARNING: sprng.h:     section \"Present But Cannot Be Compiled\"" >&5
6892 > echo "$as_me: WARNING: sprng.h:     section \"Present But Cannot Be Compiled\"" >&2;}
6893      { echo "$as_me:$LINENO: WARNING: sprng.h: proceeding with the preprocessor's result" >&5
6894   echo "$as_me: WARNING: sprng.h: proceeding with the preprocessor's result" >&2;}
6895 +    { echo "$as_me:$LINENO: WARNING: sprng.h: in the future, the compiler will take precedence" >&5
6896 + echo "$as_me: WARNING: sprng.h: in the future, the compiler will take precedence" >&2;}
6897      (
6898        cat <<\_ASBOX
6899 < ## ------------------------------------ ##
6900 < ## Report this to bug-autoconf@gnu.org. ##
6901 < ## ------------------------------------ ##
6899 > ## ------------------------------ ##
6900 > ## Report this to gezelter@nd.edu ##
6901 > ## ------------------------------ ##
6902   _ASBOX
6903      ) |
6904        sed "s/^/$as_me: WARNING:     /" >&2
# Line 6725 | Line 6925 | cat >conftest.$ac_ext <<_ACEOF
6925    ac_check_lib_save_LIBS=$LIBS
6926   LIBS="-lsprng  $LIBS"
6927   cat >conftest.$ac_ext <<_ACEOF
6728 #line $LINENO "configure"
6928   /* confdefs.h.  */
6929   _ACEOF
6930   cat confdefs.h >>conftest.$ac_ext
# Line 6749 | Line 6948 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6948   _ACEOF
6949   rm -f conftest.$ac_objext conftest$ac_exeext
6950   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6951 <  (eval $ac_link) 2>&5
6951 >  (eval $ac_link) 2>conftest.er1
6952    ac_status=$?
6953 +  grep -v '^ *+' conftest.er1 >conftest.err
6954 +  rm -f conftest.er1
6955 +  cat conftest.err >&5
6956    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6957    (exit $ac_status); } &&
6958 <         { ac_try='test -s conftest$ac_exeext'
6958 >         { ac_try='test -z "$ac_c_werror_flag"
6959 >                         || test ! -s conftest.err'
6960    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6961    (eval $ac_try) 2>&5
6962    ac_status=$?
6963    echo "$as_me:$LINENO: \$? = $ac_status" >&5
6964 +  (exit $ac_status); }; } &&
6965 +         { ac_try='test -s conftest$ac_exeext'
6966 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6967 +  (eval $ac_try) 2>&5
6968 +  ac_status=$?
6969 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6970    (exit $ac_status); }; }; then
6971    ac_cv_lib_sprng_init_rng=yes
6972   else
# Line 6766 | Line 6975 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
6975  
6976   ac_cv_lib_sprng_init_rng=no
6977   fi
6978 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6978 > rm -f conftest.err conftest.$ac_objext \
6979 >      conftest$ac_exeext conftest.$ac_ext
6980   LIBS=$ac_check_lib_save_LIBS
6981   fi
6982   echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5
# Line 6807 | Line 7017 | echo "${ECHO_T}yes" >&6
7017    withval="$with_mkl"
7018       echo "$as_me:$LINENO: result: yes" >&5
7019   echo "${ECHO_T}yes" >&6
7020 <    for dir in $withval /usr/local/intel/mkl60 /opt/intel/mkl60; do
7020 >    for dir in $withval /usr/local/intel/mkl61 /opt/intel/mkl61; do
7021          mkldir="$dir"
7022          if test -f "$dir/include/mkl.h"; then
7023              found_mkl="yes";
# Line 6847 | Line 7057 | cat >conftest.$ac_ext <<_ACEOF
7057   echo "$as_me:$LINENO: checking mkl.h usability" >&5
7058   echo $ECHO_N "checking mkl.h usability... $ECHO_C" >&6
7059   cat >conftest.$ac_ext <<_ACEOF
6850 #line $LINENO "configure"
7060   /* confdefs.h.  */
7061   _ACEOF
7062   cat confdefs.h >>conftest.$ac_ext
# Line 6858 | Line 7067 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7067   _ACEOF
7068   rm -f conftest.$ac_objext
7069   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7070 <  (eval $ac_compile) 2>&5
7070 >  (eval $ac_compile) 2>conftest.er1
7071    ac_status=$?
7072 +  grep -v '^ *+' conftest.er1 >conftest.err
7073 +  rm -f conftest.er1
7074 +  cat conftest.err >&5
7075    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7076    (exit $ac_status); } &&
7077 <         { ac_try='test -s conftest.$ac_objext'
7077 >         { ac_try='test -z "$ac_c_werror_flag"
7078 >                         || test ! -s conftest.err'
7079    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7080    (eval $ac_try) 2>&5
7081    ac_status=$?
7082    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7083 +  (exit $ac_status); }; } &&
7084 +         { ac_try='test -s conftest.$ac_objext'
7085 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7086 +  (eval $ac_try) 2>&5
7087 +  ac_status=$?
7088 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7089    (exit $ac_status); }; }; then
7090    ac_header_compiler=yes
7091   else
# Line 6875 | Line 7094 | rm -f conftest.$ac_objext conftest.$ac_ext
7094  
7095   ac_header_compiler=no
7096   fi
7097 < rm -f conftest.$ac_objext conftest.$ac_ext
7097 > rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7098   echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7099   echo "${ECHO_T}$ac_header_compiler" >&6
7100  
# Line 6883 | Line 7102 | cat >conftest.$ac_ext <<_ACEOF
7102   echo "$as_me:$LINENO: checking mkl.h presence" >&5
7103   echo $ECHO_N "checking mkl.h presence... $ECHO_C" >&6
7104   cat >conftest.$ac_ext <<_ACEOF
6886 #line $LINENO "configure"
7105   /* confdefs.h.  */
7106   _ACEOF
7107   cat confdefs.h >>conftest.$ac_ext
# Line 6901 | Line 7119 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
7119    (exit $ac_status); } >/dev/null; then
7120    if test -s conftest.err; then
7121      ac_cpp_err=$ac_c_preproc_warn_flag
7122 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
7123    else
7124      ac_cpp_err=
7125    fi
# Line 6920 | Line 7139 | case $ac_header_compiler:$ac_header_preproc in
7139   echo "${ECHO_T}$ac_header_preproc" >&6
7140  
7141   # So?  What about this header?
7142 < case $ac_header_compiler:$ac_header_preproc in
7143 <  yes:no )
7142 > case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7143 >  yes:no: )
7144      { echo "$as_me:$LINENO: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&5
7145   echo "$as_me: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
7146 <    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5
7147 < echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;}
7148 <    (
6930 <      cat <<\_ASBOX
6931 < ## ------------------------------------ ##
6932 < ## Report this to bug-autoconf@gnu.org. ##
6933 < ## ------------------------------------ ##
6934 < _ASBOX
6935 <    ) |
6936 <      sed "s/^/$as_me: WARNING:     /" >&2
7146 >    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the compiler's result" >&5
7147 > echo "$as_me: WARNING: mkl.h: proceeding with the compiler's result" >&2;}
7148 >    ac_header_preproc=yes
7149      ;;
7150 <  no:yes )
7150 >  no:yes:* )
7151      { echo "$as_me:$LINENO: WARNING: mkl.h: present but cannot be compiled" >&5
7152   echo "$as_me: WARNING: mkl.h: present but cannot be compiled" >&2;}
7153 <    { echo "$as_me:$LINENO: WARNING: mkl.h: check for missing prerequisite headers?" >&5
7154 < echo "$as_me: WARNING: mkl.h: check for missing prerequisite headers?" >&2;}
7153 >    { echo "$as_me:$LINENO: WARNING: mkl.h:     check for missing prerequisite headers?" >&5
7154 > echo "$as_me: WARNING: mkl.h:     check for missing prerequisite headers?" >&2;}
7155 >    { echo "$as_me:$LINENO: WARNING: mkl.h: see the Autoconf documentation" >&5
7156 > echo "$as_me: WARNING: mkl.h: see the Autoconf documentation" >&2;}
7157 >    { echo "$as_me:$LINENO: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&5
7158 > echo "$as_me: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
7159      { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5
7160   echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;}
7161 +    { echo "$as_me:$LINENO: WARNING: mkl.h: in the future, the compiler will take precedence" >&5
7162 + echo "$as_me: WARNING: mkl.h: in the future, the compiler will take precedence" >&2;}
7163      (
7164        cat <<\_ASBOX
7165 < ## ------------------------------------ ##
7166 < ## Report this to bug-autoconf@gnu.org. ##
7167 < ## ------------------------------------ ##
7165 > ## ------------------------------ ##
7166 > ## Report this to gezelter@nd.edu ##
7167 > ## ------------------------------ ##
7168   _ASBOX
7169      ) |
7170        sed "s/^/$as_me: WARNING:     /" >&2
# Line 6973 | Line 7191 | cat >conftest.$ac_ext <<_ACEOF
7191    ac_check_lib_save_LIBS=$LIBS
7192   LIBS="-lmkl  $LIBS"
7193   cat >conftest.$ac_ext <<_ACEOF
6976 #line $LINENO "configure"
7194   /* confdefs.h.  */
7195   _ACEOF
7196   cat confdefs.h >>conftest.$ac_ext
# Line 6997 | Line 7214 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7214   _ACEOF
7215   rm -f conftest.$ac_objext conftest$ac_exeext
7216   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7217 <  (eval $ac_link) 2>&5
7217 >  (eval $ac_link) 2>conftest.er1
7218    ac_status=$?
7219 +  grep -v '^ *+' conftest.er1 >conftest.err
7220 +  rm -f conftest.er1
7221 +  cat conftest.err >&5
7222    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7223    (exit $ac_status); } &&
7224 <         { ac_try='test -s conftest$ac_exeext'
7224 >         { ac_try='test -z "$ac_c_werror_flag"
7225 >                         || test ! -s conftest.err'
7226    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7227    (eval $ac_try) 2>&5
7228    ac_status=$?
7229    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7230 +  (exit $ac_status); }; } &&
7231 +         { ac_try='test -s conftest$ac_exeext'
7232 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7233 +  (eval $ac_try) 2>&5
7234 +  ac_status=$?
7235 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7236    (exit $ac_status); }; }; then
7237    ac_cv_lib_mkl_vslNewStream=yes
7238   else
# Line 7014 | Line 7241 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.
7241  
7242   ac_cv_lib_mkl_vslNewStream=no
7243   fi
7244 < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7244 > rm -f conftest.err conftest.$ac_objext \
7245 >      conftest$ac_exeext conftest.$ac_ext
7246   LIBS=$ac_check_lib_save_LIBS
7247   fi
7248   echo "$as_me:$LINENO: result: $ac_cv_lib_mkl_vslNewStream" >&5
# Line 7084 | Line 7312 | SUBDIRS="libBASS libmdtools src forceFields samples ut
7312  
7313   MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
7314  
7315 < SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps"
7315 > SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps third-party "
7316  
7317   CFLAGS=${CFLAGS-""}
7318   CXXFLAGS=${CXXFLAGS-""}
# Line 7119 | Line 7347 | esac
7347  
7348  
7349  
7350 <          ac_config_headers="$ac_config_headers libmdtools/config.h"
7350 >                    ac_config_headers="$ac_config_headers libBASS/config.h libmdtools/config.h"
7351  
7352 <                                                                                                                                                      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"
7352 >                                                                                                                                                                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"
7353  
7354  
7355   cat >confcache <<\_ACEOF
# Line 7152 | Line 7380 | _ACEOF
7380        # `set' does not quote correctly, so add quotes (double-quote
7381        # substitution turns \\\\ into \\, and sed turns \\ into \).
7382        sed -n \
7383 <        "s/'/'\\\\''/g;
7384 <          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
7383 >        "s/'/'\\\\''/g;
7384 >          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
7385        ;;
7386      *)
7387        # `set' quotes correctly as required by POSIX, so do not add quotes.
7388        sed -n \
7389 <        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
7389 >        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
7390        ;;
7391      esac;
7392   } |
# Line 7188 | Line 7416 | if test "x$srcdir" = x.; then
7416   # trailing colons and then remove the whole line if VPATH becomes empty
7417   # (actually we leave an empty line to preserve line numbers).
7418   if test "x$srcdir" = x.; then
7419 <  ac_vpsub='/^[         ]*VPATH[        ]*=/{
7419 >  ac_vpsub='/^[  ]*VPATH[        ]*=/{
7420   s/:*\$(srcdir):*/:/;
7421   s/:*\${srcdir}:*/:/;
7422   s/:*@srcdir@:*/:/;
7423 < s/^\([^=]*=[    ]*\):*/\1/;
7423 > s/^\([^=]*=[     ]*\):*/\1/;
7424   s/:*$//;
7425 < s/^[^=]*=[      ]*$//;
7425 > s/^[^=]*=[       ]*$//;
7426   }'
7427   fi
7428  
# Line 7205 | Line 7433 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && conti
7433   for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
7434    # 1. Remove the extension, and $U if already installed.
7435    ac_i=`echo "$ac_i" |
7436 <         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
7436 >         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
7437    # 2. Add them.
7438    ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
7439    ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
# Line 7249 | Line 7477 | fi
7477   elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
7478    set -o posix
7479   fi
7480 + DUALCASE=1; export DUALCASE # for MKS sh
7481  
7482   # Support unset when possible.
7483 < if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
7483 > if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
7484    as_unset=unset
7485   else
7486    as_unset=false
# Line 7270 | Line 7499 | do
7499    LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
7500    LC_TELEPHONE LC_TIME
7501   do
7502 <  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
7502 >  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
7503      eval $as_var=C; export $as_var
7504    else
7505      $as_unset $as_var
# Line 7449 | Line 7678 | else
7678   if mkdir -p . 2>/dev/null; then
7679    as_mkdir_p=:
7680   else
7681 +  test -d ./-p && rmdir ./-p
7682    as_mkdir_p=false
7683   fi
7684  
7685   as_executable_p="test -f"
7686  
7687   # Sed expression to map a string onto a valid CPP name.
7688 < as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
7688 > as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
7689  
7690   # Sed expression to map a string onto a valid variable name.
7691 < as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
7691 > as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
7692  
7693  
7694   # IFS
# Line 7485 | Line 7715 | generated by GNU Autoconf 2.57.  Invocation command li
7715   cat >&5 <<_CSEOF
7716  
7717   This file was extended by OOPSE $as_me 1.0, which was
7718 < generated by GNU Autoconf 2.57.  Invocation command line was
7718 > generated by GNU Autoconf 2.59.  Invocation command line was
7719  
7720    CONFIG_FILES    = $CONFIG_FILES
7721    CONFIG_HEADERS  = $CONFIG_HEADERS
# Line 7529 | Line 7759 | Usage: $0 [OPTIONS] [FILE]...
7759    -d, --debug      don't remove temporary files
7760        --recheck    update $as_me by reconfiguring in the same conditions
7761    --file=FILE[:TEMPLATE]
7762 <                   instantiate the configuration file FILE
7762 >                   instantiate the configuration file FILE
7763    --header=FILE[:TEMPLATE]
7764 <                   instantiate the configuration header FILE
7764 >                   instantiate the configuration header FILE
7765  
7766   Configuration files:
7767   $config_files
# Line 7545 | Line 7775 | configured by $0, generated by GNU Autoconf 2.57,
7775   cat >>$CONFIG_STATUS <<_ACEOF
7776   ac_cs_version="\\
7777   OOPSE config.status 1.0
7778 < configured by $0, generated by GNU Autoconf 2.57,
7778 > configured by $0, generated by GNU Autoconf 2.59,
7779    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
7780  
7781 < Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
7552 < Free Software Foundation, Inc.
7781 > Copyright (C) 2003 Free Software Foundation, Inc.
7782   This config.status script is free software; the Free Software Foundation
7783   gives unlimited permission to copy, distribute and modify it."
7784   srcdir=$srcdir
# Line 7657 | Line 7886 | do
7886    "forceFields/Makefile" ) CONFIG_FILES="$CONFIG_FILES forceFields/Makefile" ;;
7887    "samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
7888    "staticProps/Makefile" ) CONFIG_FILES="$CONFIG_FILES staticProps/Makefile" ;;
7889 +  "third-party/Makefile" ) CONFIG_FILES="$CONFIG_FILES third-party/Makefile" ;;
7890    "samples/alkane/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/alkane/Makefile" ;;
7891    "samples/argon/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/argon/Makefile" ;;
7892    "samples/beadLipid/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/beadLipid/Makefile" ;;
7893    "samples/lipid/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/lipid/Makefile" ;;
7894    "samples/metals/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/metals/Makefile" ;;
7895    "samples/water/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/Makefile" ;;
7896 +  "libBASS/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS libBASS/config.h" ;;
7897    "libmdtools/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS libmdtools/config.h" ;;
7898    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
7899   echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
# Line 7794 | Line 8025 | s,@mpi_dir@,$mpi_dir,;t t
8025   s,@LEXLIB@,$LEXLIB,;t t
8026   s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
8027   s,@AR@,$AR,;t t
8028 < s,@mpi_dir@,$mpi_dir,;t t
8029 < s,@MPI_LIBDIR@,$MPI_LIBDIR,;t t
8030 < s,@MPI_INC@,$MPI_INC,;t t
8028 > s,@MPI_LIB_DIR@,$MPI_LIB_DIR,;t t
8029 > s,@MPI_INC_DIR@,$MPI_INC_DIR,;t t
8030 > s,@MPI_F90_INC@,$MPI_F90_INC,;t t
8031   s,@MPI_LIB@,$MPI_LIB,;t t
8032 < s,@MPIF77@,$MPIF77,;t t
8033 < s,@MPIF90@,$MPIF90,;t t
7803 < s,@MPILIBS@,$MPILIBS,;t t
7804 < s,@MPI_F90_MODS@,$MPI_F90_MODS,;t t
7805 < s,@MPIMODLIBNAME@,$MPIMODLIBNAME,;t t
7806 < s,@EGREP@,$EGREP,;t t
8032 > s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
8033 > s,@USE_MPI@,$USE_MPI,;t t
8034   s,@CPP@,$CPP,;t t
8035 + s,@EGREP@,$EGREP,;t t
8036   s,@SPRNG_LIBDIR@,$SPRNG_LIBDIR,;t t
8037   s,@SPRNG_LIB@,$SPRNG_LIB,;t t
8038   s,@SPRNG_INC@,$SPRNG_INC,;t t
# Line 7850 | Line 8078 | _ACEOF
8078        (echo ':t
8079    /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
8080        if test -z "$ac_sed_cmds"; then
8081 <        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
8081 >        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
8082        else
8083 <        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
8083 >        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
8084        fi
8085        ac_sed_frag=`expr $ac_sed_frag + 1`
8086        ac_beg=$ac_end
# Line 7870 | Line 8098 | for ac_file in : $CONFIG_FILES; do test "x$ac_file" =
8098    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
8099    case $ac_file in
8100    - | *:- | *:-:* ) # input from stdin
8101 <        cat >$tmp/stdin
8102 <        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8103 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8101 >        cat >$tmp/stdin
8102 >        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8103 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8104    *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8105 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8105 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8106    * )   ac_file_in=$ac_file.in ;;
8107    esac
8108  
8109    # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
8110    ac_dir=`(dirname "$ac_file") 2>/dev/null ||
8111   $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8112 <         X"$ac_file" : 'X\(//\)[^/]' \| \
8113 <         X"$ac_file" : 'X\(//\)$' \| \
8114 <         X"$ac_file" : 'X\(/\)' \| \
8115 <         .     : '\(.\)' 2>/dev/null ||
8112 >         X"$ac_file" : 'X\(//\)[^/]' \| \
8113 >         X"$ac_file" : 'X\(//\)$' \| \
8114 >         X"$ac_file" : 'X\(/\)' \| \
8115 >         .     : '\(.\)' 2>/dev/null ||
8116   echo X"$ac_file" |
8117      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8118            /^X\(\/\/\)[^/].*/{ s//\1/; q; }
# Line 7900 | Line 8128 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \|
8128        as_dirs="$as_dir $as_dirs"
8129        as_dir=`(dirname "$as_dir") 2>/dev/null ||
8130   $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8131 <         X"$as_dir" : 'X\(//\)[^/]' \| \
8132 <         X"$as_dir" : 'X\(//\)$' \| \
8133 <         X"$as_dir" : 'X\(/\)' \| \
8134 <         .     : '\(.\)' 2>/dev/null ||
8131 >         X"$as_dir" : 'X\(//\)[^/]' \| \
8132 >         X"$as_dir" : 'X\(//\)$' \| \
8133 >         X"$as_dir" : 'X\(/\)' \| \
8134 >         .     : '\(.\)' 2>/dev/null ||
8135   echo X"$as_dir" |
8136      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8137            /^X\(\/\/\)[^/].*/{ s//\1/; q; }
# Line 7941 | Line 8169 | esac
8169      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
8170      ac_top_srcdir=$ac_top_builddir$srcdir ;;
8171   esac
8172 < # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
8173 < # absolute.
8174 < ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
8175 < ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
8176 < ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
8177 < ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
8172 >
8173 > # Do not use `cd foo && pwd` to compute absolute paths, because
8174 > # the directories may not exist.
8175 > case `pwd` in
8176 > .) ac_abs_builddir="$ac_dir";;
8177 > *)
8178 >  case "$ac_dir" in
8179 >  .) ac_abs_builddir=`pwd`;;
8180 >  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
8181 >  *) ac_abs_builddir=`pwd`/"$ac_dir";;
8182 >  esac;;
8183 > esac
8184 > case $ac_abs_builddir in
8185 > .) ac_abs_top_builddir=${ac_top_builddir}.;;
8186 > *)
8187 >  case ${ac_top_builddir}. in
8188 >  .) ac_abs_top_builddir=$ac_abs_builddir;;
8189 >  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
8190 >  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
8191 >  esac;;
8192 > esac
8193 > case $ac_abs_builddir in
8194 > .) ac_abs_srcdir=$ac_srcdir;;
8195 > *)
8196 >  case $ac_srcdir in
8197 >  .) ac_abs_srcdir=$ac_abs_builddir;;
8198 >  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
8199 >  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
8200 >  esac;;
8201 > esac
8202 > case $ac_abs_builddir in
8203 > .) ac_abs_top_srcdir=$ac_top_srcdir;;
8204 > *)
8205 >  case $ac_top_srcdir in
8206 >  .) ac_abs_top_srcdir=$ac_abs_builddir;;
8207 >  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
8208 >  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
8209 >  esac;;
8210 > esac
8211  
8212  
8213    case $INSTALL in
# Line 7968 | Line 8229 | echo "$as_me: creating $ac_file" >&6;}
8229      configure_input="$ac_file.  "
8230    fi
8231    configure_input=$configure_input"Generated from `echo $ac_file_in |
8232 <                                     sed 's,.*/,,'` by configure."
8232 >                                     sed 's,.*/,,'` by configure."
8233  
8234    # First look for the input files in the build tree, otherwise in the
8235    # src tree.
# Line 7977 | Line 8238 | echo "$as_me: creating $ac_file" >&6;}
8238        case $f in
8239        -) echo $tmp/stdin ;;
8240        [\\/$]*)
8241 <         # Absolute (can't be DOS-style, as IFS=:)
8242 <         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8241 >         # Absolute (can't be DOS-style, as IFS=:)
8242 >         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8243   echo "$as_me: error: cannot find input file: $f" >&2;}
8244     { (exit 1); exit 1; }; }
8245 <         echo $f;;
8245 >         echo "$f";;
8246        *) # Relative
8247 <         if test -f "$f"; then
8248 <           # Build tree
8249 <           echo $f
8250 <         elif test -f "$srcdir/$f"; then
8251 <           # Source tree
8252 <           echo $srcdir/$f
8253 <         else
8254 <           # /dev/null tree
8255 <           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8247 >         if test -f "$f"; then
8248 >           # Build tree
8249 >           echo "$f"
8250 >         elif test -f "$srcdir/$f"; then
8251 >           # Source tree
8252 >           echo "$srcdir/$f"
8253 >         else
8254 >           # /dev/null tree
8255 >           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8256   echo "$as_me: error: cannot find input file: $f" >&2;}
8257     { (exit 1); exit 1; }; }
8258 <         fi;;
8258 >         fi;;
8259        esac
8260      done` || { (exit 1); exit 1; }
8261   _ACEOF
# Line 8036 | Line 8297 | ac_dA='s,^\([  ]*\)#\([        ]*define[       ][      ]*\)'
8297   # NAME is the cpp macro being defined and VALUE is the value it is being given.
8298   #
8299   # ac_d sets the value in "#define NAME VALUE" lines.
8300 < ac_dA='s,^\([   ]*\)#\([        ]*define[       ][      ]*\)'
8301 < ac_dB='[        ].*$,\1#\2'
8300 > ac_dA='s,^\([    ]*\)#\([        ]*define[       ][      ]*\)'
8301 > ac_dB='[         ].*$,\1#\2'
8302   ac_dC=' '
8303   ac_dD=',;t'
8304   # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
8305 < ac_uA='s,^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
8305 > ac_uA='s,^\([    ]*\)#\([        ]*\)undef\([    ][      ]*\)'
8306   ac_uB='$,\1#\2define\3'
8307   ac_uC=' '
8308   ac_uD=',;t'
# Line 8050 | Line 8311 | for ac_file in : $CONFIG_HEADERS; do test "x$ac_file"
8311    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
8312    case $ac_file in
8313    - | *:- | *:-:* ) # input from stdin
8314 <        cat >$tmp/stdin
8315 <        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8316 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8314 >        cat >$tmp/stdin
8315 >        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8316 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8317    *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
8318 <        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8318 >        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
8319    * )   ac_file_in=$ac_file.in ;;
8320    esac
8321  
# Line 8068 | Line 8329 | echo "$as_me: creating $ac_file" >&6;}
8329        case $f in
8330        -) echo $tmp/stdin ;;
8331        [\\/$]*)
8332 <         # Absolute (can't be DOS-style, as IFS=:)
8333 <         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8332 >         # Absolute (can't be DOS-style, as IFS=:)
8333 >         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8334   echo "$as_me: error: cannot find input file: $f" >&2;}
8335     { (exit 1); exit 1; }; }
8336 <         echo $f;;
8336 >         # Do quote $f, to prevent DOS paths from being IFS'd.
8337 >         echo "$f";;
8338        *) # Relative
8339 <         if test -f "$f"; then
8340 <           # Build tree
8341 <           echo $f
8342 <         elif test -f "$srcdir/$f"; then
8343 <           # Source tree
8344 <           echo $srcdir/$f
8345 <         else
8346 <           # /dev/null tree
8347 <           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8339 >         if test -f "$f"; then
8340 >           # Build tree
8341 >           echo "$f"
8342 >         elif test -f "$srcdir/$f"; then
8343 >           # Source tree
8344 >           echo "$srcdir/$f"
8345 >         else
8346 >           # /dev/null tree
8347 >           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
8348   echo "$as_me: error: cannot find input file: $f" >&2;}
8349     { (exit 1); exit 1; }; }
8350 <         fi;;
8350 >         fi;;
8351        esac
8352      done` || { (exit 1); exit 1; }
8353    # Remove the trailing spaces.
8354 <  sed 's/[      ]*$//' $ac_file_inputs >$tmp/in
8354 >  sed 's/[       ]*$//' $ac_file_inputs >$tmp/in
8355  
8356   _ACEOF
8357  
# Line 8112 | Line 8374 | s,^[   ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*
8374   s,[\\$`],\\&,g
8375   t clear
8376   : clear
8377 < s,^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
8377 > s,^[     ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
8378   t end
8379 < s,^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
8379 > s,^[     ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
8380   : end
8381   _ACEOF
8382   # If some macros were called several times there might be several times
# Line 8128 | Line 8390 | s,^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/*
8390   # example, in the case of _POSIX_SOURCE, which is predefined and required
8391   # on some systems where configure will not decide to define it.
8392   cat >>conftest.undefs <<\_ACEOF
8393 < s,^[    ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
8393 > s,^[     ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
8394   _ACEOF
8395  
8396   # Break up conftest.defines because some shells have a limit on the size
8397   # of here documents, and old seds have small limits too (100 cmds).
8398   echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
8399 < echo '  if grep "^[     ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
8399 > echo '  if grep "^[      ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
8400   echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
8401   echo '  :' >>$CONFIG_STATUS
8402   rm -f conftest.tail
# Line 8143 | Line 8405 | do
8405    # Write a limited-size here document to $tmp/defines.sed.
8406    echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
8407    # Speed up: don't consider the non `#define' lines.
8408 <  echo '/^[     ]*#[    ]*define/!b' >>$CONFIG_STATUS
8408 >  echo '/^[      ]*#[    ]*define/!b' >>$CONFIG_STATUS
8409    # Work around the forget-to-reset-the-flag bug.
8410    echo 't clr' >>$CONFIG_STATUS
8411    echo ': clr' >>$CONFIG_STATUS
# Line 8170 | Line 8432 | do
8432    # Write a limited-size here document to $tmp/undefs.sed.
8433    echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
8434    # Speed up: don't consider the non `#undef'
8435 <  echo '/^[     ]*#[    ]*undef/!b' >>$CONFIG_STATUS
8435 >  echo '/^[      ]*#[    ]*undef/!b' >>$CONFIG_STATUS
8436    # Work around the forget-to-reset-the-flag bug.
8437    echo 't clr' >>$CONFIG_STATUS
8438    echo ': clr' >>$CONFIG_STATUS
# Line 8204 | Line 8466 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \|
8466      else
8467        ac_dir=`(dirname "$ac_file") 2>/dev/null ||
8468   $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8469 <         X"$ac_file" : 'X\(//\)[^/]' \| \
8470 <         X"$ac_file" : 'X\(//\)$' \| \
8471 <         X"$ac_file" : 'X\(/\)' \| \
8472 <         .     : '\(.\)' 2>/dev/null ||
8469 >         X"$ac_file" : 'X\(//\)[^/]' \| \
8470 >         X"$ac_file" : 'X\(//\)$' \| \
8471 >         X"$ac_file" : 'X\(/\)' \| \
8472 >         .     : '\(.\)' 2>/dev/null ||
8473   echo X"$ac_file" |
8474      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8475            /^X\(\/\/\)[^/].*/{ s//\1/; q; }
# Line 8223 | Line 8485 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \|
8485        as_dirs="$as_dir $as_dirs"
8486        as_dir=`(dirname "$as_dir") 2>/dev/null ||
8487   $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8488 <         X"$as_dir" : 'X\(//\)[^/]' \| \
8489 <         X"$as_dir" : 'X\(//\)$' \| \
8490 <         X"$as_dir" : 'X\(/\)' \| \
8491 <         .     : '\(.\)' 2>/dev/null ||
8488 >         X"$as_dir" : 'X\(//\)[^/]' \| \
8489 >         X"$as_dir" : 'X\(//\)$' \| \
8490 >         X"$as_dir" : 'X\(/\)' \| \
8491 >         .     : '\(.\)' 2>/dev/null ||
8492   echo X"$as_dir" |
8493      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
8494            /^X\(\/\/\)[^/].*/{ s//\1/; q; }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines