--- trunk/OOPSE/ac-tools/configure.in	2003/09/05 21:28:52	747
+++ trunk/OOPSE/ac-tools/configure.in	2003/10/24 17:36:02	816
@@ -31,7 +31,7 @@ AC_PROG_CXX([icpc icc xlC g++ c++])
 dnl Checks for programs.
 AC_PROG_CC([icc xlc gcc cc])
 ACX_PROG_CC_MAXOPT
-AC_PROG_CXX([icpc icc xlC g++ c++])
+AC_PROG_CXX([icpc icc xlC CC g++ c++])
 ACX_PROG_CXX_MAXOPT
 AC_PROG_F90([ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
 ACX_PROG_F90_MAXOPT
@@ -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])
@@ -128,12 +128,6 @@ case $F90 in
 CHECK_MKL
 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"
@@ -159,16 +153,17 @@ 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"
+SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps"
 
 dnl **** Define CFLAGS etc empty to prevent configure from setting them
-#CFLAGS=${CFLAGS-""}
-#CXXFLAGS=${CXXFLAGS-""}
-#CPPFLAGS=${CPPFLAGS-""}
-#FFLAGS=${FFLAGS-""}
-#LDFLAGS=${LDFLAGS-""}
-#OPTIMIZE=${OPTIMIZE-"-O"}
-#DEBUG=${DEBUG-"-g"}
+CFLAGS=${CFLAGS-""}
+CXXFLAGS=${CXXFLAGS-""}
+CPPFLAGS=${CPPFLAGS-""}
+FFLAGS=${FFLAGS-""}
+F90FLAGS=${F90FLAGS-""}
+LDFLAGS=${LDFLAGS-""}
+OPTIMIZE=${OPTIMIZE-"-O"}
+DEBUG=${DEBUG-"-g"}
 
 case $debug in
   true) 
@@ -205,6 +200,7 @@ AC_CONFIG_FILES([Makefile
 AC_CONFIG_FILES([Makefile
 	libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile
 	utils/sysbuilder/Makefile  forceFields/Makefile samples/Makefile
+	staticProps/Makefile
 	samples/alkane/Makefile samples/argon/Makefile
 	samples/beadLipid/Makefile samples/lipid/Makefile
 	samples/metals/Makefile samples/water/Makefile