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 1202 by gezelter, Thu May 27 16:20:36 2004 UTC vs.
Revision 1228 by gezelter, Thu Jun 3 20:02:18 2004 UTC

# Line 123 | Line 123 | AC_MSG_CHECKING([for mpi-directory])
123    exit 1
124   fi
125  
126 < AC_MSG_CHECKING([for mpi-directory])
127 < AC_ARG_WITH(mpi,
128 <              [  --with-mpi=MPIDIR   give the path for MPI [/usr/local]],
129 <                MPI_DIR="$withval", MPI_DIR="/usr/local")
130 < AC_MSG_RESULT([$MPI_DIR])
131 < AC_SUBST([mpi])
132 <
133 < AC_MSG_CHECKING([for mpi-lib-directory])
134 < AC_ARG_WITH(mpi_libdir,
135 <              [  --with-mpi-libdir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
136 <                MPI_LIBDIR="$withval", MPI_LIBDIR="$MPI_DIR/lib")
137 < AC_MSG_RESULT([$MPI_LIBDIR])
138 < AC_SUBST([MPI_LIBDIR])
139 <
140 < AC_MSG_CHECKING([for mpi-inc-directory])
141 < AC_ARG_WITH(mpi-inc,
142 <              [  --with-mpi-inc=dir  give the path for MPI-include-files [MPI_DIR/include]],
143 <                MPI_INC="$withval", MPI_INC="$MPI_DIR/include")
144 < AC_MSG_RESULT([$MPI_INC])
145 < AC_SUBST([MPI_INC])
146 <
147 < AC_MSG_CHECKING([for mpi.h])
148 < HAVE_MPIDOTH_C="no"
149 < echo '#include <mpi.h>' > conftest.cc
150 < if test -z "`${CXX} -I${MPI_INC} -c conftest.cc 2>&1`"; then
151 <  AC_MSG_RESULT(yes)
152 <  HAVE_MPIDOTH_C="yes"
153 < else
154 <  AC_MSG_RESULT(no! Check MPI include paths)
155 < fi
156 < rm -f conftest*
157 <
158 < AC_MSG_CHECKING([whether mpif.h is usable])
159 < HAVE_MPIFDOTH_F90="no"
160 < rm -f conftest*
161 < cat >conftest.f90 <<EOF
162 < program main
163 <  include 'mpif.h'
164 < end
165 < EOF
166 < if $F90 -I$MPI_INC -c conftest.f90 > conftest.out 2>&1 ; then
167 <   AC_MSG_RESULT(yes)
168 <   MPI_F90INC="$MPI_INC"
169 <   HAVE_MPIFDOTH_F90="yes"
170 < else
171 <   if test -s conftest.out ; then cat conftest.out >> config.log ; fi
172 <   AC_MSG_RESULT([no! Check MPI include paths])
173 < fi
174 < rm -f conftest*
175 < AC_SUBST([MPI_F90INC])
176 <
177 < AC_LANG_PUSH(C)
178 < ac_save_LDFLAGS=$LDFLAGS
179 < LDFLAGS="${LDFLAGS} -L${MPI_LIBDIR} "
180 <
181 < if test x = x"$MPI_LIB"; then
182 <   AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi"])
183 < fi
184 < if test x = x"$MPI_LIB"; then
185 <   AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lmpich"])
186 < fi
187 < $as_unset ac_cv_lib_mpi_MPI_Init
188 < if test x = x"$MPI_LIB"; then
189 <   AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
190 <                "-llam")
191 < fi
192 <
193 < $as_unset ac_cv_lib_mpi_MPI_Init
194 < if test x = x"$MPI_LIB"; then
195 <   AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam -lpthread"],
196 <                [AC_MSG_ERROR([Didn't find liblam, libmpi, or libmpich; check path for MPI package first...])],
197 <                [-llam -lpthread])
198 < fi
199 <
200 < AC_MSG_RESULT(found $MPI_LIB)
201 < AC_SUBST(MPI_LIB)
202 <
203 < AC_MSG_CHECKING([for MPI Fortran library])
204 < MPI_F90LIB=""
205 < if test -f "$MPI_LIBDIR/libfmpich.a" ; then
206 <  MPI_F90LIB="-lfmpich"
207 < elif test -f "$MPI_LIBDIR/liblamf77mpi.a" ; then
208 <  MPI_F90LIB="-llamf77mpi"
209 < else
210 <  # nothing special found, we'll assume that the C library is all we need
211 <  MPI_F90LIB="  "
212 < fi
213 < AC_MSG_RESULT([found $MPI_F90LIB])
214 < AC_SUBST(MPI_F90LIB)
215 <
216 < dnl CHECK_MPI
126 > ACX_MPI
127 > dnl AC_MSG_CHECKING([for mpi-directory])
128 > dnl AC_ARG_WITH(mpi,
129 > dnl           [  --with-mpi=MPIDIR   give the path for MPI [/usr/local]],
130 > dnl             MPI_DIR="$withval", MPI_DIR="/usr/local")
131 > dnl AC_MSG_RESULT([$MPI_DIR])
132 > dnl AC_SUBST([mpi])
133  
134 < dnl I don't think this works right now:
134 > dnl AC_MSG_CHECKING([for mpi-lib-directory])
135 > dnl AC_ARG_WITH(mpi_libdir,
136 > dnl           [  --with-mpi-libdir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
137 > dnl             MPI_LIBDIR="$withval", MPI_LIBDIR="$MPI_DIR/lib")
138 > dnl AC_MSG_RESULT([$MPI_LIBDIR])
139 > dnl AC_SUBST([MPI_LIBDIR])
140 > dnl
141 > dnl AC_MSG_CHECKING([for mpi-inc-directory])
142 > dnl AC_ARG_WITH(mpi-inc,
143 > dnl           [  --with-mpi-inc=dir  give the path for MPI-include-files [MPI_DIR/include]],
144 > dnl             MPI_INC="$withval", MPI_INC="$MPI_DIR/include")
145 > dnl AC_MSG_RESULT([$MPI_INC])
146 > dnl AC_SUBST([MPI_INC])
147 > dnl
148 > dnl AC_MSG_CHECKING([for mpi.h])
149 > dnl HAVE_MPIDOTH_C="no"
150 > dnl echo '#include <mpi.h>' > conftest.cc
151 > dnl if test -z "`${CXX} -I${MPI_INC} -c conftest.cc 2>&1`"; then
152 > dnl  AC_MSG_RESULT(yes)
153 > dnl  HAVE_MPIDOTH_C="yes"
154 > dnl else
155 > dnl   AC_MSG_RESULT(no! Check MPI include paths)
156 > dnl fi
157 > dnl rm -f conftest*
158 > dnl
159 > dnl AC_MSG_CHECKING([whether mpif.h is usable])
160 > dnl HAVE_MPIFDOTH_F90="no"
161 > dnl rm -f conftest*
162 > dnl cat >conftest.f90 <<EOF
163 > dnl program main
164 >  dnl include 'mpif.h'
165 > dnl end
166 > dnl EOF
167 > dnl if $F90 -I$MPI_INC -c conftest.f90 > conftest.out 2>&1 ; then
168 >   dnl AC_MSG_RESULT(yes)
169 >   dnl MPI_F90INC="$MPI_INC"
170 >   dnl HAVE_MPIFDOTH_F90="yes"
171 > dnl else
172 >   dnl if test -s conftest.out ; then cat conftest.out >> config.log ; fi
173 >   dnl AC_MSG_RESULT([no! Check MPI include paths])
174 > dnl fi
175 > dnl rm -f conftest*
176 > dnl AC_SUBST([MPI_F90INC])
177 > dnl
178 > dnl AC_LANG_PUSH(C)
179 > dnl ac_save_LDFLAGS=$LDFLAGS
180 > dnl LDFLAGS="${LDFLAGS} -L${MPI_LIBDIR} "
181 > dnl
182 > dnl if test x = x"$MPI_LIB"; then
183 >   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi"])
184 > dnl fi
185 > dnl if test x = x"$MPI_LIB"; then
186 >   dnl AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lmpich"])
187 > dnl fi
188 > dnl $as_unset ac_cv_lib_mpi_MPI_Init
189 > dnl if test x = x"$MPI_LIB"; then
190 >   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
191 >                dnl "-llam")
192 > dnl fi
193 > dnl
194 > dnl $as_unset ac_cv_lib_mpi_MPI_Init
195 > dnl if test x = x"$MPI_LIB"; then
196 >   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam -lpthread"],
197 >                dnl [AC_MSG_ERROR([Didn't find liblam, libmpi, or libmpich; check path for MPI package first...])],
198 >                dnl [-llam -lpthread])
199 > dnl fi
200 > dnl
201 > dnl AC_MSG_RESULT(found $MPI_LIB)
202 > dnl AC_SUBST(MPI_LIB)
203 > dnl
204 > dnl AC_MSG_CHECKING([for MPI Fortran library])
205 > dnl MPI_F90LIB=""
206 > dnl if test -f "$MPI_LIBDIR/libfmpich.a" ; then
207 >  dnl MPI_F90LIB="-lfmpich"
208 > dnl elif test -f "$MPI_LIBDIR/liblamf77mpi.a" ; then
209 >  dnl MPI_F90LIB="-llamf77mpi"
210 > dnl else
211 >  dnl # nothing special found, we'll assume that the C library is all we need
212 >  dnl MPI_F90LIB="  "
213 > dnl fi
214 > dnl AC_MSG_RESULT([found $MPI_F90LIB])
215 > dnl AC_SUBST(MPI_F90LIB)
216 > dnl
217 > dnl dnl CHECK_MPI
218 > dnl
219   dnl ACX_MPI
220  
221   AM_PATH_SPRNG

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines