--- trunk/OOPSE/ac-tools/configure.in	2004/01/14 22:41:34	944
+++ trunk/OOPSE/ac-tools/configure.in	2004/06/04 02:38:23	1233
@@ -32,7 +32,7 @@ AC_PROG_CXX([icpc icc xlC CC g++ c++])
 AC_PROG_CC([icc xlc gcc cc])
 
 dnl Checks for C++ compiler
-AC_PROG_CXX([icpc icc xlC CC g++ c++])
+AC_PROG_CXX([icpc icc xlc++ xlC CC g++ c++])
 
 dnl If we are not running g++ then we might need some other flags
 dnl to get the templates compiled correctly
@@ -123,101 +123,28 @@ 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_HELP_STRING([--with-mpi=<prefix>],
+		[compile with MPI libraries in <prefix> [default=no]])],
+	with_mpi=$withval,
+	with_mpi="no")
 
-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])
+case "x$with_mpi" in
+        xyes | "x")  USE_MPI=yes;;
+        xno) USE_MPI=no ;;
+        *) MPI="$with_mpi"; USE_MPI=yes ;;
+esac
+if test "$USE_MPI" = "yes" -a -z "$with_mpi"; then
+        MPI="/usr/local"
 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"])
+if test "$USE_MPI" = "yes"; then
+	echo "MPI = $MPI"
+        ACX_MPI
 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
+AC_SUBST(USE_MPI)
 
-$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
-
-dnl I don't think this works right now:
-dnl ACX_MPI
-
 AM_PATH_SPRNG
 CHECK_MKL
 
@@ -247,7 +174,7 @@ SUBDIRS="libBASS libmdtools src forceFields samples ut
 MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
 
 dnl **** Final list of subdirs
-SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps third-party"
+SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps third-party "
 
 dnl **** Define CFLAGS etc empty to prevent configure from setting them
 CFLAGS=${CFLAGS-""}
@@ -283,7 +210,7 @@ AC_CONFIG_HEADER([libmdtools/config.h])
 AC_SUBST(LDFLAGS)
 AC_SUBST(PREPFLAG)
 AC_SUBST(PREPDEFFLAG)
-AC_CONFIG_HEADER([libmdtools/config.h])
+AC_CONFIG_HEADER([libBASS/config.h libmdtools/config.h])
 AC_CONFIG_FILES([Makefile
 	libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile
 	utils/sysbuilder/Makefile  forceFields/Makefile samples/Makefile