--- trunk/OOPSE/ac-tools/configure.in	2004/05/27 16:20:36	1202
+++ trunk/OOPSE/ac-tools/configure.in	2004/06/03 20:02:18	1228
@@ -123,99 +123,99 @@ AC_MSG_CHECKING([for mpi-directory])
   exit 1
 fi
 
-AC_MSG_CHECKING([for mpi-directory])
-AC_ARG_WITH(mpi,
-	      [  --with-mpi=MPIDIR   give the path for MPI [/usr/local]],
-	        MPI_DIR="$withval", MPI_DIR="/usr/local")
-AC_MSG_RESULT([$MPI_DIR])
-AC_SUBST([mpi])
-
-AC_MSG_CHECKING([for mpi-lib-directory])
-AC_ARG_WITH(mpi_libdir,
-	      [  --with-mpi-libdir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
-	        MPI_LIBDIR="$withval", MPI_LIBDIR="$MPI_DIR/lib")
-AC_MSG_RESULT([$MPI_LIBDIR])
-AC_SUBST([MPI_LIBDIR])
-
-AC_MSG_CHECKING([for mpi-inc-directory])
-AC_ARG_WITH(mpi-inc,
-	      [  --with-mpi-inc=dir  give the path for MPI-include-files [MPI_DIR/include]],
-	        MPI_INC="$withval", MPI_INC="$MPI_DIR/include")
-AC_MSG_RESULT([$MPI_INC])
-AC_SUBST([MPI_INC])
-
-AC_MSG_CHECKING([for mpi.h])
-HAVE_MPIDOTH_C="no"
-echo '#include <mpi.h>' > conftest.cc
-if test -z "`${CXX} -I${MPI_INC} -c conftest.cc 2>&1`"; then
-  AC_MSG_RESULT(yes)
-  HAVE_MPIDOTH_C="yes"
-else
-  AC_MSG_RESULT(no! Check MPI include paths)
-fi
-rm -f conftest*
-
-AC_MSG_CHECKING([whether mpif.h is usable])
-HAVE_MPIFDOTH_F90="no"
-rm -f conftest*
-cat >conftest.f90 <<EOF
-program main
-  include 'mpif.h'
-end
-EOF
-if $F90 -I$MPI_INC -c conftest.f90 > conftest.out 2>&1 ; then
-   AC_MSG_RESULT(yes)
-   MPI_F90INC="$MPI_INC"
-   HAVE_MPIFDOTH_F90="yes"
-else
-   if test -s conftest.out ; then cat conftest.out >> config.log ; fi
-   AC_MSG_RESULT([no! Check MPI include paths])
-fi
-rm -f conftest*
-AC_SUBST([MPI_F90INC])
-
-AC_LANG_PUSH(C)
-ac_save_LDFLAGS=$LDFLAGS
-LDFLAGS="${LDFLAGS} -L${MPI_LIBDIR} "
-
-if test x = x"$MPI_LIB"; then
-   AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi"])
-fi
-if test x = x"$MPI_LIB"; then
-   AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lmpich"])
-fi
-$as_unset ac_cv_lib_mpi_MPI_Init
-if test x = x"$MPI_LIB"; then
-   AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
-                "-llam")
-fi
-
-$as_unset ac_cv_lib_mpi_MPI_Init
-if test x = x"$MPI_LIB"; then
-   AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam -lpthread"],
-                [AC_MSG_ERROR([Didn't find liblam, libmpi, or libmpich; check path for MPI package first...])],
-                [-llam -lpthread])
-fi
-
-AC_MSG_RESULT(found $MPI_LIB)
-AC_SUBST(MPI_LIB)
-
-AC_MSG_CHECKING([for MPI Fortran library])
-MPI_F90LIB=""
-if test -f "$MPI_LIBDIR/libfmpich.a" ; then
-  MPI_F90LIB="-lfmpich"
-elif test -f "$MPI_LIBDIR/liblamf77mpi.a" ; then
-  MPI_F90LIB="-llamf77mpi"
-else
-  # nothing special found, we'll assume that the C library is all we need
-  MPI_F90LIB="  "
-fi
-AC_MSG_RESULT([found $MPI_F90LIB])
-AC_SUBST(MPI_F90LIB)
-
-dnl CHECK_MPI
+ACX_MPI
+dnl AC_MSG_CHECKING([for mpi-directory])
+dnl AC_ARG_WITH(mpi,
+dnl	      [  --with-mpi=MPIDIR   give the path for MPI [/usr/local]],
+dnl	        MPI_DIR="$withval", MPI_DIR="/usr/local")
+dnl AC_MSG_RESULT([$MPI_DIR])
+dnl AC_SUBST([mpi])
 
-dnl I don't think this works right now:
+dnl AC_MSG_CHECKING([for mpi-lib-directory])
+dnl AC_ARG_WITH(mpi_libdir,
+dnl	      [  --with-mpi-libdir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
+dnl	        MPI_LIBDIR="$withval", MPI_LIBDIR="$MPI_DIR/lib")
+dnl AC_MSG_RESULT([$MPI_LIBDIR])
+dnl AC_SUBST([MPI_LIBDIR])
+dnl 
+dnl AC_MSG_CHECKING([for mpi-inc-directory])
+dnl AC_ARG_WITH(mpi-inc,
+dnl	      [  --with-mpi-inc=dir  give the path for MPI-include-files [MPI_DIR/include]],
+dnl	        MPI_INC="$withval", MPI_INC="$MPI_DIR/include")
+dnl AC_MSG_RESULT([$MPI_INC])
+dnl AC_SUBST([MPI_INC])
+dnl
+dnl AC_MSG_CHECKING([for mpi.h])
+dnl HAVE_MPIDOTH_C="no"
+dnl echo '#include <mpi.h>' > conftest.cc
+dnl if test -z "`${CXX} -I${MPI_INC} -c conftest.cc 2>&1`"; then
+dnl  AC_MSG_RESULT(yes)
+dnl  HAVE_MPIDOTH_C="yes"
+dnl else
+dnl   AC_MSG_RESULT(no! Check MPI include paths)
+dnl fi
+dnl rm -f conftest*
+dnl
+dnl AC_MSG_CHECKING([whether mpif.h is usable])
+dnl HAVE_MPIFDOTH_F90="no"
+dnl rm -f conftest*
+dnl cat >conftest.f90 <<EOF
+dnl program main
+  dnl include 'mpif.h'
+dnl end
+dnl EOF
+dnl if $F90 -I$MPI_INC -c conftest.f90 > conftest.out 2>&1 ; then
+   dnl AC_MSG_RESULT(yes)
+   dnl MPI_F90INC="$MPI_INC"
+   dnl HAVE_MPIFDOTH_F90="yes"
+dnl else
+   dnl if test -s conftest.out ; then cat conftest.out >> config.log ; fi
+   dnl AC_MSG_RESULT([no! Check MPI include paths])
+dnl fi
+dnl rm -f conftest*
+dnl AC_SUBST([MPI_F90INC])
+dnl 
+dnl AC_LANG_PUSH(C)
+dnl ac_save_LDFLAGS=$LDFLAGS
+dnl LDFLAGS="${LDFLAGS} -L${MPI_LIBDIR} "
+dnl 
+dnl if test x = x"$MPI_LIB"; then
+   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi"])
+dnl fi
+dnl if test x = x"$MPI_LIB"; then
+   dnl AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lmpich"])
+dnl fi
+dnl $as_unset ac_cv_lib_mpi_MPI_Init
+dnl if test x = x"$MPI_LIB"; then
+   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
+                dnl "-llam")
+dnl fi
+dnl 
+dnl $as_unset ac_cv_lib_mpi_MPI_Init
+dnl if test x = x"$MPI_LIB"; then
+   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam -lpthread"],
+                dnl [AC_MSG_ERROR([Didn't find liblam, libmpi, or libmpich; check path for MPI package first...])],
+                dnl [-llam -lpthread])
+dnl fi
+dnl 
+dnl AC_MSG_RESULT(found $MPI_LIB)
+dnl AC_SUBST(MPI_LIB)
+dnl 
+dnl AC_MSG_CHECKING([for MPI Fortran library])
+dnl MPI_F90LIB=""
+dnl if test -f "$MPI_LIBDIR/libfmpich.a" ; then
+  dnl MPI_F90LIB="-lfmpich"
+dnl elif test -f "$MPI_LIBDIR/liblamf77mpi.a" ; then
+  dnl MPI_F90LIB="-llamf77mpi"
+dnl else
+  dnl # nothing special found, we'll assume that the C library is all we need
+  dnl MPI_F90LIB="  "
+dnl fi
+dnl AC_MSG_RESULT([found $MPI_F90LIB])
+dnl AC_SUBST(MPI_F90LIB)
+dnl 
+dnl dnl CHECK_MPI
+dnl 
 dnl ACX_MPI
 
 AM_PATH_SPRNG