ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/configure
(Generate patch)

Comparing trunk/OOPSE/configure (file contents):
Revision 791 by mmeineke, Mon Sep 29 22:05:56 2003 UTC vs.
Revision 816 by gezelter, Fri Oct 24 17:36:02 2003 UTC

# Line 879 | Line 879 | Optional Packages:
879    --with-mpi_inc=dir  give the path for MPI-include-files MPI_DIR/include
880    --with-sprng_prefix=PREFIX
881                            Prefix where SPRNG is installed
882 <  --with-sprng_lib_prefix=PREFIX  SPRNG library directory
883 <  --with-sprng_include_prefix=PREFIX
882 >  --with-sprng-libdir=PREFIX  SPRNG library directory
883 >  --with-sprng-include=PREFIX
884                            SPRNG include directory
885    --with-mkl              Do we want MKL will check /usr/local/intel/mkl60 /opt/intel/mkl60
886    --with-mpi_f90_mods=<dir>
# Line 2995 | Line 2995 | if test -n "$ac_tool_prefix"; then
2995   ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2996   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2997   if test -n "$ac_tool_prefix"; then
2998 <  for ac_prog in $CCC icpc icc xlC g++ c++
2998 >  for ac_prog in $CCC icpc icc xlC CC g++ c++
2999    do
3000      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3001   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 3037 | Line 3037 | if test -z "$CXX"; then
3037   fi
3038   if test -z "$CXX"; then
3039    ac_ct_CXX=$CXX
3040 <  for ac_prog in $CCC icpc icc xlC g++ c++
3040 >  for ac_prog in $CCC icpc icc xlC CC g++ c++
3041   do
3042    # Extract the first word of "$ac_prog", so it can be a program name with args.
3043   set dummy $ac_prog; ac_word=$2
# Line 3883 | Line 3883 | if test "$ac_test_F90FLAGS" != "set"; then
3883   # Try to determine "good" native compiler flags if none specified on command
3884   # line
3885  
3886 < if test "$ac_test_F90FLAGS" != "set"; then
3886 > if test x"$F90FLAGS" == x ; then
3887    F90FLAGS=""
3888    case "${host_cpu}-${host_os}" in
3889  
# Line 6139 | Line 6139 | fi;
6139    sprng_prefix="/usr/local"
6140   fi;
6141  
6142 < # Check whether --with-sprng_lib_prefix or --without-sprng_lib_prefix was given.
6143 < if test "${with_sprng_lib_prefix+set}" = set; then
6144 <  withval="$with_sprng_lib_prefix"
6145 <  sprng_lib_prefix="$withval"
6142 > # Check whether --with-sprng-libdir or --without-sprng-libdir was given.
6143 > if test "${with_sprng_libdir+set}" = set; then
6144 >  withval="$with_sprng_libdir"
6145 >  sprng_libdir="$withval"
6146   else
6147 <  sprng_lib_prefix="/usr/local/lib"
6147 >  sprng_libdir="/usr/local/lib"
6148   fi;
6149  
6150 < # Check whether --with-sprng_include_prefix or --without-sprng_include_prefix was given.
6151 < if test "${with_sprng_include_prefix+set}" = set; then
6152 <  withval="$with_sprng_include_prefix"
6153 <  sprng_include_prefix="$withval"
6150 > # Check whether --with-sprng-include or --without-sprng-include was given.
6151 > if test "${with_sprng_include+set}" = set; then
6152 >  withval="$with_sprng_include"
6153 >  sprng_include="$withval"
6154   else
6155 <  sprng_include_prefix="/usr/local/include/sprng"
6155 >  sprng_include="/usr/local/include/sprng"
6156   fi;
6157  
6158 <  if test x$sprng_lib_prefix = x ; then
6159 <    sprng_lib_prefix=${sprng_prefix}/lib
6158 >  if test x$sprng_libdir = x ; then
6159 >    sprng_libdir=${sprng_prefix}/lib
6160    fi
6161  
6162 <  if test x$sprng_include_prefix = x ; then
6163 <    sprng_include_prefix=${sprng_prefix}/include
6162 >  if test x$sprng_include = x ; then
6163 >    sprng_include=${sprng_prefix}/include
6164    fi
6165  
6166 <  echo "$as_me:$LINENO: checking for SPRNG include files in $sprng_include_prefix" >&5
6167 < echo $ECHO_N "checking for SPRNG include files in $sprng_include_prefix... $ECHO_C" >&6
6168 <  if test -f ${sprng_include_prefix}/sprng.h; then
6166 >  echo "$as_me:$LINENO: checking for SPRNG include files in $sprng_include" >&5
6167 > echo $ECHO_N "checking for SPRNG include files in $sprng_include... $ECHO_C" >&6
6168 >  if test -f ${sprng_include}/sprng.h; then
6169      have_sprngincl=yes
6170      echo "$as_me:$LINENO: result: yes" >&5
6171   echo "${ECHO_T}yes" >&6
# Line 6178 | Line 6178 | echo "$as_me: error: Could not locate the SPRNG includ
6178     { (exit 1); exit 1; }; }
6179    fi
6180  
6181 <  echo "$as_me:$LINENO: checking for SPRNG libraries in $sprng_lib_prefix" >&5
6182 < echo $ECHO_N "checking for SPRNG libraries in $sprng_lib_prefix... $ECHO_C" >&6
6183 <  if test -f ${sprng_lib_prefix}/libsprng.a; then
6181 >  echo "$as_me:$LINENO: checking for SPRNG libraries in $sprng_libdir" >&5
6182 > echo $ECHO_N "checking for SPRNG libraries in $sprng_libdir... $ECHO_C" >&6
6183 >  if test -f ${sprng_libdir}/libsprng.a; then
6184      have_sprnglib=yes
6185      echo "$as_me:$LINENO: result: yes" >&5
6186   echo "${ECHO_T}yes" >&6
# Line 6202 | Line 6202 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
6202   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6203  
6204    ac_save_CPPFLAGS=$CPPFLAGS
6205 <  CPPFLAGS="${CPPFLAGS} -I${sprng_include_prefix}"
6205 >  CPPFLAGS="${CPPFLAGS} -I${sprng_include}"
6206    ac_save_LDFLAGS=$LDFLAGS
6207 <  LDFLAGS="${LDFLAGS} -L${sprng_lib_prefix} -lsprng"
6207 >  LDFLAGS="${LDFLAGS} -L${sprng_libdir} -lsprng"
6208    if test "${ac_cv_header_sprng_h+set}" = set; then
6209    echo "$as_me:$LINENO: checking for sprng.h" >&5
6210   echo $ECHO_N "checking for sprng.h... $ECHO_C" >&6
# Line 6391 | Line 6391 | if test $ac_cv_lib_sprng_init_rng = yes; then
6391   echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5
6392   echo "${ECHO_T}$ac_cv_lib_sprng_init_rng" >&6
6393   if test $ac_cv_lib_sprng_init_rng = yes; then
6394 <  SPRNG_LIBDIR="${sprng_lib_prefix}"
6395 <                     SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include_prefix}"
6394 >  SPRNG_LIBDIR="${sprng_libdir}"
6395 >                     SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include}"
6396                       HAVE_SPRNG="yes"
6397   fi
6398  
# Line 6795 | Line 6795 | SUBDIRS="libBASS libmdtools src forceFields samples ut
6795  
6796   MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
6797  
6798 < SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder"
6798 > SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps"
6799  
6800 < #CFLAGS=${CFLAGS-""}
6801 < #CXXFLAGS=${CXXFLAGS-""}
6802 < #CPPFLAGS=${CPPFLAGS-""}
6803 < #FFLAGS=${FFLAGS-""}
6804 < #LDFLAGS=${LDFLAGS-""}
6805 < #OPTIMIZE=${OPTIMIZE-"-O"}
6806 < #DEBUG=${DEBUG-"-g"}
6800 > CFLAGS=${CFLAGS-""}
6801 > CXXFLAGS=${CXXFLAGS-""}
6802 > CPPFLAGS=${CPPFLAGS-""}
6803 > FFLAGS=${FFLAGS-""}
6804 > F90FLAGS=${F90FLAGS-""}
6805 > LDFLAGS=${LDFLAGS-""}
6806 > OPTIMIZE=${OPTIMIZE-"-O"}
6807 > DEBUG=${DEBUG-"-g"}
6808  
6809   case $debug in
6810    true)
# Line 6838 | Line 6839 | esac
6839  
6840            ac_config_headers="$ac_config_headers libmdtools/config.h"
6841  
6842 <                                                                                                                                            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"
6842 >                                                                                                                                                      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"
6843  
6844  
6845   cat >confcache <<\_ACEOF
# Line 7373 | Line 7374 | do
7374    "utils/sysbuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/sysbuilder/Makefile" ;;
7375    "forceFields/Makefile" ) CONFIG_FILES="$CONFIG_FILES forceFields/Makefile" ;;
7376    "samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
7377 +  "staticProps/Makefile" ) CONFIG_FILES="$CONFIG_FILES staticProps/Makefile" ;;
7378    "samples/alkane/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/alkane/Makefile" ;;
7379    "samples/argon/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/argon/Makefile" ;;
7380    "samples/beadLipid/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/beadLipid/Makefile" ;;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines