From b571729262de078856f8da29d49b7f1130d72e81 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Fri, 11 May 2007 19:29:35 +0000
Subject: [PATCH] bug fixes

---
 Cantera/python/setup.py.in |   7 +-
 configure                  | 300 ++++---------------------------------
 configure.in               |  48 +++---
 ext/math/Makefile.in       |   7 +-
 ext/math/printstring.c     |  10 +-
 preconfig                  |   4 +-
 6 files changed, 76 insertions(+), 300 deletions(-)

diff --git a/Cantera/python/setup.py.in b/Cantera/python/setup.py.in
index 3371ffa59..24374b9dc 100644
--- a/Cantera/python/setup.py.in
+++ b/Cantera/python/setup.py.in
@@ -7,7 +7,10 @@ except:
 libs = []
 platform = sys.platform
 
-flibs = '@FLIBS@'
+flibstr = '@FLIBS@'
+f1 = flibstr.replace('-l', ' ')
+flibs = f1.split()
+
 #linkargs = '@LCXX_FLAGS@'
 
 numarray_incl = "@NUMARRAY_INC_DIR@"
@@ -54,6 +57,8 @@ if platform == "win32":
             "cantera"] + bllist + cvlist + ["ctbase", "ctmath", "tpx"]
 else:
     libs = ["clib"] + locallibs
+    if flibs:
+        libs = libs + flibs
     #libs = ["clib", "zeroD","oneD", "kinetics", "transport",
     #        "equil", "ctnumerics", "converters"] + thermolib + bllist + cvlist + ["ctbase", "ctmath", "tpx", "boost_thread-mt-1_34"]
                                           
diff --git a/configure b/configure
index 842d795e0..083bdf32f 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR BOOST_INCLUDE BOOST_LIB build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED PIC CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 F90 BUILD_F90 F90FLAGS F90BUILDFLAGS precompile_headers FLIBS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR BOOST_INCLUDE BOOST_LIB build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name PIC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F90 BUILD_F90 F90FLAGS F90BUILDFLAGS precompile_headers FLIBS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -777,14 +777,6 @@ ac_env_CXXCPP_set=${CXXCPP+set}
 ac_env_CXXCPP_value=$CXXCPP
 ac_cv_env_CXXCPP_set=${CXXCPP+set}
 ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
 
 #
 # Report the --help message.
@@ -869,8 +861,6 @@ Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -3172,6 +3162,18 @@ fi
 export_name=$target
 
 
+#
+# PIC
+#  Compiler flag for specifying position independent code.
+#  This flag is needed sometimes in the compilation step
+#  for code that will go into a shared library.
+#  If Cantera is used in the Full python installation
+#  mode, this means just about all of Cantera's code
+#  should be position independent.
+#
+if test -z "$PIC"; then PIC='-fPIC'; fi
+
+
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3265,6 +3267,9 @@ precompile_headers=no
 #             statement. AFLAGS are base flags that
 #             get added to compilers and loaders.
 #
+if test -z "$AFLAGS" ; then
+  AFLAGS="$PIC"
+fi
 if test ! -z "$AFLAGS" ; then
   if test -z "$CXXFLAGS" ; then
     CXXFLAGS="$AFLAGS"
@@ -8199,18 +8204,6 @@ _ACEOF
 if test -z "$SHARED"; then SHARED='-shared'; fi
 
 
-#
-# PIC
-#  Compiler flag for specifying position independent code.
-#  This flag is needed sometimes in the compilation step
-#  for code that will go into a shared library.
-#  If Cantera is used in the Full python installation
-#  mode, this means just about all of Cantera's code
-#  should be position independent.
-#
-if test -z "$PIC"; then PIC='-fPIC'; fi
-
-
 CXX_INCLUDES=$BOOST_INCLUDE
 
 #
@@ -8281,242 +8274,7 @@ echo 'checking for a strip symbol command ... ' $HAVE_STRIPSYMBOLS
 #---------------------------------------------------------------------------
 
 #if test x"$build_with_f2c" = "x0"; 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
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-  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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_F77" && break
-done
-
-  F77=$ac_ct_F77
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:8376:" \
-     "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
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_f77_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+#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
@@ -8527,15 +8285,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 # AC_F77_LIBRARY_LDFLAGS()
 
 override_f77_libs=0;
