--- trunk/OOPSE/configure 2004/01/14 15:49:26 942 +++ trunk/OOPSE/configure 2004/01/14 22:41:34 944 @@ -312,7 +312,7 @@ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR mpi MPI_LIBDIR MPI_INC MPI_LIB 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' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR mpi MPI_LIBDIR MPI_INC MPI_F90INC MPI_LIB MPI_F90LIB CPP EGREP SPRNG_LIBDIR SPRNG_LIB SPRNG_INC HAVE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -873,13 +873,13 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-mpi=MPIDIR give the path for MPI /usr/local --with-mpi-libdir=dir give the path for MPI-libraries MPI_DIR/lib - --with-mpi_inc=dir give the path for MPI-include-files MPI_DIR/include + --with-mpi-inc=dir give the path for MPI-include-files MPI_DIR/include --with-sprng_prefix=PREFIX Prefix where SPRNG is installed --with-sprng-libdir=PREFIX SPRNG library directory --with-sprng-include=PREFIX SPRNG include directory - --with-mkl Do we want MKL will check /usr/local/intel/mkl60 /opt/intel/mkl60 + --with-mkl Do we want MKL will check /usr/local/intel/mkl61 /opt/intel/mkl61 Some influential environment variables: CC C compiler command @@ -1869,6 +1869,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This sho + # set program name PROGNAME="oopse" @@ -3526,7 +3527,7 @@ F90FLAGS="$F90FLAGS $ac_verb" ac_save_F90FLAGS=$F90FLAGS F90FLAGS="$F90FLAGS $ac_verb" -(eval echo $as_me:3529: \"$ac_link\") >&5 +(eval echo $as_me:3530: \"$ac_link\") >&5 ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f90_v_output" >&5 F90FLAGS=$ac_save_F90FLAGS @@ -3603,7 +3604,7 @@ F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v" ac_save_F90FLAGS=$F90FLAGS F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v" -(eval echo $as_me:3606: \"$ac_link\") >&5 +(eval echo $as_me:3607: \"$ac_link\") >&5 ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f90_v_output" >&5 F90FLAGS=$ac_save_F90FLAGS @@ -4213,8 +4214,8 @@ echo "$as_me:$LINENO: checking whether we are *really* -echo "$as_me:$LINENO: checking whether we are *really* using gcc" >&5 -echo $ECHO_N "checking whether we are *really* using gcc... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether we are *really* using GNU cc" >&5 +echo $ECHO_N "checking whether we are *really* using GNU cc... $ECHO_C" >&6 if test "${ac_cv_prog_really_gcc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4683,8 +4684,8 @@ echo "$as_me:$LINENO: checking whether we are *really* -echo "$as_me:$LINENO: checking whether we are *really* using g++" >&5 -echo $ECHO_N "checking whether we are *really* using g++... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether we are *really* using GNU c++" >&5 +echo $ECHO_N "checking whether we are *really* using GNU c++... $ECHO_C" >&6 if test "${ac_cv_prog_really_gxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4751,8 +4752,8 @@ if test "$ac_test_CXXFLAGS" != "set"; then if test "$CXX" = xlC; then CXXFLAGS="-O3 -qtune=auto -qansialias -w" echo "*******************************************************" - echo "* You have AIX on an unknown powerpc system. It is *" - echo "* recommended that you use *" + echo "* You have Darwin on an unknown powerpc system. *" + echo "* It is recommended that you use *" echo "* *" echo "* CXXFLAGS=-O3 -qarch=ppc -qtune=xxx -qansialias -w *" echo "* ^^^ *" @@ -5871,7 +5872,7 @@ echo $ECHO_N "checking for mpi-inc-directory... $ECHO_ echo "$as_me:$LINENO: checking for mpi-inc-directory" >&5 echo $ECHO_N "checking for mpi-inc-directory... $ECHO_C" >&6 -# Check whether --with-mpi_inc or --without-mpi_inc was given. +# Check whether --with-mpi-inc or --without-mpi-inc was given. if test "${with_mpi_inc+set}" = set; then withval="$with_mpi_inc" MPI_INC="$withval" @@ -5882,55 +5883,357 @@ echo "${ECHO_T}$MPI_INC" >&6 echo "${ECHO_T}$MPI_INC" >&6 +echo "$as_me:$LINENO: checking for mpi.h" >&5 +echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6 +HAVE_MPIDOTH_C="no" +echo '#include ' > conftest.cc +if test -z "`${CXX} -I${MPI_INC} -c conftest.cc 2>&1`"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + HAVE_MPIDOTH_C="yes" +else + echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5 +echo "${ECHO_T}no! Check MPI include paths" >&6 +fi +rm -f conftest* -echo "$as_me:$LINENO: checking for MPI library" >&5 -echo $ECHO_N "checking for MPI library... $ECHO_C" >&6 -MPI_LIB="" -case "$host" in - *-ibm-aix*) - echo "$as_me:$LINENO: checking whether to use signal-based MPI library" >&5 -echo $ECHO_N "checking whether to use signal-based MPI library... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $PACX_SIGNAL" >&5 -echo "${ECHO_T}$PACX_SIGNAL" >&6 - if test "x$PACX_SIGNAL" = "xyes" ; then - if test -f "$MPI_LIBDIR/libmpi.a" ; then - MPI_LIB="-lmpi" - elif test -f "$MPI_LIBDIR/libmpi.so" ; then - MPI_LIB="-lmpi" - elif test -f "$MPI_LIBDIR/libmpich.a" ; then - MPI_LIB="-lmpich" - else - { { echo "$as_me:$LINENO: error: neither libmpi nor libmpich found; check path for MPI package first..." >&5 -echo "$as_me: error: neither libmpi nor libmpich found; check path for MPI package first..." >&2;} - { (exit 1); exit 1; }; } - fi - else - if test -f "$MPI_LIBDIR/libmpi_r.a" ; then - MPI_LIB="-lmpi_r" - else - { { echo "$as_me:$LINENO: error: libmpi_r not found; check path for MPI package..." >&5 -echo "$as_me: error: libmpi_r not found; check path for MPI package..." >&2;} - { (exit 1); exit 1; }; } - fi - fi - echo "$as_me:$LINENO: result: found $MPI_LIB" >&5 -echo "${ECHO_T}found $MPI_LIB" >&6 - ;; - *) if test -f "$MPI_LIBDIR/libmpich.a" ; then - MPI_LIB="-lmpich" - elif test -f "$MPI_LIBDIR/libmpi.so" ; then - MPI_LIB="-lmpi" - elif test -f "$MPI_LIBDIR/libmpi.a" ; then - MPI_LIB="-lmpi" - else - { { echo "$as_me:$LINENO: error: neither libmpi nor libmpich found; check path for MPI package first..." >&5 -echo "$as_me: error: neither libmpi nor libmpich found; check path for MPI package first..." >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: found $MPI_LIB" >&5 +echo "$as_me:$LINENO: checking whether mpif.h is usable" >&5 +echo $ECHO_N "checking whether mpif.h is usable... $ECHO_C" >&6 +HAVE_MPIFDOTH_F90="no" +rm -f conftest* +cat >conftest.f90 < conftest.out 2>&1 ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + MPI_F90INC="$MPI_INC" + HAVE_MPIFDOTH_F90="yes" +else + if test -s conftest.out ; then cat conftest.out >> config.log ; fi + echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5 +echo "${ECHO_T}no! Check MPI include paths" >&6 +fi +rm -f conftest* + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_save_LDFLAGS=$LDFLAGS +LDFLAGS="${LDFLAGS} -L${MPI_LIBDIR} " + +if test x = x"$MPI_LIB"; then + echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6 +if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpi $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char MPI_Init (); +int +main () +{ +MPI_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mpi_MPI_Init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mpi_MPI_Init=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6 +if test $ac_cv_lib_mpi_MPI_Init = yes; then + MPI_LIB="-lmpi" +fi + +fi +if test x = x"$MPI_LIB"; then + echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6 +if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpich $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char MPI_Init (); +int +main () +{ +MPI_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mpich_MPI_Init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mpich_MPI_Init=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6 +if test $ac_cv_lib_mpich_MPI_Init = yes; then + MPI_LIB="-lmpich" +fi + +fi +$as_unset ac_cv_lib_mpi_MPI_Init +if test x = x"$MPI_LIB"; then + echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6 +if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpi "-llam" $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char MPI_Init (); +int +main () +{ +MPI_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mpi_MPI_Init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mpi_MPI_Init=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6 +if test $ac_cv_lib_mpi_MPI_Init = yes; then + MPI_LIB="-lmpi -llam" +fi + +fi + +$as_unset ac_cv_lib_mpi_MPI_Init +if test x = x"$MPI_LIB"; then + echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6 +if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpi -llam -lpthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char MPI_Init (); +int +main () +{ +MPI_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mpi_MPI_Init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mpi_MPI_Init=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6 +if test $ac_cv_lib_mpi_MPI_Init = yes; then + MPI_LIB="-lmpi -llam -lpthread" +else + { { echo "$as_me:$LINENO: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&5 +echo "$as_me: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&2;} + { (exit 1); exit 1; }; } +fi + +fi + +echo "$as_me:$LINENO: result: found $MPI_LIB" >&5 echo "${ECHO_T}found $MPI_LIB" >&6 - ;; -esac + + +echo "$as_me:$LINENO: checking for MPI Fortran library" >&5 +echo $ECHO_N "checking for MPI Fortran library... $ECHO_C" >&6 +MPI_F90LIB="" +if test -f "$MPI_LIBDIR/libfmpich.a" ; then + MPI_F90LIB="-lfmpich" +elif test -f "$MPI_LIBDIR/liblamf77mpi.a" ; then + MPI_F90LIB="-llamf77mpi" +else + # nothing special found, we'll assume that the C library is all we need + MPI_F90LIB=" " +fi +echo "$as_me:$LINENO: result: found $MPI_F90LIB" >&5 +echo "${ECHO_T}found $MPI_F90LIB" >&6 + @@ -6713,10 +7016,11 @@ fi CPPFLAGS=$ac_save_CPPFLAGS LDFLAGS=$ac_save_LDFLAGS - ac_ext=f90 -ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5' -ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f90_compiler_gnu + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu if test x_$HAVE_SPRNG != x_yes; then @@ -6737,7 +7041,7 @@ echo "${ECHO_T}yes" >&6 withval="$with_mkl" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - for dir in $withval /usr/local/intel/mkl60 /opt/intel/mkl60; do + for dir in $withval /usr/local/intel/mkl61 /opt/intel/mkl61; do mkldir="$dir" if test -f "$dir/include/mkl.h"; then found_mkl="yes"; @@ -6981,10 +7285,11 @@ fi CPPFLAGS=$ac_save_CPPFLAGS LDFLAGS=$ac_save_LDFLAGS - ac_ext=f90 -ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5' -ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f90_compiler_gnu + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu if test x_$HAVE_MKL != x_yes; then @@ -7746,7 +8051,9 @@ s,@MPI_LIB@,$MPI_LIB,;t t s,@mpi@,$mpi,;t t s,@MPI_LIBDIR@,$MPI_LIBDIR,;t t s,@MPI_INC@,$MPI_INC,;t t +s,@MPI_F90INC@,$MPI_F90INC,;t t s,@MPI_LIB@,$MPI_LIB,;t t +s,@MPI_F90LIB@,$MPI_F90LIB,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@SPRNG_LIBDIR@,$SPRNG_LIBDIR,;t t