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

Comparing trunk/OOPSE/ac-tools/configure.in (file contents):
Revision 896 by chuckv, Mon Jan 5 22:18:40 2004 UTC vs.
Revision 942 by gezelter, Wed Jan 14 15:49:26 2004 UTC

# Line 34 | Line 34 | dnl If we are not running g++ then we might need some
34  
35   dnl Checks for C++ compiler
36   AC_PROG_CXX([icpc icc xlC CC g++ c++])
37 +
38   dnl If we are not running g++ then we might need some other flags
39   dnl to get the templates compiled correctly
40   OOPSE_TEMPLATE_FLAGS=""
# Line 81 | Line 82 | AC_PROG_F90([ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95
82  
83   dnl Fortran 90 compilation checks are next
84  
85 < AC_PROG_F90([ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
85 > AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
86   dnl Check the flag for Fortran90 preprocessing
87 < dnl ACX_PROG_F90_PREPFLAG
87 > ACX_PROG_F90_PREPFLAG
88   dnl Check to see if a flag is required for preprocessing defines
89   ACX_PROG_F90_PREPDEFFLAG
90   AC_LANG_PUSH(Fortran 90)
# Line 124 | Line 125 | AC_ARG_WITH(mpi_dir,
125   fi
126  
127   AC_MSG_CHECKING([for mpi-directory])
128 < AC_ARG_WITH(mpi_dir,
129 <              [  --with-mpi_dir=MPIDIR   give the path for MPI [/usr/local]],
128 > AC_ARG_WITH(mpi,
129 >              [  --with-mpi=MPIDIR   give the path for MPI [/usr/local]],
130                  MPI_DIR="$withval", MPI_DIR="/usr/local")
131   AC_MSG_RESULT([$MPI_DIR])
132 < AC_SUBST([mpi_dir])
132 > AC_SUBST([mpi])
133  
134   AC_MSG_CHECKING([for mpi-lib-directory])
135   AC_ARG_WITH(mpi_libdir,
# Line 187 | Line 188 | ACX_MPI
188   esac
189   AC_SUBST(MPI_LIB)
190  
191 < ACX_MPI
192 <
192 < AC_CHECK_MPI_F90MOD
191 > dnl I don't think this works right now:
192 > dnl ACX_MPI
193  
194 if test "$HAVE_MPI_MOD" = 1; then
195        AC_DEFINE(MPI_MOD, 1, [have mpi module])
196 else
197        AC_LANG([Fortran 90])
198        AC_CHECK_HEADERS(mpif.h)
199        AC_LANG_RESTORE()
200        AC_DEFINE(MPI_H, 1, [have mpi Fortran header file])
201 fi
202
194   AM_PATH_SPRNG
195   CHECK_MKL
196  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines