--- trunk/OOPSE/ac-tools/configure.in	2003/09/05 21:28:52	747
+++ trunk/OOPSE/ac-tools/configure.in	2003/09/29 21:16:11	790
@@ -59,22 +59,22 @@ AC_ARG_WITH(MPI_DIR,
 AC_SUBST(F90_FUNC_)
 
 AC_MSG_CHECKING([for mpi-directory])
-AC_ARG_WITH(MPI_DIR,
-	      [  --with-mpi-dir=MPIDIR   give the path for MPI [/usr/local]],
+AC_ARG_WITH(mpi_dir,
+	      [  --with-mpi_dir=MPIDIR   give the path for MPI [/usr/local]],
 	        MPI_DIR="$withval", MPI_DIR="/usr/local")
 AC_MSG_RESULT([$MPI_DIR])
-AC_SUBST([MPI_DIR])
+AC_SUBST([mpi_dir])
 
 AC_MSG_CHECKING([for mpi-lib-directory])
-AC_ARG_WITH(MPI_LIBDIR,
-	      [  --with-mpi-lib-dir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
+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=dir  give the path for MPI-include-files [MPI_DIR/include]],
+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])
@@ -126,14 +126,8 @@ AC_CHECK_MPI_F90MOD
 
 AM_PATH_SPRNG
 CHECK_MKL
-AC_CHECK_MPI_F90MOD
+#AC_CHECK_MPI_F90MOD
 
-case $F90 in
-        ifc) fortran_machine_defs='Linux_ifc_machdep$(O)' ;;
-        *) fortran_machine_defs='' ;;
-esac
-AC_SUBST([fortran_machine_defs])
-
 AC_EXEEXT
 AC_OBJEXT
 OBJEXT=".$OBJEXT"