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

Comparing trunk/OOPSE-4/configure (file contents):
Revision 2768 by gezelter, Wed May 24 18:31:12 2006 UTC vs.
Revision 2926 by gezelter, Fri Jul 7 19:44:54 2006 UTC

# Line 1655 | 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 1697 | 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 2211 | 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 2253 | 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 2722 | 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 2764 | 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 12996 | Line 12996 | MPI_INC_DIR="$MPI/include"
12996   # Set variables...
12997   MPI_LIB_DIR="$MPI/lib"
12998   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 13068 | Line 13074 | ac_ext=cc
13074   fi
13075   FCFLAGS=$ac_save_FCFLAGS
13076   ac_ext=$ac_save_ext
13077 < ac_ext=cc
13078 < ac_cpp='$CXXCPP $CPPFLAGS'
13079 < ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13080 < ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13081 < ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
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
# Line 13082 | Line 13088 | LDFLAGS="${LDFLAGS} -L${MPI_LIB_DIR} "
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 13162 | Line 13168 | if test x = x"$MPI_LIB"; then
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 13222 | 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
13243 – $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 13248 | Line 13254 | LIBS="-lmpi "-llam" $LIBS"
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 13315 | 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 13380 | 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
13401 –
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

Diff Legend

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