--- trunk/OOPSE/configure	2003/09/25 16:42:34	785
+++ trunk/OOPSE/configure	2003/09/25 18:54:34	786
@@ -311,7 +311,7 @@ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME DEBUG build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR F90LIBS F90_FUNC F90_FUNC_ MPI_DIR MPI_LIBDIR MPI_INC MPI_LIB MPIF77 MPIF90 MPILIBS CPP EGREP SPRNG_LIBDIR SPRNG_LIB SPRNG_INC HAVE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL MPI_F90_MODS MPIMODLIBNAME BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME DEBUG build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR F90LIBS F90_FUNC F90_FUNC_ mpi_dir MPI_LIBDIR MPI_INC MPI_LIB MPIF77 MPIF90 MPILIBS CPP EGREP SPRNG_LIBDIR SPRNG_LIB SPRNG_INC HAVE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL MPI_F90_MODS MPIMODLIBNAME BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -874,9 +874,9 @@ Optional Packages:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-mpi-dir=MPIDIR   give the path for MPI /usr/local
-  --with-mpi-lib-dir=dir  give the path for MPI-libraries MPI_DIR/lib
-  --with-mpi-inc-dir=dir  give the path for MPI-include-files MPI_DIR/include
+  --with-mpi_dir=MPIDIR   give the path for MPI /usr/local
+  --with-mpi-libdir=dir  give the path for MPI-libraries MPI_DIR/lib
+  --with-mpi_inc=dir  give the path for MPI-include-files MPI_DIR/include
   --with-sprng-prefix=PREFIX
                           Prefix where SPRNG is installed
   --with-sprng-lib=PREFIX  SPRNG library directory
@@ -5368,9 +5368,9 @@ echo $ECHO_N "checking for mpi-directory... $ECHO_C" >
 echo "$as_me:$LINENO: checking for mpi-directory" >&5
 echo $ECHO_N "checking for mpi-directory... $ECHO_C" >&6
 
-# Check whether --with-MPI_DIR or --without-MPI_DIR was given.
-if test "${with_MPI_DIR+set}" = set; then
-  withval="$with_MPI_DIR"
+# Check whether --with-mpi_dir or --without-mpi_dir was given.
+if test "${with_mpi_dir+set}" = set; then
+  withval="$with_mpi_dir"
   MPI_DIR="$withval"
 else
   MPI_DIR="/usr/local"
@@ -5382,9 +5382,9 @@ echo $ECHO_N "checking for mpi-lib-directory... $ECHO_
 echo "$as_me:$LINENO: checking for mpi-lib-directory" >&5
 echo $ECHO_N "checking for mpi-lib-directory... $ECHO_C" >&6
 
-# Check whether --with-MPI_LIBDIR or --without-MPI_LIBDIR was given.
-if test "${with_MPI_LIBDIR+set}" = set; then
-  withval="$with_MPI_LIBDIR"
+# Check whether --with-mpi_libdir or --without-mpi_libdir was given.
+if test "${with_mpi_libdir+set}" = set; then
+  withval="$with_mpi_libdir"
   MPI_LIBDIR="$withval"
 else
   MPI_LIBDIR="$MPI_DIR/lib"
@@ -5396,9 +5396,9 @@ echo $ECHO_N "checking for mpi-inc-directory... $ECHO_
 echo "$as_me:$LINENO: checking for mpi-inc-directory" >&5
 echo $ECHO_N "checking for mpi-inc-directory... $ECHO_C" >&6
 
-# Check whether --with-MPI_INC or --without-MPI_INC was given.
-if test "${with_MPI_INC+set}" = set; then
-  withval="$with_MPI_INC"
+# Check whether --with-mpi_inc or --without-mpi_inc was given.
+if test "${with_mpi_inc+set}" = set; then
+  withval="$with_mpi_inc"
   MPI_INC="$withval"
 else
   MPI_INC="$MPI_DIR/include"
@@ -7504,7 +7504,7 @@ s,@MPI_DIR@,$MPI_DIR,;t t
 s,@F90LIBS@,$F90LIBS,;t t
 s,@F90_FUNC@,$F90_FUNC,;t t
 s,@F90_FUNC_@,$F90_FUNC_,;t t
-s,@MPI_DIR@,$MPI_DIR,;t t
+s,@mpi_dir@,$mpi_dir,;t t
 s,@MPI_LIBDIR@,$MPI_LIBDIR,;t t
 s,@MPI_INC@,$MPI_INC,;t t
 s,@MPI_LIB@,$MPI_LIB,;t t