--- trunk/OOPSE/configure 2003/09/29 22:05:56 791
+++ trunk/OOPSE/configure 2003/10/24 17:36:02 816
@@ -879,8 +879,8 @@ Optional Packages:
--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=PREFIX SPRNG library directory
- --with-sprng_include_prefix=PREFIX
+ --with-sprng-libdir=PREFIX SPRNG library directory
+ --with-sprng-include=PREFIX
SPRNG include directory
--with-mkl Do we want MKL will check /usr/local/intel/mkl60 /opt/intel/mkl60
--with-mpi_f90_mods=
@@ -2995,7 +2995,7 @@ if test -n "$ac_tool_prefix"; then
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC icpc icc xlC g++ c++
+ for ac_prog in $CCC icpc icc xlC CC g++ c++
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3037,7 +3037,7 @@ if test -z "$CXX"; then
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in $CCC icpc icc xlC g++ c++
+ for ac_prog in $CCC icpc icc xlC CC g++ c++
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3883,7 +3883,7 @@ if test "$ac_test_F90FLAGS" != "set"; then
# Try to determine "good" native compiler flags if none specified on command
# line
-if test "$ac_test_F90FLAGS" != "set"; then
+if test x"$F90FLAGS" == x ; then
F90FLAGS=""
case "${host_cpu}-${host_os}" in
@@ -6139,33 +6139,33 @@ fi;
sprng_prefix="/usr/local"
fi;
-# Check whether --with-sprng_lib_prefix or --without-sprng_lib_prefix was given.
-if test "${with_sprng_lib_prefix+set}" = set; then
- withval="$with_sprng_lib_prefix"
- sprng_lib_prefix="$withval"
+# Check whether --with-sprng-libdir or --without-sprng-libdir was given.
+if test "${with_sprng_libdir+set}" = set; then
+ withval="$with_sprng_libdir"
+ sprng_libdir="$withval"
else
- sprng_lib_prefix="/usr/local/lib"
+ sprng_libdir="/usr/local/lib"
fi;
-# Check whether --with-sprng_include_prefix or --without-sprng_include_prefix was given.
-if test "${with_sprng_include_prefix+set}" = set; then
- withval="$with_sprng_include_prefix"
- sprng_include_prefix="$withval"
+# Check whether --with-sprng-include or --without-sprng-include was given.
+if test "${with_sprng_include+set}" = set; then
+ withval="$with_sprng_include"
+ sprng_include="$withval"
else
- sprng_include_prefix="/usr/local/include/sprng"
+ sprng_include="/usr/local/include/sprng"
fi;
- if test x$sprng_lib_prefix = x ; then
- sprng_lib_prefix=${sprng_prefix}/lib
+ if test x$sprng_libdir = x ; then
+ sprng_libdir=${sprng_prefix}/lib
fi
- if test x$sprng_include_prefix = x ; then
- sprng_include_prefix=${sprng_prefix}/include
+ if test x$sprng_include = x ; then
+ sprng_include=${sprng_prefix}/include
fi
- echo "$as_me:$LINENO: checking for SPRNG include files in $sprng_include_prefix" >&5
-echo $ECHO_N "checking for SPRNG include files in $sprng_include_prefix... $ECHO_C" >&6
- if test -f ${sprng_include_prefix}/sprng.h; then
+ echo "$as_me:$LINENO: checking for SPRNG include files in $sprng_include" >&5
+echo $ECHO_N "checking for SPRNG include files in $sprng_include... $ECHO_C" >&6
+ if test -f ${sprng_include}/sprng.h; then
have_sprngincl=yes
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -6178,9 +6178,9 @@ echo "$as_me: error: Could not locate the SPRNG includ
{ (exit 1); exit 1; }; }
fi
- echo "$as_me:$LINENO: checking for SPRNG libraries in $sprng_lib_prefix" >&5
-echo $ECHO_N "checking for SPRNG libraries in $sprng_lib_prefix... $ECHO_C" >&6
- if test -f ${sprng_lib_prefix}/libsprng.a; then
+ echo "$as_me:$LINENO: checking for SPRNG libraries in $sprng_libdir" >&5
+echo $ECHO_N "checking for SPRNG libraries in $sprng_libdir... $ECHO_C" >&6
+ if test -f ${sprng_libdir}/libsprng.a; then
have_sprnglib=yes
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -6202,9 +6202,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="${CPPFLAGS} -I${sprng_include_prefix}"
+ CPPFLAGS="${CPPFLAGS} -I${sprng_include}"
ac_save_LDFLAGS=$LDFLAGS
- LDFLAGS="${LDFLAGS} -L${sprng_lib_prefix} -lsprng"
+ LDFLAGS="${LDFLAGS} -L${sprng_libdir} -lsprng"
if test "${ac_cv_header_sprng_h+set}" = set; then
echo "$as_me:$LINENO: checking for sprng.h" >&5
echo $ECHO_N "checking for sprng.h... $ECHO_C" >&6
@@ -6391,8 +6391,8 @@ if test $ac_cv_lib_sprng_init_rng = yes; then
echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5
echo "${ECHO_T}$ac_cv_lib_sprng_init_rng" >&6
if test $ac_cv_lib_sprng_init_rng = yes; then
- SPRNG_LIBDIR="${sprng_lib_prefix}"
- SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include_prefix}"
+ SPRNG_LIBDIR="${sprng_libdir}"
+ SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include}"
HAVE_SPRNG="yes"
fi
@@ -6795,15 +6795,16 @@ SUBDIRS="libBASS libmdtools src forceFields samples ut
MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
-SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder"
+SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps"
-#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)
@@ -6838,7 +6839,7 @@ esac
ac_config_headers="$ac_config_headers libmdtools/config.h"
- ac_config_files="$ac_config_files Makefile libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile utils/sysbuilder/Makefile forceFields/Makefile samples/Makefile samples/alkane/Makefile samples/argon/Makefile samples/beadLipid/Makefile samples/lipid/Makefile samples/metals/Makefile samples/water/Makefile"
+ ac_config_files="$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"
cat >confcache <<\_ACEOF
@@ -7373,6 +7374,7 @@ do
"utils/sysbuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/sysbuilder/Makefile" ;;
"forceFields/Makefile" ) CONFIG_FILES="$CONFIG_FILES forceFields/Makefile" ;;
"samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
+ "staticProps/Makefile" ) CONFIG_FILES="$CONFIG_FILES staticProps/Makefile" ;;
"samples/alkane/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/alkane/Makefile" ;;
"samples/argon/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/argon/Makefile" ;;
"samples/beadLipid/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/beadLipid/Makefile" ;;