-case $ac_sys_system in
-  Darwin*)  FLIBS='-lSystem'; override_f77_libs=1; SHARED_CTLIB=0;;
-esac
-
-if test $override_f77_libs -gt 0; then
-  echo The Fortran 77 libraries on this platform are not correctly determined by
-  echo the configuration process. They are being manually set to
-  echo     FLIBS = $FLIBS
-fi
+#case $ac_sys_system in
+#  Darwin*)  FLIBS='-lSystem'; override_f77_libs=1; SHARED_CTLIB=0;;
+#esac
+#
+#if test $override_f77_libs -gt 0; then
+#  echo The Fortran 77 libraries on this platform are not correctly determined by
+#  echo the configuration process. They are being manually set to
+#  echo     FLIBS = $FLIBS
+#fi
 
 #fi
 
@@ -8630,6 +8388,7 @@ EOF
     f90type="gfortran"
     f90opts="-fno-second-underscore -I. -I${ct_incdir}"
     f90buildopts="-fno-second-underscore -I."
+    FLIBS="-lgfortran"
   fi
 
   isg95=`grep -c 'G95' f90out`
@@ -9585,6 +9344,7 @@ s,@MATLAB_CMD@,$MATLAB_CMD,;t t
 s,@BUILD_MATLAB@,$BUILD_MATLAB,;t t
 s,@BUILD_CLIB@,$BUILD_CLIB,;t t
 s,@export_name@,$export_name,;t t
+s,@PIC@,$PIC,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
@@ -9595,14 +9355,10 @@ s,@CXXCPP@,$CXXCPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@SOEXT@,$SOEXT,;t t
 s,@SHARED@,$SHARED,;t t
-s,@PIC@,$PIC,;t t
 s,@CXX_INCLUDES@,$CXX_INCLUDES,;t t
 s,@LCXX_FLAGS@,$LCXX_FLAGS,;t t
 s,@LCXX_END_LIBS@,$LCXX_END_LIBS,;t t
 s,@HAVE_STRIPSYMBOLS@,$HAVE_STRIPSYMBOLS,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@F90@,$F90,;t t
 s,@BUILD_F90@,$BUILD_F90,;t t
 s,@F90FLAGS@,$F90FLAGS,;t t
diff --git a/configure.in b/configure.in
index 5a06e1c29..5634fc7ce 100755
--- a/configure.in
+++ b/configure.in
@@ -968,6 +968,18 @@ AC_SUBST(BUILD_CLIB)
 export_name=$target
 AC_SUBST(export_name)
 
+#
+# PIC
+#  Compiler flag for specifying position independent code.
+#  This flag is needed sometimes in the compilation step
+#  for code that will go into a shared library.
+#  If Cantera is used in the Full python installation
+#  mode, this means just about all of Cantera's code
+#  should be position independent.
+#
+if test -z "$PIC"; then PIC='-fPIC'; fi
+AC_SUBST(PIC)
+
 
 dnl Checks for programs.
 AC_PROG_INSTALL
@@ -984,6 +996,9 @@ precompile_headers=no
 #             statement. AFLAGS are base flags that
 #             get added to compilers and loaders. 
 #
+if test -z "$AFLAGS" ; then
+  AFLAGS="$PIC"
+fi
 if test ! -z "$AFLAGS" ; then
   if test -z "$CXXFLAGS" ; then
     CXXFLAGS="$AFLAGS"
@@ -1043,18 +1058,6 @@ AC_SUBST(SOEXT)
 if test -z "$SHARED"; then SHARED='-shared'; fi
 AC_SUBST(SHARED)
 
-#
-# PIC
-#  Compiler flag for specifying position independent code.
-#  This flag is needed sometimes in the compilation step
-#  for code that will go into a shared library.
-#  If Cantera is used in the Full python installation
-#  mode, this means just about all of Cantera's code
-#  should be position independent.
-#
-if test -z "$PIC"; then PIC='-fPIC'; fi
-AC_SUBST(PIC)
-
 CXX_INCLUDES=$BOOST_INCLUDE
 AC_SUBST(CXX_INCLUDES)
 #
