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 961 by gezelter, Wed May 17 16:10:16 2006 UTC vs.
Revision 1014 by gezelter, Wed Jul 26 21:01:33 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 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'
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 1644 | Line 1644 | _ACEOF
1644   #define SINGLE_PRECISION 1
1645   _ACEOF
1646  
1647 <        PRECISION=s
1648 < else
1649 <        PRECISION=d
1647 >        USE_SINGLE_PRECISION=yes
1648 >
1649   fi
1650  
1651   # Checks for programs.
# Line 1656 | 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 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 1698 | 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 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 2212 | 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 2254 | 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 2723 | 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 2765 | 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 2810 | Line 2809 | fi
2809  
2810  
2811   # Provide some information about the compiler.
2812 < echo "$as_me:2813:" \
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 4058 | Line 4057 | FCFLAGS="$FCFLAGS $ac_verb"
4057   # flags.
4058   ac_save_FFLAGS=$FCFLAGS
4059   FCFLAGS="$FCFLAGS $ac_verb"
4060 < (eval echo $as_me:4061: \"$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 4136 | 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:4139: \"$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 4872 | Line 4871 | FCFLAGS="$FCFLAGS $ac_verb"
4871   # flags.
4872   ac_save_FFLAGS=$FCFLAGS
4873   FCFLAGS="$FCFLAGS $ac_verb"
4874 < (eval echo $as_me:4875: \"$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 4950 | 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:4953: \"$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 6149 | Line 6148 | else
6148    withval="$with_fftw"
6149    fftw_dir="$withval"
6150   else
6151 <                fftw_dir="not_set"
6151 >             fftw_dir="not_set"
6152   fi;
6153   if test "$fftw_dir" != "no"; then
6154 <
6155 < if test "$fftw_dir" != "not_set" ; then
6156 <  if test -d "$fftw_dir"
6157 <  then
6158 <    FFTW_HOME="$fftw_dir"
6160 <  else
6161 <    { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
6154 >  if test "$fftw_dir" != "not_set" ; then
6155 >    if test -d "$fftw_dir"; then
6156 >      FFTW_HOME="$fftw_dir"
6157 >    else
6158 >      { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
6159   echo "$as_me: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&2;}
6160 <  fi
6161 < fi
6165 <
6166 < FFTW_HOME=/usr/local
6167 < if test ! -f "${FFTW_HOME}/include/fftw3.h" -o -f "${FFTW_HOME}/include/fftw.h" -o  -f "${FFTW_HOME}/include/dfftw.h"
6168 < then
6160 >      FFTW_HOME=/usr/local
6161 >      if test ! -f "${FFTW_HOME}/include/fftw3.h" -o -f "${FFTW_HOME}/include/fftw.h" -o  -f "${FFTW_HOME}/include/dfftw.h"; then
6162          FFTW_HOME=/usr
6163 < fi
6164 <
6165 < #
6166 < # Locate fftw, if wanted
6167 < #
6168 < if test -n "${FFTW_HOME}"
6169 < then
6170 <        FFTW_OLD_LDFLAGS=$LDFLAGS
6171 <        FFTW_OLD_CPPFLAGS=$LDFLAGS
6172 <        LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
6180 <        CPPFLAGS="$CPPFLAGS -I${FFTW_HOME}/include"
6163 >      fi
6164 >    fi
6165 >    #
6166 >    # Locate fftw, if wanted
6167 >    #
6168 >    if test -n "${FFTW_HOME}"; then
6169 >      FFTW_OLD_LDFLAGS=$LDFLAGS
6170 >      FFTW_OLD_CPPFLAGS=$LDFLAGS
6171 >      LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
6172 >      CPPFLAGS="$CPPFLAGS -I${FFTW_HOME}/include"
6173  
6174  
6175 <        ac_ext=c
6175 >      ac_ext=c
6176   ac_cpp='$CPP $CPPFLAGS'
6177   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6178   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6179   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6180  
6181 <        echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
6181 >      echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
6182   echo $ECHO_N "checking for fftw_execute in -lfftw3... $ECHO_C" >&6
6183   if test "${ac_cv_lib_fftw3_fftw_execute+set}" = set; then
6184    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6264 | Line 6256 | fi
6256    fftw_cv_libfftw3=no
6257   fi
6258  
6259 <        if test "${ac_cv_header_fftw3_h+set}" = set; then
6259 >      if test "${ac_cv_header_fftw3_h+set}" = set; then
6260    echo "$as_me:$LINENO: checking for fftw3.h" >&5
6261   echo $ECHO_N "checking for fftw3.h... $ECHO_C" >&6
6262   if test "${ac_cv_header_fftw3_h+set}" = set; then
# Line 6408 | Line 6400 | fi
6400   fi
6401  
6402  
6403 <        if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"
6404 <        then
6413 <                echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
6403 >      if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"; then
6404 >        echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
6405   echo $ECHO_N "checking for fftwnd_one in -lfftw... $ECHO_C" >&6
6406   if test "${ac_cv_lib_fftw_fftwnd_one+set}" = set; then
6407    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6488 | Line 6479 | fi
6479    fftw_cv_libfftw=no
6480   fi
6481  
6482 <                if test "${ac_cv_header_fftw_h+set}" = set; then
6482 >        if test "${ac_cv_header_fftw_h+set}" = set; then
6483    echo "$as_me:$LINENO: checking for fftw.h" >&5
6484   echo $ECHO_N "checking for fftw.h... $ECHO_C" >&6
6485   if test "${ac_cv_header_fftw_h+set}" = set; then
# Line 6632 | Line 6623 | fi
6623   fi
6624  
6625  
6626 <                if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"
6627 <                then
6637 <                        echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
6626 >        if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"; then
6627 >          echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
6628   echo $ECHO_N "checking for fftwnd_one in -ldfftw... $ECHO_C" >&6
6629   if test "${ac_cv_lib_dfftw_fftwnd_one+set}" = set; then
6630    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6712 | Line 6702 | fi
6702    fftw_cv_libdfftw=no
6703   fi
6704  
6705 <                        if test "${ac_cv_header_dfftw_h+set}" = set; then
6705 >          if test "${ac_cv_header_dfftw_h+set}" = set; then
6706    echo "$as_me:$LINENO: checking for dfftw.h" >&5
6707   echo $ECHO_N "checking for dfftw.h... $ECHO_C" >&6
6708   if test "${ac_cv_header_dfftw_h+set}" = set; then
# Line 6856 | Line 6846 | fi
6846   fi
6847  
6848  
6859 –                fi
6849          fi
6850 <        ac_ext=c
6850 >      fi
6851 >      ac_ext=c
6852   ac_cpp='$CPP $CPPFLAGS'
6853   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6854   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6855   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6856  
6857 +      if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"; then
6858  
6868 –        if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"
6869 –        then
6870 –
6859   cat >>confdefs.h <<\_ACEOF
6860   #define HAVE_FFTW3_H 1
6861   _ACEOF
6862  
6863 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6864 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6865 <                FFTW_LIBS="-lfftw3"
6866 <        else
6867 <        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"
6880 <        then
6863 >        FFTW_INC_DIR="${FFTW_HOME}/include"
6864 >        FFTW_LIB_DIR="${FFTW_HOME}/lib"
6865 >        FFTW_LIBS="-lfftw3"
6866 >      else
6867 >        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"; then
6868  
6869   cat >>confdefs.h <<\_ACEOF
6870   #define HAVE_FFTW_H 1
6871   _ACEOF
6872  
6873 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6874 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6875 <                FFTW_LIBS="-lfftw"
6873 >          FFTW_INC_DIR="${FFTW_HOME}/include"
6874 >          FFTW_LIB_DIR="${FFTW_HOME}/lib"
6875 >          FFTW_LIBS="-lfftw"
6876          else
6877 <        if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"
6891 <        then
6877 >          if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"; then
6878  
6879   cat >>confdefs.h <<\_ACEOF
6880   #define HAVE_DFFTW_H 1
6881   _ACEOF
6882  
6883 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6884 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6885 <                FFTW_LIBS="-ldfftw"
6886 <        else
6887 <                echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
6888 < echo $ECHO_N "checking fftw in ${FFTW_HOME}... $ECHO_C" >&6
6889 <                FFTW_INC_DIR=
6890 <                FFTW_LIB_DIR=
6891 <                FFTW_LIBS=
6892 <                LDFLAGS="$FFTW_OLD_LDFLAGS"
6893 <                CPPFLAGS="$FFTW_OLD_CPPFLAGS"
6894 <                echo "$as_me:$LINENO: result: failed" >&5
6883 >            FFTW_INC_DIR="${FFTW_HOME}/include"
6884 >            FFTW_LIB_DIR="${FFTW_HOME}/lib"
6885 >            FFTW_LIBS="-ldfftw"
6886 >          else
6887 >            echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
6888 > echo $ECHO_N "checking fftw in ${FFTW_HOME}... $ECHO_C" >&6
6889 >            FFTW_INC_DIR=
6890 >            FFTW_LIB_DIR=
6891 >            FFTW_LIBS=
6892 >            LDFLAGS="$FFTW_OLD_LDFLAGS"
6893 >            CPPFLAGS="$FFTW_OLD_CPPFLAGS"
6894 >            echo "$as_me:$LINENO: result: failed" >&5
6895   echo "${ECHO_T}failed" >&6
6896 <        echo ""
6897 <        echo "*********************************************************"
6898 <        echo "* WARNING: Could not find a working FFTW installation   *"
6899 <        echo "* If you need the staticProps program to be able to     *"
6900 <        echo "* compute undulation spectra, be sure to specify a      *"
6901 <        echo "* valid fftw installation with --with-fftw=DIR          *"
6902 <        echo "*                                                       *"
6903 <        echo "* OOPSE will still work without fftw installed.         *"
6904 <        echo "*********************************************************"
6905 <        echo ""
6896 >            echo ""
6897 >            echo "*********************************************************"
6898 >            echo "* WARNING: Could not find a working FFTW installation   *"
6899 >            echo "* If you need the staticProps program to be able to     *"
6900 >            echo "* compute undulation spectra, be sure to specify a      *"
6901 >            echo "* valid fftw installation with --with-fftw=DIR          *"
6902 >            echo "*                                                       *"
6903 >            echo "* OOPSE will still work without fftw installed.         *"
6904 >            echo "*********************************************************"
6905 >            echo ""
6906 >          fi
6907          fi
6908 <        fi
6922 <        fi
6908 >      fi
6909  
6910  
6911  
6912 < fi
6912 >    fi
6913 >  fi
6914   fi
6915  
6916  
# Line 12999 | Line 12986 | MPI_INC_DIR="$MPI/include"
12986   MPI_INC_DIR="$MPI/include"
12987  
12988  
12989 +
12990 + ac_ext=c
12991 + ac_cpp='$CPP $CPPFLAGS'
12992 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
12993 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12994 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
12995  
12996   echo "$as_me:$LINENO: checking for mpi.h" >&5
12997   echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
12998   have_mpi_h=0
12999   rm -f conftest*
13000 < echo '#include <mpi.h>' > conftest.cc
13001 < if ${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1 ; then
13000 > echo '#include <mpi.h>' > conftest.c
13001 > if ${CC} -I${MPI_INC_DIR} -c conftest.c 2>&1 ; then
13002          echo "$as_me:$LINENO: result: yes" >&5
13003   echo "${ECHO_T}yes" >&6
13004          have_mpi_h=1
# Line 13028 | Line 13021 | echo $ECHO_N "checking whether mpif.h is usable... $EC
13021  
13022   echo "$as_me:$LINENO: checking whether mpif.h is usable" >&5
13023   echo $ECHO_N "checking whether mpif.h is usable... $ECHO_C" >&6
13024 +
13025 +
13026 + ac_ext=${FC_SRCEXT-f}
13027 + ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
13028 + ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
13029 + ac_compiler_gnu=$ac_cv_fc_compiler_gnu
13030 +
13031 + ac_save_ext=$ac_ext
13032 + ac_ext=F90
13033 + ac_save_FCFLAGS=$FCFLAGS
13034   have_mpif_h=0
13035   rm -f conftest*
13036   cat >conftest.$ac_ext <<EOF
# Line 13057 | Line 13060 | fi
13060   _ACEOF
13061  
13062   fi
13063 + FCFLAGS=$ac_save_FCFLAGS
13064 + ac_ext=$ac_save_ext
13065 + ac_ext=c
13066 + ac_cpp='$CPP $CPPFLAGS'
13067 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13068 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13069 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
13070  
13071 +
13072   ac_ext=c
13073   ac_cpp='$CPP $CPPFLAGS'
13074   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 13065 | Line 13076 | ac_save_LDFLAGS=$LDFLAGS
13076   ac_compiler_gnu=$ac_cv_c_compiler_gnu
13077  
13078   ac_save_LDFLAGS=$LDFLAGS
13079 < LDFLAGS="${LDFLAGS} -L${MPI_LIB_DIR} "
13079 > LDFLAGS="-L${MPI_LIB_DIR} ${LDFLAGS} "
13080  
13081   if test x = x"$MPI_LIB"; then
13082          echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
# Line 13145 | Line 13156 | fi
13156   fi
13157  
13158   fi
13159 + $as_unset ac_cv_lib_mpich_MPI_Init
13160   if test x = x"$MPI_LIB"; then
13161 <        echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
13162 < echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
13163 < if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
13161 >        echo "$as_me:$LINENO: checking for MPI_Init in -lpmpich" >&5
13162 > echo $ECHO_N "checking for MPI_Init in -lpmpich... $ECHO_C" >&6
13163 > if test "${ac_cv_lib_pmpich_MPI_Init+set}" = set; then
13164    echo $ECHO_N "(cached) $ECHO_C" >&6
13165   else
13166    ac_check_lib_save_LIBS=$LIBS
13167 < LIBS="-lmpi  $LIBS"
13167 > LIBS="-lpmpich -lmpich -lpmpich -lmpich $LIBS"
13168   cat >conftest.$ac_ext <<_ACEOF
13169   /* confdefs.h.  */
13170   _ACEOF
# Line 13205 | Line 13217 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13217    ac_status=$?
13218    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13219    (exit $ac_status); }; }; then
13220 <  ac_cv_lib_mpi_MPI_Init=yes
13220 >  ac_cv_lib_pmpich_MPI_Init=yes
13221   else
13222    echo "$as_me: failed program was:" >&5
13223   sed 's/^/| /' conftest.$ac_ext >&5
13224  
13225 < ac_cv_lib_mpi_MPI_Init=no
13225 > ac_cv_lib_pmpich_MPI_Init=no
13226   fi
13227   rm -f conftest.err conftest.$ac_objext \
13228        conftest$ac_exeext conftest.$ac_ext
13229   LIBS=$ac_check_lib_save_LIBS
13230   fi
13231 < echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
13232 < echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
13233 < if test $ac_cv_lib_mpi_MPI_Init = yes; then
13234 <  MPI_LIB="-lmpi"
13231 > echo "$as_me:$LINENO: result: $ac_cv_lib_pmpich_MPI_Init" >&5
13232 > echo "${ECHO_T}$ac_cv_lib_pmpich_MPI_Init" >&6
13233 > if test $ac_cv_lib_pmpich_MPI_Init = yes; then
13234 >  MPI_LIB="-lpmpich -lmpich -lpmpich -lmpich"
13235   fi
13236  
13237   fi
13226 – $as_unset ac_cv_lib_mpi_MPI_Init
13238   if test x = x"$MPI_LIB"; then
13239          echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
13240   echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
# Line 13231 | Line 13242 | else
13242    echo $ECHO_N "(cached) $ECHO_C" >&6
13243   else
13244    ac_check_lib_save_LIBS=$LIBS
13245 < LIBS="-lmpi "-llam" $LIBS"
13245 > LIBS="-lmpi  $LIBS"
13246   cat >conftest.$ac_ext <<_ACEOF
13247   /* confdefs.h.  */
13248   _ACEOF
# Line 13298 | Line 13309 | if test $ac_cv_lib_mpi_MPI_Init = yes; then
13309   echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
13310   echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
13311   if test $ac_cv_lib_mpi_MPI_Init = yes; then
13312 <  MPI_LIB="-lmpi -llam"
13312 >  MPI_LIB="-lmpi"
13313   fi
13314  
13315   fi
13316 < $as_unset ac_cv_lib_mpich_MPI_Init
13316 > $as_unset ac_cv_lib_mpi_MPI_Init
13317   if test x = x"$MPI_LIB"; then
13318 <        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
13319 < echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
13320 < if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
13318 >        echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
13319 > echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
13320 > if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
13321    echo $ECHO_N "(cached) $ECHO_C" >&6
13322   else
13323    ac_check_lib_save_LIBS=$LIBS
13324 < LIBS="-lmpich "-lpmpich" $LIBS"
13324 > LIBS="-lmpi -llam $LIBS"
13325   cat >conftest.$ac_ext <<_ACEOF
13326   /* confdefs.h.  */
13327   _ACEOF
# Line 13363 | Line 13374 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13374    ac_status=$?
13375    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13376    (exit $ac_status); }; }; then
13377 <  ac_cv_lib_mpich_MPI_Init=yes
13377 >  ac_cv_lib_mpi_MPI_Init=yes
13378   else
13379    echo "$as_me: failed program was:" >&5
13380   sed 's/^/| /' conftest.$ac_ext >&5
13381  
13382 < ac_cv_lib_mpich_MPI_Init=no
13382 > ac_cv_lib_mpi_MPI_Init=no
13383   fi
13384   rm -f conftest.err conftest.$ac_objext \
13385        conftest$ac_exeext conftest.$ac_ext
13386   LIBS=$ac_check_lib_save_LIBS
13387   fi
13388 < echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
13389 < echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
13390 < if test $ac_cv_lib_mpich_MPI_Init = yes; then
13391 <  MPI_LIB="-lpmpich -lmpich"
13388 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
13389 > echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
13390 > if test $ac_cv_lib_mpi_MPI_Init = yes; then
13391 >  MPI_LIB="-lmpi -llam"
13392   fi
13393  
13394   fi
13384 –
13395   $as_unset ac_cv_lib_mpi_MPI_Init
13396   if test x = x"$MPI_LIB"; then
13397   echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
# Line 14096 | Line 14106 | fi
14106  
14107  
14108  
14109 <                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp"
14109 >                                                  ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile src/applications/utilities/affineScale scripts/filepp"
14110  
14111  
14112   cat >confcache <<\_ACEOF
# Line 14630 | Line 14640 | do
14640    "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
14641    "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
14642    "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
14643 +  "src/applications/utilities/affineScale" ) CONFIG_FILES="$CONFIG_FILES src/applications/utilities/affineScale" ;;
14644    "scripts/filepp" ) CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
14645    "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
14646    "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
# Line 14728 | Line 14739 | s,@debug@,$debug,;t t
14739   s,@host_os@,$host_os,;t t
14740   s,@PROGNAME@,$PROGNAME,;t t
14741   s,@debug@,$debug,;t t
14742 + s,@USE_SINGLE_PRECISION@,$USE_SINGLE_PRECISION,;t t
14743   s,@CXX@,$CXX,;t t
14744   s,@CXXFLAGS@,$CXXFLAGS,;t t
14745   s,@LDFLAGS@,$LDFLAGS,;t t
# Line 15038 | Line 15050 | s,@INSTALL@,$ac_INSTALL,;t t
15050  
15051    # Run the commands associated with the file.
15052    case $ac_file in
15053 <    make/Makefile ) chmod 0755 scripts/* ;;
15054 <    src/utils/Makefile ) chmod 0755 scripts/* ;;
15055 <    src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;;
15056 <    scripts/filepp ) chmod 0755 scripts/* ;;
15053 >    make/Makefile ) chmod 0755 scripts/* src/applications/utilities/affineScale ;;
15054 >    src/utils/Makefile ) chmod 0755 scripts/* src/applications/utilities/affineScale ;;
15055 >    src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* src/applications/utilities/affineScale ;;
15056 >    src/applications/utilities/affineScale ) chmod 0755 scripts/* src/applications/utilities/affineScale ;;
15057 >    scripts/filepp ) chmod 0755 scripts/* src/applications/utilities/affineScale ;;
15058    esac
15059   done
15060   _ACEOF

Diff Legend

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