ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/configure
(Generate patch)

Comparing trunk/configure (file contents):
Revision 957 by gezelter, Tue May 16 20:38:23 2006 UTC vs.
Revision 988 by gezelter, Thu Jun 15 18:38:58 2006 UTC

# Line 312 | Line 312 | ac_includes_default="\
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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os PROGNAME debug CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC FC FCFLAGS ac_ct_FC CPP EGREP LN_S SET_MAKE RANLIB ac_ct_RANLIB PERLINTERP PERL_SHEBANG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PS FCFLAGS_F90 FCFLAGS_SRCEXT PREPDEFFLAG FCLIBS FC_FUNC FC_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES FFTW_INC_DIR FFTW_LIB_DIR FFTW_LIBS LIBOBJS POW_LIB CXXCPP __func__ MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI USE_CGAL CGAL_INC_DIR CGAL_LIB_DIR CGAL_RLIB_DIR CGAL_DEFINES CGAL_CXXFLAGS CGAL_LIBS DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os PROGNAME debug USE_SINGLE_PRECISION CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC FC FCFLAGS ac_ct_FC CPP EGREP LN_S SET_MAKE RANLIB ac_ct_RANLIB PERLINTERP PERL_SHEBANG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PS FCFLAGS_F90 FCFLAGS_SRCEXT PREPDEFFLAG FCLIBS FC_FUNC FC_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES ZLIB_INC_DIR ZLIB_LIB_DIR ZLIB FFTW_INC_DIR FFTW_LIB_DIR FFTW_LIBS LIBOBJS POW_LIB CXXCPP __func__ MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI USE_CGAL CGAL_INC_DIR CGAL_LIB_DIR CGAL_RLIB_DIR CGAL_DEFINES CGAL_CXXFLAGS CGAL_LIBS DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS LTLIBOBJS'
316   ac_subst_files=''
317  
318   # Initialize some variables set by options.
# Line 871 | Line 871 | Optional Features:
871    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
872    --enable-oopse-home=DIR      define oopse home dir PREFIX/oopse
873    --enable-debug          Compile OOPSE in debug mode
874 +  --enable-single         compile OOPSE in single precision
875 +  --enable-float          synonym for --enable-single
876    --enable-doxygen        enable documentation generation with doxygen (auto)
877    --enable-dot            use 'dot' to generate graphs in doxygen (auto)
878    --enable-html-docs      enable HTML generation with doxygen (yes)
# Line 881 | Line 883 | Optional Packages:
883    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
884    --with-perl-shebang     override what perl thinks is the way for the kernel
885                            to start it (seldom needed)
886 <  --with-zlib=DIR root directory path of zlib installation defaults to
887 <                    /usr/local or /usr if not found in /usr/local
886 <  --without-zlib to disable zlib usage completely
886 >  --with-zlib=DIR         root directory path of zlib installation (defaults
887 >                          to /usr/local or /usr if not found in /usr/local)
888    --with-fftw=DIR         root directory path of fftw installation (defaults
889                            to /usr/local or /usr if not found in /usr/local)
890    --with-mpi=<prefix>     compile with MPI installed in <prefix> [default=no]
# Line 1431 | Line 1432 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1432  
1433  
1434  
1435 +
1436   # AC_F90_MODULE_NAMES
1437   # -------------------
1438   #
# Line 1624 | Line 1626 | fi
1626   fi
1627  
1628  
1629 + # Check whether --enable-single or --disable-single was given.
1630 + if test "${enable_single+set}" = set; then
1631 +  enableval="$enable_single"
1632 +  ok=$enableval
1633 + else
1634 +  ok=no
1635 + fi;
1636 + # Check whether --enable-float or --disable-float was given.
1637 + if test "${enable_float+set}" = set; then
1638 +  enableval="$enable_float"
1639 +  ok=$enableval
1640 + fi;
1641 + if test "$ok" = "yes"; then
1642 +
1643 + cat >>confdefs.h <<\_ACEOF
1644 + #define SINGLE_PRECISION 1
1645 + _ACEOF
1646 +
1647 +        USE_SINGLE_PRECISION=yes
1648 +
1649 + fi
1650 +
1651   # Checks for programs.
1652   ac_ext=cc
1653   ac_cpp='$CXXCPP $CPPFLAGS'
# Line 1631 | Line 1655 | if test -n "$ac_tool_prefix"; then
1655   ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1656   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1657   if test -n "$ac_tool_prefix"; then
1658 <  for ac_prog in $CCC icpc icc pgCC pathCC c++ xlc++ xlC g++ CC
1658 >  for ac_prog in $CCC mpicxx icpc icc pathCC pgCC c++ xlc++ xlC g++ CC
1659    do
1660      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1661   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 1673 | Line 1697 | if test -z "$CXX"; then
1697   fi
1698   if test -z "$CXX"; then
1699    ac_ct_CXX=$CXX
1700 <  for ac_prog in $CCC icpc icc pgCC pathCC c++ xlc++ xlC g++ CC
1700 >  for ac_prog in $CCC mpicxx icpc icc pathCC pgCC c++ xlc++ xlC g++ CC
1701   do
1702    # Extract the first word of "$ac_prog", so it can be a program name with args.
1703   set dummy $ac_prog; ac_word=$2
# Line 2187 | Line 2211 | if test -n "$ac_tool_prefix"; then
2211   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2212   ac_compiler_gnu=$ac_cv_c_compiler_gnu
2213   if test -n "$ac_tool_prefix"; then
2214 <  for ac_prog in icc pgcc pathcc cc xlc gcc
2214 >  for ac_prog in mpicc icc pathcc pgcc cc xlc gcc
2215    do
2216      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2217   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 2229 | Line 2253 | if test -z "$CC"; then
2253   fi
2254   if test -z "$CC"; then
2255    ac_ct_CC=$CC
2256 <  for ac_prog in icc pgcc pathcc cc xlc gcc
2256 >  for ac_prog in mpicc icc pathcc pgcc cc xlc gcc
2257   do
2258    # Extract the first word of "$ac_prog", so it can be a program name with args.
2259   set dummy $ac_prog; ac_word=$2
# Line 2698 | Line 2722 | if test -n "$ac_tool_prefix"; then
2722   ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
2723   ac_compiler_gnu=$ac_cv_fc_compiler_gnu
2724   if test -n "$ac_tool_prefix"; then
2725 <  for ac_prog in ifort ifc pgf95 pathf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2725 >  for ac_prog in mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2726    do
2727      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2728   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 2740 | Line 2764 | if test -z "$FC"; then
2764   fi
2765   if test -z "$FC"; then
2766    ac_ct_FC=$FC
2767 <  for ac_prog in ifort ifc pgf95 pathf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2767 >  for ac_prog in mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2768   do
2769    # Extract the first word of "$ac_prog", so it can be a program name with args.
2770   set dummy $ac_prog; ac_word=$2
# Line 2785 | Line 2809 | fi
2809  
2810  
2811   # Provide some information about the compiler.
2812 < echo "$as_me:2788:" \
2812 > echo "$as_me:2812:" \
2813       "checking for Fortran compiler version" >&5
2814   ac_compiler=`set X $ac_compile; echo $2`
2815   { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
# Line 4033 | Line 4057 | FCFLAGS="$FCFLAGS $ac_verb"
4057   # flags.
4058   ac_save_FFLAGS=$FCFLAGS
4059   FCFLAGS="$FCFLAGS $ac_verb"
4060 < (eval echo $as_me:4036: \"$ac_link\") >&5
4060 > (eval echo $as_me:4060: \"$ac_link\") >&5
4061   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4062   echo "$ac_fc_v_output" >&5
4063   FCFLAGS=$ac_save_FFLAGS
# Line 4111 | Line 4135 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4135   # flags.
4136   ac_save_FFLAGS=$FCFLAGS
4137   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4138 < (eval echo $as_me:4114: \"$ac_link\") >&5
4138 > (eval echo $as_me:4138: \"$ac_link\") >&5
4139   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4140   echo "$ac_fc_v_output" >&5
4141   FCFLAGS=$ac_save_FFLAGS
# Line 4847 | Line 4871 | FCFLAGS="$FCFLAGS $ac_verb"
4871   # flags.
4872   ac_save_FFLAGS=$FCFLAGS
4873   FCFLAGS="$FCFLAGS $ac_verb"
4874 < (eval echo $as_me:4850: \"$ac_link\") >&5
4874 > (eval echo $as_me:4874: \"$ac_link\") >&5
4875   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4876   echo "$ac_fc_v_output" >&5
4877   FCFLAGS=$ac_save_FFLAGS
# Line 4925 | Line 4949 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4949   # flags.
4950   ac_save_FFLAGS=$FCFLAGS
4951   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4952 < (eval echo $as_me:4928: \"$ac_link\") >&5
4952 > (eval echo $as_me:4952: \"$ac_link\") >&5
4953   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4954   echo "$ac_fc_v_output" >&5
4955   FCFLAGS=$ac_save_FFLAGS
# Line 5802 | Line 5826 | done
5826   #
5827   # Handle user hints
5828   #
5805 – echo "$as_me:$LINENO: checking if zlib is wanted" >&5
5806 – echo $ECHO_N "checking if zlib is wanted... $ECHO_C" >&6
5829  
5830   # Check whether --with-zlib or --without-zlib was given.
5831   if test "${with_zlib+set}" = set; then
5832    withval="$with_zlib"
5833 <  if test "$withval" != no ; then
5834 <  echo "$as_me:$LINENO: result: yes" >&5
5835 < echo "${ECHO_T}yes" >&6
5836 <  if test -d "$withval"
5833 >  zlib_dir="$withval"
5834 > else
5835 >                zlib_dir="not_set"
5836 > fi;
5837 > if test "$zlib_dir" != "no"; then
5838 >
5839 > if test "$zlib_dir" != "not_set" ; then
5840 >  if test -d "$zlib_dir"
5841    then
5842 <    ZLIB_HOME="$withval"
5842 >    ZLIB_HOME="$zlib_dir"
5843    else
5844 <    { echo "$as_me:$LINENO: WARNING: Sorry, $withval does not exist, checking usual places" >&5
5845 < echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
5844 >    { echo "$as_me:$LINENO: WARNING: Sorry, $zlib_dir does not exist, checking usual places" >&5
5845 > echo "$as_me: WARNING: Sorry, $zlib_dir does not exist, checking usual places" >&2;}
5846    fi
5821 – else
5822 –  echo "$as_me:$LINENO: result: no" >&5
5823 – echo "${ECHO_T}no" >&6
5847   fi
5825 – fi;
5848  
5849   ZLIB_HOME=/usr/local
5850   if test ! -f "${ZLIB_HOME}/include/zlib.h"
# Line 6075 | Line 6097 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
6097   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6098   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6099  
6078 –        if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes"
6079 –        then
6080 –                #
6081 –                # If both library and header were found, use them
6082 –                #
6100  
6101 < echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
6085 < echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6
6086 < if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
6087 <  echo $ECHO_N "(cached) $ECHO_C" >&6
6088 < else
6089 <  ac_check_lib_save_LIBS=$LIBS
6090 < LIBS="-lz  $LIBS"
6091 < cat >conftest.$ac_ext <<_ACEOF
6092 < /* confdefs.h.  */
6093 < _ACEOF
6094 < cat confdefs.h >>conftest.$ac_ext
6095 < cat >>conftest.$ac_ext <<_ACEOF
6096 < /* end confdefs.h.  */
6101 >        if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes"; then
6102  
6103 < /* Override any gcc2 internal prototype to avoid an error.  */
6104 < #ifdef __cplusplus
6100 < extern "C"
6101 < #endif
6102 < /* We use char because int might match the return type of a gcc2
6103 <   builtin and then its argument prototype would still apply.  */
6104 < char inflateEnd ();
6105 < #ifdef FC_DUMMY_MAIN
6106 < #ifndef FC_DUMMY_MAIN_EQ_F77
6107 < #  ifdef __cplusplus
6108 <     extern "C"
6109 < #  endif
6110 <   int FC_DUMMY_MAIN() { return 1; }
6111 < #endif
6112 < #endif
6113 < int
6114 < main ()
6115 < {
6116 < inflateEnd ();
6117 <  ;
6118 <  return 0;
6119 < }
6103 > cat >>confdefs.h <<\_ACEOF
6104 > #define HAVE_ZLIB_H 1
6105   _ACEOF
6121 – rm -f conftest.$ac_objext conftest$ac_exeext
6122 – if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6123 –  (eval $ac_link) 2>conftest.er1
6124 –  ac_status=$?
6125 –  grep -v '^ *+' conftest.er1 >conftest.err
6126 –  rm -f conftest.er1
6127 –  cat conftest.err >&5
6128 –  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6129 –  (exit $ac_status); } &&
6130 –         { ac_try='test -z "$ac_c_werror_flag"
6131 –                         || test ! -s conftest.err'
6132 –  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6133 –  (eval $ac_try) 2>&5
6134 –  ac_status=$?
6135 –  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6136 –  (exit $ac_status); }; } &&
6137 –         { ac_try='test -s conftest$ac_exeext'
6138 –  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6139 –  (eval $ac_try) 2>&5
6140 –  ac_status=$?
6141 –  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6142 –  (exit $ac_status); }; }; then
6143 –  ac_cv_lib_z_inflateEnd=yes
6144 – else
6145 –  echo "$as_me: failed program was:" >&5
6146 – sed 's/^/| /' conftest.$ac_ext >&5
6106  
6107 < ac_cv_lib_z_inflateEnd=no
6108 < fi
6150 < rm -f conftest.err conftest.$ac_objext \
6151 <      conftest$ac_exeext conftest.$ac_ext
6152 < LIBS=$ac_check_lib_save_LIBS
6153 < fi
6154 < echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
6155 < echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6
6156 < if test $ac_cv_lib_z_inflateEnd = yes; then
6157 <  cat >>confdefs.h <<_ACEOF
6107 >
6108 > cat >>confdefs.h <<\_ACEOF
6109   #define HAVE_LIBZ 1
6110   _ACEOF
6111  
6112 <  LIBS="-lz $LIBS"
6113 <
6114 < fi
6164 <
6165 <                echo "$as_me:$LINENO: checking zlib in ${ZLIB_HOME}" >&5
6166 < echo $ECHO_N "checking zlib in ${ZLIB_HOME}... $ECHO_C" >&6
6167 <                echo "$as_me:$LINENO: result: ok" >&5
6168 < echo "${ECHO_T}ok" >&6
6112 >                ZLIB_INC_DIR="${ZLIB_HOME}/include"
6113 >                ZLIB_LIB_DIR="${ZLIB_HOME}/lib"
6114 >                ZLIB="-lz"
6115          else
6170 –                #
6171 –                # If either header or library was not found, revert and bomb
6172 –                #
6116                  echo "$as_me:$LINENO: checking zlib in ${ZLIB_HOME}" >&5
6117   echo $ECHO_N "checking zlib in ${ZLIB_HOME}... $ECHO_C" >&6
6118 +                ZLIB_INC_DIR=
6119 +                ZLIB_LIB_DIR=
6120 +                ZLIB=
6121                  LDFLAGS="$ZLIB_OLD_LDFLAGS"
6122                  CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
6123                  echo "$as_me:$LINENO: result: failed" >&5
6124   echo "${ECHO_T}failed" >&6
6125 <                { { echo "$as_me:$LINENO: error: either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib" >&5
6126 < echo "$as_me: error: either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib" >&2;}
6127 <   { (exit 1); exit 1; }; }
6125 >                echo ""
6126 >                echo "*********************************************************"
6127 >                echo "* WARNING: Could not find a working zlib installation   *"
6128 >                echo "* If you need OOPSE to be able to deal with compressed  *"
6129 >                echo "* trajectory dump files be sure to specify a valid zlib *"
6130 >                echo "* installation with --with-zlib=DIR                     *"
6131 >                echo "*                                                       *"
6132 >                echo "* OOPSE will still work without zlib installed.         *"
6133 >                echo "*********************************************************"
6134 >                echo ""
6135          fi
6183 – fi
6136  
6137 +
6138 +
6139 + fi
6140 + fi
6141  
6142   #
6143   # Handle user hints
# Line 13043 | Line 12999 | MPI_INC_DIR="$MPI/include"
12999  
13000  
13001  
13002 + ac_ext=c
13003 + ac_cpp='$CPP $CPPFLAGS'
13004 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13005 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13006 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
13007 +
13008   echo "$as_me:$LINENO: checking for mpi.h" >&5
13009   echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
13010   have_mpi_h=0
13011   rm -f conftest*
13012 < echo '#include <mpi.h>' > conftest.cc
13013 < if ${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1 ; then
13012 > echo '#include <mpi.h>' > conftest.c
13013 > if ${CC} -I${MPI_INC_DIR} -c conftest.c 2>&1 ; then
13014          echo "$as_me:$LINENO: result: yes" >&5
13015   echo "${ECHO_T}yes" >&6
13016          have_mpi_h=1
# Line 13071 | Line 13033 | echo $ECHO_N "checking whether mpif.h is usable... $EC
13033  
13034   echo "$as_me:$LINENO: checking whether mpif.h is usable" >&5
13035   echo $ECHO_N "checking whether mpif.h is usable... $ECHO_C" >&6
13036 +
13037 +
13038 + ac_ext=${FC_SRCEXT-f}
13039 + ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
13040 + ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
13041 + ac_compiler_gnu=$ac_cv_fc_compiler_gnu
13042 +
13043 + ac_save_ext=$ac_ext
13044 + ac_ext=F90
13045 + ac_save_FCFLAGS=$FCFLAGS
13046   have_mpif_h=0
13047   rm -f conftest*
13048   cat >conftest.$ac_ext <<EOF
# Line 13100 | Line 13072 | fi
13072   _ACEOF
13073  
13074   fi
13075 + FCFLAGS=$ac_save_FCFLAGS
13076 + ac_ext=$ac_save_ext
13077 + ac_ext=c
13078 + ac_cpp='$CPP $CPPFLAGS'
13079 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13080 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13081 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
13082  
13083 +
13084   ac_ext=c
13085   ac_cpp='$CPP $CPPFLAGS'
13086   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 13108 | Line 13088 | ac_save_LDFLAGS=$LDFLAGS
13088   ac_compiler_gnu=$ac_cv_c_compiler_gnu
13089  
13090   ac_save_LDFLAGS=$LDFLAGS
13091 < LDFLAGS="${LDFLAGS} -L${MPI_LIB_DIR} "
13091 > LDFLAGS="-L${MPI_LIB_DIR} ${LDFLAGS} "
13092  
13093   if test x = x"$MPI_LIB"; then
13094          echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
# Line 13188 | Line 13168 | fi
13168   fi
13169  
13170   fi
13171 + $as_unset ac_cv_lib_mpich_MPI_Init
13172   if test x = x"$MPI_LIB"; then
13173 <        echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
13174 < echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
13175 < if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
13173 >        echo "$as_me:$LINENO: checking for MPI_Init in -lpmpich" >&5
13174 > echo $ECHO_N "checking for MPI_Init in -lpmpich... $ECHO_C" >&6
13175 > if test "${ac_cv_lib_pmpich_MPI_Init+set}" = set; then
13176    echo $ECHO_N "(cached) $ECHO_C" >&6
13177   else
13178    ac_check_lib_save_LIBS=$LIBS
13179 < LIBS="-lmpi  $LIBS"
13179 > LIBS="-lpmpich -lmpich -lpmpich -lmpich $LIBS"
13180   cat >conftest.$ac_ext <<_ACEOF
13181   /* confdefs.h.  */
13182   _ACEOF
# Line 13248 | Line 13229 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13229    ac_status=$?
13230    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13231    (exit $ac_status); }; }; then
13232 <  ac_cv_lib_mpi_MPI_Init=yes
13232 >  ac_cv_lib_pmpich_MPI_Init=yes
13233   else
13234    echo "$as_me: failed program was:" >&5
13235   sed 's/^/| /' conftest.$ac_ext >&5
13236  
13237 < ac_cv_lib_mpi_MPI_Init=no
13237 > ac_cv_lib_pmpich_MPI_Init=no
13238   fi
13239   rm -f conftest.err conftest.$ac_objext \
13240        conftest$ac_exeext conftest.$ac_ext
13241   LIBS=$ac_check_lib_save_LIBS
13242   fi
13243 < echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
13244 < echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
13245 < if test $ac_cv_lib_mpi_MPI_Init = yes; then
13246 <  MPI_LIB="-lmpi"
13243 > echo "$as_me:$LINENO: result: $ac_cv_lib_pmpich_MPI_Init" >&5
13244 > echo "${ECHO_T}$ac_cv_lib_pmpich_MPI_Init" >&6
13245 > if test $ac_cv_lib_pmpich_MPI_Init = yes; then
13246 >  MPI_LIB="-lpmpich -lmpich -lpmpich -lmpich"
13247   fi
13248  
13249   fi
13269 – $as_unset ac_cv_lib_mpi_MPI_Init
13250   if test x = x"$MPI_LIB"; then
13251          echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
13252   echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
# Line 13274 | Line 13254 | else
13254    echo $ECHO_N "(cached) $ECHO_C" >&6
13255   else
13256    ac_check_lib_save_LIBS=$LIBS
13257 < LIBS="-lmpi "-llam" $LIBS"
13257 > LIBS="-lmpi  $LIBS"
13258   cat >conftest.$ac_ext <<_ACEOF
13259   /* confdefs.h.  */
13260   _ACEOF
# Line 13341 | Line 13321 | if test $ac_cv_lib_mpi_MPI_Init = yes; then
13321   echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
13322   echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
13323   if test $ac_cv_lib_mpi_MPI_Init = yes; then
13324 <  MPI_LIB="-lmpi -llam"
13324 >  MPI_LIB="-lmpi"
13325   fi
13326  
13327   fi
13328 < $as_unset ac_cv_lib_mpich_MPI_Init
13328 > $as_unset ac_cv_lib_mpi_MPI_Init
13329   if test x = x"$MPI_LIB"; then
13330 <        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
13331 < echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
13332 < if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
13330 >        echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
13331 > echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
13332 > if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
13333    echo $ECHO_N "(cached) $ECHO_C" >&6
13334   else
13335    ac_check_lib_save_LIBS=$LIBS
13336 < LIBS="-lmpich "-lpmpich" $LIBS"
13336 > LIBS="-lmpi -llam $LIBS"
13337   cat >conftest.$ac_ext <<_ACEOF
13338   /* confdefs.h.  */
13339   _ACEOF
# Line 13406 | Line 13386 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13386    ac_status=$?
13387    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13388    (exit $ac_status); }; }; then
13389 <  ac_cv_lib_mpich_MPI_Init=yes
13389 >  ac_cv_lib_mpi_MPI_Init=yes
13390   else
13391    echo "$as_me: failed program was:" >&5
13392   sed 's/^/| /' conftest.$ac_ext >&5
13393  
13394 < ac_cv_lib_mpich_MPI_Init=no
13394 > ac_cv_lib_mpi_MPI_Init=no
13395   fi
13396   rm -f conftest.err conftest.$ac_objext \
13397        conftest$ac_exeext conftest.$ac_ext
13398   LIBS=$ac_check_lib_save_LIBS
13399   fi
13400 < echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
13401 < echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
13402 < if test $ac_cv_lib_mpich_MPI_Init = yes; then
13403 <  MPI_LIB="-lpmpich -lmpich"
13400 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
13401 > echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
13402 > if test $ac_cv_lib_mpi_MPI_Init = yes; then
13403 >  MPI_LIB="-lmpi -llam"
13404   fi
13405  
13406   fi
13427 –
13407   $as_unset ac_cv_lib_mpi_MPI_Init
13408   if test x = x"$MPI_LIB"; then
13409   echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
# Line 14771 | Line 14750 | s,@debug@,$debug,;t t
14750   s,@host_os@,$host_os,;t t
14751   s,@PROGNAME@,$PROGNAME,;t t
14752   s,@debug@,$debug,;t t
14753 + s,@USE_SINGLE_PRECISION@,$USE_SINGLE_PRECISION,;t t
14754   s,@CXX@,$CXX,;t t
14755   s,@CXXFLAGS@,$CXXFLAGS,;t t
14756   s,@LDFLAGS@,$LDFLAGS,;t t
# Line 14808 | Line 14788 | s,@F90_MODULE_NAMES@,$F90_MODULE_NAMES,;t t
14788   s,@MODDIRFLAG@,$MODDIRFLAG,;t t
14789   s,@F90MODINCSPEC@,$F90MODINCSPEC,;t t
14790   s,@F90_MODULE_NAMES@,$F90_MODULE_NAMES,;t t
14791 + s,@ZLIB_INC_DIR@,$ZLIB_INC_DIR,;t t
14792 + s,@ZLIB_LIB_DIR@,$ZLIB_LIB_DIR,;t t
14793 + s,@ZLIB@,$ZLIB,;t t
14794   s,@FFTW_INC_DIR@,$FFTW_INC_DIR,;t t
14795   s,@FFTW_LIB_DIR@,$FFTW_LIB_DIR,;t t
14796   s,@FFTW_LIBS@,$FFTW_LIBS,;t t

Diff Legend

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