@@ -1120,7 +1123,7 @@ AC_SUBST(HAVE_STRIPSYMBOLS)
 #---------------------------------------------------------------------------
 
 #if test x"$build_with_f2c" = "x0"; then
-AC_PROG_F77()
+#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
@@ -1132,15 +1135,15 @@ dnl Checks for libraries.
 # AC_F77_LIBRARY_LDFLAGS()
 
 override_f77_libs=0;
-case $ac_sys_system in
-  Darwin*)  FLIBS='-lSystem'; override_f77_libs=1; SHARED_CTLIB=0;;
-esac
-
-if test $override_f77_libs -gt 0; then
-  echo The Fortran 77 libraries on this platform are not correctly determined by 
-  echo the configuration process. They are being manually set to 
-  echo     FLIBS = $FLIBS
-fi
+#case $ac_sys_system in
+#  Darwin*)  FLIBS='-lSystem'; override_f77_libs=1; SHARED_CTLIB=0;;
+#esac
+#
+#if test $override_f77_libs -gt 0; then
+#  echo The Fortran 77 libraries on this platform are not correctly determined by 
+#  echo the configuration process. They are being manually set to 
+#  echo     FLIBS = $FLIBS
+#fi
 
 #fi
 
@@ -1190,6 +1193,7 @@ EOF
     f90type="gfortran"
     f90opts="-fno-second-underscore -I. -I${ct_incdir}"
     f90buildopts="-fno-second-underscore -I."
+    FLIBS="-lgfortran"
   fi
 
   isg95=`grep -c 'G95' f90out`
diff --git a/ext/math/Makefile.in b/ext/math/Makefile.in
index d11ce1a15..942de35d0 100755
--- a/ext/math/Makefile.in
+++ b/ext/math/Makefile.in
@@ -37,7 +37,8 @@ xerhlt.o \
 xermsg.o \
 xerprn.o \
 xersve.o \
-xgetua.o 
+xgetua.o \
+printstring.o 
 
 SRCS = $(OBJS:.o=.cpp)
 all = $(LIB)
@@ -47,6 +48,10 @@ $(LIB):  $(OBJS)
 ifeq ($(do_ranlib),1)
 	@RANLIB@ $(LIB)
 endif
+
+%.o : %.c
+	@CXX@ -c $< @DEFS@  @CXXFLAGS@ @PIC@ -I../.. $(INCLUDES)
+
 %.o : %.cpp
 	@CXX@ -c $< @DEFS@  @CXXFLAGS@ @PIC@ $(INCLUDES)
 
diff --git a/ext/math/printstring.c b/ext/math/printstring.c
index bf21cc412..fd6476ed7 100644
--- a/ext/math/printstring.c
+++ b/ext/math/printstring.c
@@ -1,5 +1,11 @@
 #include <stdio.h>
-
-void printstring_(char* s) {
+#include "config.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+void printstring_(char* s, ftnlen ls) {
     printf("%s",s);
 }
+#ifdef __cplusplus
+}
+#endif    
diff --git a/preconfig b/preconfig
index 06fe97bf3..c32fdd24d 100755
--- a/preconfig
+++ b/preconfig
@@ -387,11 +387,11 @@ BOOST_THREAD_LIB=${BOOST_THREAD_LIB:="boost_thread-mt-1_34"}
 # fortran compiler, and all fortran compiler parameters below are
 # irrelevant.
 #
-BUILD_WITH_F2C=${BUILD_WITH_F2C:="y"}
+BUILD_WITH_F2C=${BUILD_WITH_F2C:="n"}
 
 # if you are building the external Fortran 77 procedures from the Fortran 
 # source code, enter the compiler here. 
-F77=${F77:=g77}
+F77=${F77:=gfortran}
 
 # Fortran 77 compiler flags. Note that the Fortran compiler flags must be set
 # to produce object code compatible with the C/C++ compiler you are using.