From b35121c673a223a29e07b2ae8be3ae22c62b71be Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Mon, 13 Dec 2004 14:42:05 +0000
Subject: [PATCH] misc cleanup

---
 Cantera/src/MultiPhase.h | 12 ++++++------
 config/configure         |  6 +++---
 config/configure.in      |  6 +++---
 configure                |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cantera/src/MultiPhase.h b/Cantera/src/MultiPhase.h
index 2995b472d..704bdce54 100644
--- a/Cantera/src/MultiPhase.h
+++ b/Cantera/src/MultiPhase.h
@@ -168,12 +168,12 @@ namespace Cantera {
         }
 
         /// Return a const reference to phase n.
-        const phase_t& phase(index_t n) const {
-            if (!m_init) init();
-            m_phase[n]->setState_TPX(m_temp, 
-                m_press, m_moleFractions.begin() + m_spstart[n]);
-            return *m_phase[n];
-        }
+        //const phase_t& phase(index_t n) const {
+            //            if (!m_init) init();
+        //  m_phase[n]->setState_TPX(m_temp, 
+        //      m_press, m_moleFractions.begin() + m_spstart[n]);
+        //  return *m_phase[n];
+        //}
 
         /// Moles of species \c k.
         doublereal speciesMoles(index_t k) {
diff --git a/config/configure b/config/configure
index 0e0f2315b..e6c395c26 100755
--- a/config/configure
+++ b/config/configure
@@ -3397,8 +3397,8 @@ echo "${ECHO_T}${has_sstream}" >&6
 #     Fortran
 #---------------------------------
 
-if test -z $build_with_f2c; then
-  ac_ext=f
+# if test -z $build_with_f2c; then
+ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
@@ -3617,7 +3617,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # to procedures that have an underscore in the name
 if test -n "$G77"; then
   FFLAGS=$FFLAGS' -fno-second-underscore'
-fi
+#fi
 
 
 ac_ext=f
diff --git a/config/configure.in b/config/configure.in
index b85139fdf..31384e43a 100755
--- a/config/configure.in
+++ b/config/configure.in
@@ -647,14 +647,14 @@ AC_MSG_RESULT(${has_sstream})
 #     Fortran
 #---------------------------------
 
-if test -z $build_with_f2c; then
-  AC_PROG_F77()
+# if test -z $build_with_f2c; then
+AC_PROG_F77()
 
 # if G77 is defined, then add a flag to turn off adding a second underscore
 # to procedures that have an underscore in the name
 if test -n "$G77"; then
   FFLAGS=$FFLAGS' -fno-second-underscore'
-fi
+#fi
 
 dnl Checks for libraries.
 AC_F77_LIBRARY_LDFLAGS()
diff --git a/configure b/configure
index 145387c41..289712ddf 100755
--- a/configure
+++ b/configure
@@ -361,7 +361,7 @@ CT_SHARED_LIB=${CT_SHARED_LIB:=clib}
 RPFONT=${RPFONT:="Helvetica"}
 
  
-CANTERA_VERSION=${CANTERA_VERSION:="1.5.4"}
+CANTERA_VERSION=${CANTERA_VERSION:="1.5.5"}
 
 
 #-----------------------------------------------------------------------