From 85ef6f2c1d18552c070866c6a3ede6826f97a3fc Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Wed, 25 Oct 2006 21:27:59 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/cxx/Makefile.in     | 4 ++--
 Cantera/src/vec_functions.h | 1 +
 configure                   | 8 +++++---
 configure.in                | 2 ++
 preconfig                   | 2 ++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Cantera/cxx/Makefile.in b/Cantera/cxx/Makefile.in
index cdb2ccd60..7a9a47d1a 100644
--- a/Cantera/cxx/Makefile.in
+++ b/Cantera/cxx/Makefile.in
@@ -27,7 +27,7 @@ all:
           $(INSTALL_TSC) "$${lh}" "../"$(INCDIR) ; \
 	done)
 	cd src;   @MAKE@
-	cd demos; @MAKE@
+#	cd demos; @MAKE@
 
 clean:
 	@(for lh in $(CXX_H) ; do \
@@ -42,7 +42,7 @@ clean:
 
 depends:
 	cd src; @MAKE@ depends
-	cd demos; @MAKE@ depends
+#	cd demos; @MAKE@ depends
 
 install:
 	cd src; @MAKE@ install
diff --git a/Cantera/src/vec_functions.h b/Cantera/src/vec_functions.h
index 0c2b5eb94..5817d189d 100755
--- a/Cantera/src/vec_functions.h
+++ b/Cantera/src/vec_functions.h
@@ -16,6 +16,7 @@
 #define CT_VEC_FUNCTIONS_H
 
 #include "ct_defs.h"
+#include "utilities.h"
 #include <numeric>
 #include <functional>
 #include <algorithm>
diff --git a/configure b/configure
index 369c7fedd..686b86c9e 100755
--- a/configure
+++ b/configure
@@ -2743,6 +2743,8 @@ CVODE_LIBS='-lsundials_cvodes -lsundials_nvecserial'
 IDA_LIBS='-lsundials_ida -lsundials_nvecserial'
 sundials_include='-I'${SUNDIALS_HOME}'/include -I'${SUNDIALS_HOME}'/include/sundials -I'${SUNDIALS_HOME}'/include/cvodes -I'${SUNDIALS_HOME}'/include/ida'
 echo "sundials include directory: " ${sundials_include}
+echo "sundials library directory: " $SUNDIALS_HOME/lib
+python tools/src/sundials_version.py $SUNDIALS_HOME
 fi
 
 if test ${use_sundials} = 0; then
@@ -8551,7 +8553,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:8554:" \
+echo "$as_me:8556:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8754,7 +8756,7 @@ _ACEOF
 # flags.
 ac_save_FFLAGS=$FFLAGS
 FFLAGS="$FFLAGS $ac_verb"
-(eval echo $as_me:8757: \"$ac_link\") >&5
+(eval echo $as_me:8759: \"$ac_link\") >&5
 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_f77_v_output" >&5
 FFLAGS=$ac_save_FFLAGS
@@ -8832,7 +8834,7 @@ _ACEOF
 # flags.
 ac_save_FFLAGS=$FFLAGS
 FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
-(eval echo $as_me:8835: \"$ac_link\") >&5
+(eval echo $as_me:8837: \"$ac_link\") >&5
 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_f77_v_output" >&5
 FFLAGS=$ac_save_FFLAGS
diff --git a/configure.in b/configure.in
index a51f93aea..cc5d10202 100755
--- a/configure.in
+++ b/configure.in
@@ -322,6 +322,8 @@ CVODE_LIBS='-lsundials_cvodes -lsundials_nvecserial'
 IDA_LIBS='-lsundials_ida -lsundials_nvecserial' 
 sundials_include='-I'${SUNDIALS_HOME}'/include -I'${SUNDIALS_HOME}'/include/sundials -I'${SUNDIALS_HOME}'/include/cvodes -I'${SUNDIALS_HOME}'/include/ida'
 echo "sundials include directory: " ${sundials_include}
+echo "sundials library directory: " $SUNDIALS_HOME/lib
+python tools/src/sundials_version.py $SUNDIALS_HOME
 fi
 
 if test ${use_sundials} = 0; then
diff --git a/preconfig b/preconfig
index ff02c62ef..0759ff71a 100755
--- a/preconfig
+++ b/preconfig
@@ -252,6 +252,7 @@ ENABLE_TPX='y'
 #
 USE_SUNDIALS=${USE_SUNDIALS:='default'}
 SUNDIALS_HOME=${SUNDIALS_HOME:=/usr/local/sundials}
+#SUNDIALS_VERSION=${SUNDIALS_VERSION:='2.2.0'}
 
 #----------------------------------------------------------------- 
 #         BLAS and LAPACK
@@ -457,6 +458,7 @@ export NUMARRAY_HOME
 export CANTERA_PYTHON_HOME
 export USE_SUNDIALS
 export SUNDIALS_HOME
+export SUNDIALS_VERSION
 
 export WITH_LATTICE_SOLID
 export WITH_METAL