From 6ea7a847abe8e5b0762f30daaa911cc8b117bc0b Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Sun, 20 Apr 2003 04:04:16 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/clib/src/Makefile.in       |  11 +-
 Cantera/matlab/Makefile.in         |  10 +-
 Cantera/python/Makefile.in         |  24 +-
 Cantera/python/setup.py            |   4 +-
 Cantera/src/Makefile.in            |   2 +-
 Cantera/src/converters/Makefile.in |   2 +-
 Cantera/src/oneD/Makefile.in       |   2 +-
 Cantera/src/transport/Makefile.in  |   2 +-
 Cantera/src/zeroD/Makefile.in      |   2 +-
 Makefile.in                        |  16 +-
 config/configure                   | 617 +++++++++++++++++------------
 config/configure.in                |  18 +-
 configure                          |   8 +-
 ext/blas/Makefile.in               |   2 +-
 ext/cvode/Makefile.in              |   8 +-
 ext/lapack/Makefile.in             |   2 +-
 ext/math/Makefile.in               |   2 +-
 ext/recipes/Makefile.in            |   2 +-
 ext/tpx/Makefile.in                |   2 +-
 19 files changed, 428 insertions(+), 308 deletions(-)

diff --git a/Cantera/clib/src/Makefile.in b/Cantera/clib/src/Makefile.in
index 4a8757612..77435b4b4 100755
--- a/Cantera/clib/src/Makefile.in
+++ b/Cantera/clib/src/Makefile.in
@@ -31,7 +31,8 @@ CXX = @CXX@
 EXT_LIBS = -lzeroD -loneD @LOCAL_LIBS@ 
 
 # the directory where the Cantera libraries are located
-CANTERA_LIBDIR=../../../lib
+CANTERA_LIBDIR=@buildlib@
+# ../../../lib
 LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
            $(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
 
@@ -50,20 +51,18 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @CXXFLAGS@
 LIB_NAME=lib@CT_SHARED_LIB@
 
 ifeq ($(shared_ctlib),1)
-CTLIB = ./$(LIB_NAME)@SO@
+CTLIB = @buildlib@/$(LIB_NAME)@SO@
 else
-CTLIB = ./$(LIB_NAME).a
+CTLIB = @buildlib@/$(LIB_NAME).a
 endif
  
 lib: $(OBJS) $(LIB_DEPS)
 	$(RM)     $(CTLIB)
 ifeq ($(shared_ctlib),1)
 	$(CXX) -o $(CTLIB) $(OBJS) $(LCXX_FLAGS) @SHARED@ $(LINK_OPTIONS) $(EXT_LIBS) @LIBS@ $(FORT_LIBS)
-	cp $(CTLIB) ../../../lib
 else
 	@ARCHIVE@ $(CTLIB) $(OBJS) 
-	cp $(CTLIB) ../../../lib
-	ranlib ../../../lib/$(CTLIB) 
+	ranlib $(CTLIB) 
 endif
 
 clean:
diff --git a/Cantera/matlab/Makefile.in b/Cantera/matlab/Makefile.in
index 99e6052f8..d6ed55e14 100644
--- a/Cantera/matlab/Makefile.in
+++ b/Cantera/matlab/Makefile.in
@@ -21,10 +21,14 @@ SRCS = cantera/private/ctmethods.cpp \
        cantera/private/wallmethods.cpp \
        cantera/private/flowdevicemethods.cpp
 
-all: ctmethods.mexmac
+CANTERA_LIBDIR=../../lib
+LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
+           $(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
 
-ctmethods.mexmac: $(SRCS) 
-	@PYTHON_CMD@ setup_matlab.py @ctroot@/lib @CT_SHARED_LIB@ '$(LIBS)'
+all: cantera/ctmethods.@mex_ext@
+
+cantera/ctmethods.@mex_ext@: $(SRCS) $(LIB_DEPS)
+	@PYTHON_CMD@ setup_matlab.py @ctroot@/build/lib @CT_SHARED_LIB@ '$(LIBS)'
 	(@MATLAB_CMD@ -nodesktop -nojvm -nosplash -r setup)
 	rm -f setup.m
 
diff --git a/Cantera/python/Makefile.in b/Cantera/python/Makefile.in
index 1f03fc5c1..d67f1a1cc 100755
--- a/Cantera/python/Makefile.in
+++ b/Cantera/python/Makefile.in
@@ -9,11 +9,29 @@
 #
 ###############################################################
 
-all: refresh
-	@PYTHON_CMD@ setup.py build
+CANTERA_LIBDIR=../../lib
+LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
+           $(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
+SRCS = src/ctphase_methods.cpp \
+      src/ctthermo_methods.cpp \
+      src/ctkinetics_methods.cpp \
+      src/cttransport_methods.cpp \
+      src/ctxml_methods.cpp \
+      src/ctflow_methods.cpp \
+      src/ctfuncs.cpp \
+      src/ctsurf_methods.cpp \
+      src/ctbndry_methods.cpp \
+      src/ctrpath_methods.cpp \
+      src/ctreactor_methods.cpp \
+      src/ctfunc_methods.cpp \
+      src/methods.h
 
-refresh: $(LIB_DEPS)
+all: _build
+
+_build: $(SRCS) $(LIB_DEPS)
 	touch src/pycantera.cpp
+	@PYTHON_CMD@ setup.py build
+	echo 'ok' > _build
 
 install:
 	@PYTHON_CMD@ setup.py install
diff --git a/Cantera/python/setup.py b/Cantera/python/setup.py
index e1c5f35ef..fb2c0aca0 100755
--- a/Cantera/python/setup.py
+++ b/Cantera/python/setup.py
@@ -33,9 +33,9 @@ setup(name="Cantera",
       ext_modules=[
           Extension("Cantera._cantera",
                     ["src/pycantera.cpp"],
-                    include_dirs=["../../include",
+                    include_dirs=["../../build/include",
                                   "src", "../clib/src"],
-                    library_dirs = ["../../lib"], libraries = libs)
+                    library_dirs = ["../../build/lib"], libraries = libs)
           ],
      )
 
diff --git a/Cantera/src/Makefile.in b/Cantera/src/Makefile.in
index 5c1ee70b2..018b796f2 100755
--- a/Cantera/src/Makefile.in
+++ b/Cantera/src/Makefile.in
@@ -86,7 +86,7 @@ flow1D:
 
 CXX_LIBS = @LIBS@
 CXX_INCLUDES = -I.
-CANTERA_LIB = ./libcantera.a
+CANTERA_LIB = @buildlib@/libcantera.a
 
 DEPENDS = $(EVERYTHING:.o=.d)
 
diff --git a/Cantera/src/converters/Makefile.in b/Cantera/src/converters/Makefile.in
index afb64ddbf..2e3deaf7a 100644
--- a/Cantera/src/converters/Makefile.in
+++ b/Cantera/src/converters/Makefile.in
@@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
 OBJS = ck2ctml.o atomicWeightDB.o CKParser.o CKReader.o Reaction.o ckr_utils.o thermoFunctions.o writelog.o
 
 CXX_INCLUDES = -I. -I..
-CONV_LIB = ./libconverters.a
+CONV_LIB = @buildlib@/libconverters.a
 
 DEPENDS = $(OBJS:.o=.d)
 
diff --git a/Cantera/src/oneD/Makefile.in b/Cantera/src/oneD/Makefile.in
index a5bb9de18..6e7b1ab48 100644
--- a/Cantera/src/oneD/Makefile.in
+++ b/Cantera/src/oneD/Makefile.in
@@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
 OBJS    = MultiJac.o MultiNewton.o newton_utils.o OneDim.o StFlow.o
 
 CXX_INCLUDES = -I..
-ONED_LIB = ./liboneD.a
+ONED_LIB = @buildlib@/liboneD.a
 
 DEPENDS = $(OBJS:.o=.d)
 
diff --git a/Cantera/src/transport/Makefile.in b/Cantera/src/transport/Makefile.in
index 7f90fc16b..51c20deab 100644
--- a/Cantera/src/transport/Makefile.in
+++ b/Cantera/src/transport/Makefile.in
@@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
 OBJS    = TransportFactory.o MultiTransport.o MixTransport.o MMCollisionInt.o 
 
 CXX_INCLUDES = -I..
-LIB = ./libtransport.a
+LIB = @buildlib@/libtransport.a
 
 DEPENDS = $(OBJS:.o=.d)
 
diff --git a/Cantera/src/zeroD/Makefile.in b/Cantera/src/zeroD/Makefile.in
index 376426422..e18f2ba8d 100644
--- a/Cantera/src/zeroD/Makefile.in
+++ b/Cantera/src/zeroD/Makefile.in
@@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
 OBJS    = Reactor.o ReactorBase.o FlowDevice.o Wall.o
 
 CXX_INCLUDES = -I..
-ZEROD_LIB = ./libzeroD.a
+ZEROD_LIB = @buildlib@/libzeroD.a
 
 DEPENDS = $(OBJS:.o=.d)
 
diff --git a/Makefile.in b/Makefile.in
index 40f967781..4564cb289 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,37 +17,33 @@ build_matlab = @BUILD_MATLAB@
 LIBDIR=@LIB_DIR@
 
 # removed utils temporarily
-all: kernel movelibs hdr-collect clib python matlab utils
+all: kernel hdr-collect clib python matlab utils
 
 install: hdr-install kernel-install data-install python-install matlab-install tools-install finish-install
 
 demos: example_codes
 
 kernel: info 
-	rm -f lib/*.a
-	rm -f lib/*.so
+	@INSTALL@ -d @buildlib@
+	rm -f @buildlib@/*.a
+	rm -f @buildlib@/*.so
 	cd ext; @MAKE@
 	cd Cantera/src; @MAKE@
 
 clib: 
 	cd Cantera/clib/src; @MAKE@
+	ranlib @buildlib@/*.a
 
 cxxlib: 
 	cd Cantera/cxx; make
 
-movelibs:
-	mv -f Cantera/src/*.a lib
-	mv -f Cantera/src/*/*.a lib
-	mv -f ext/*/*.a lib
-	ranlib lib/*.a
-
 utils:
 	cd tools; @MAKE@
 
 kernel-install:
 	@INSTALL@ -d @prefix@/lib/cantera
 	rm -f @prefix@/lib/cantera/*
-	@INSTALL@ -m 644 lib/*.a @prefix@/lib/cantera
+	@INSTALL@ -m 644 build/lib/*.a @prefix@/lib/cantera
 	cd Cantera/clib/src; make install
 	ranlib @prefix@/lib/cantera/*.a
 
diff --git a/config/configure b/config/configure
index d5aa3053f..b19443525 100755
--- a/config/configure
+++ b/config/configure
@@ -1046,6 +1046,8 @@ test -n "$target_alias" &&
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+buildlib=$ctroot/build/lib
+
 #case "$target" in
 #mips-sgi-irix*.*)
 #  if test -z "$CXX"; then CXX=CC; fi
@@ -1232,13 +1234,103 @@ if test "$BUILD_FORTRAN_90_INTERFACE" = "y"; then BUILD_F90=1; BUILD_CLIB=1; fi
 #     Python Interface
 #
 BUILD_PYTHON=0
-if test "$BUILD_PYTHON_INTERFACE" = "y"; then BUILD_PYTHON=1; BUILD_CLIB=1; fi
+if test -z "$PYTHON_CMD"; then
+  for ac_prog in python2 python
+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:1242: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PYTHON_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PYTHON_CMD in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTHON_CMD="$PYTHON_CMD" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_PYTHON_CMD="$ac_dir/$ac_word"
+   echo "$as_me:1259: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+PYTHON_CMD=$ac_cv_path_PYTHON_CMD
+
+if test -n "$PYTHON_CMD"; then
+  echo "$as_me:1270: result: $PYTHON_CMD" >&5
+echo "${ECHO_T}$PYTHON_CMD" >&6
+else
+  echo "$as_me:1273: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$PYTHON_CMD" && break
+done
+test -n "$PYTHON_CMD" || PYTHON_CMD=""none""
+
+  if test "$PYTHON_CMD" != "none"; then BUILD_PYTHON=1; BUILD_CLIB=1; fi
+fi
+
+#AC_SUBST(PYTHON_CMD)
 
 #
 #     Matlab Interface
 #
 BUILD_MATLAB=0
-if test "$BUILD_MATLAB_TOOLBOX" = "y"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
+if test -z "$MATLAB_CMD"; then
+  # Extract the first word of "matlab", so it can be a program name with args.
+set dummy matlab; ac_word=$2
+echo "$as_me:1293: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MATLAB_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MATLAB_CMD in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MATLAB_CMD="$MATLAB_CMD" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_MATLAB_CMD="$ac_dir/$ac_word"
+   echo "$as_me:1310: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_MATLAB_CMD" && ac_cv_path_MATLAB_CMD=""none""
+  ;;
+esac
+fi
+MATLAB_CMD=$ac_cv_path_MATLAB_CMD
+
+if test -n "$MATLAB_CMD"; then
+  echo "$as_me:1322: result: $MATLAB_CMD" >&5
+echo "${ECHO_T}$MATLAB_CMD" >&6
+else
+  echo "$as_me:1325: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  if test "$MATLAB_CMD" != "none"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
+fi
+#if test "$BUILD_MATLAB_TOOLBOX" = "y"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
+
+# AC_SUBST(MATLAB_CMD)
 
 #-------------------------------------------------
 
@@ -1254,7 +1346,7 @@ if test -n "$ac_tool_prefix"; then
   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:1257: checking for $ac_word" >&5
+echo "$as_me:1349: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1269,7 +1361,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:1272: found $ac_dir/$ac_word" >&5
+echo "$as_me:1364: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1277,10 +1369,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:1280: result: $CXX" >&5
+  echo "$as_me:1372: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:1283: result: no" >&5
+  echo "$as_me:1375: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1293,7 +1385,7 @@ if test -z "$CXX"; then
 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:1296: checking for $ac_word" >&5
+echo "$as_me:1388: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1308,7 +1400,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:1311: found $ac_dir/$ac_word" >&5
+echo "$as_me:1403: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1316,10 +1408,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:1319: result: $ac_ct_CXX" >&5
+  echo "$as_me:1411: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:1322: result: no" >&5
+  echo "$as_me:1414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1331,27 +1423,27 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:1334:" \
+echo "$as_me:1426:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1337: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1429: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1340: \$? = $ac_status" >&5
+  echo "$as_me:1432: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1342: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1434: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1345: \$? = $ac_status" >&5
+  echo "$as_me:1437: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1347: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1439: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1350: \$? = $ac_status" >&5
+  echo "$as_me:1442: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1354 "configure"
+#line 1446 "configure"
 #include "confdefs.h"
 
 int
@@ -1367,13 +1459,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1370: checking for C++ compiler default output" >&5
+echo "$as_me:1462: checking for C++ compiler default output" >&5
 echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1373: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1465: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1376: \$? = $ac_status" >&5
+  echo "$as_me:1468: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1396,34 +1488,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1399: error: C++ compiler cannot create executables" >&5
+{ { echo "$as_me:1491: error: C++ compiler cannot create executables" >&5
 echo "$as_me: error: C++ compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1405: result: $ac_file" >&5
+echo "$as_me:1497: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1410: checking whether the C++ compiler works" >&5
+echo "$as_me:1502: checking whether the C++ compiler works" >&5
 echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1419: \$? = $ac_status" >&5
+  echo "$as_me:1511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1426: error: cannot run C++ compiled programs.
+	{ { echo "$as_me:1518: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1431,24 +1523,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1434: result: yes" >&5
+echo "$as_me:1526: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1441: checking whether we are cross compiling" >&5
+echo "$as_me:1533: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1443: result: $cross_compiling" >&5
+echo "$as_me:1535: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1446: checking for executable suffix" >&5
+echo "$as_me:1538: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1451: \$? = $ac_status" >&5
+  echo "$as_me:1543: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1464,116 +1556,24 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1467: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1559: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1473: result: $ac_cv_exeext" >&5
+echo "$as_me:1565: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1479: checking for object suffix" >&5
+echo "$as_me:1571: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1485 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1497: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:1500: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1512: error: cannot compute OBJEXT: cannot compile" >&5
-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:1519: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:1523: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 1529 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1544: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:1547: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1550: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:1553: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:1565: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:1571: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
 #line 1577 "configure"
 #include "confdefs.h"
 
@@ -1585,17 +1585,109 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
+rm -f conftest.o conftest.obj
 if { (eval echo "$as_me:1589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   echo "$as_me:1592: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1604: error: cannot compute OBJEXT: cannot compile" >&5
+echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:1611: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1615: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1621 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1636: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1598: \$? = $ac_status" >&5
+  echo "$as_me:1645: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:1657: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:1663: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1669 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1684: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1687: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -1605,7 +1697,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1608: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:1700: result: $ac_cv_prog_cxx_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -1632,7 +1724,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1635 "configure"
+#line 1727 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1645,16 +1737,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1740: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1651: \$? = $ac_status" >&5
+  echo "$as_me:1743: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1657: \$? = $ac_status" >&5
+  echo "$as_me:1749: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1664,7 +1756,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1667 "configure"
+#line 1759 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1676,16 +1768,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1682: \$? = $ac_status" >&5
+  echo "$as_me:1774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1688: \$? = $ac_status" >&5
+  echo "$as_me:1780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1715,7 +1807,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1718: checking for $ac_word" >&5
+echo "$as_me:1810: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1730,7 +1822,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1733: found $ac_dir/$ac_word" >&5
+echo "$as_me:1825: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1738,10 +1830,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1741: result: $CC" >&5
+  echo "$as_me:1833: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1744: result: no" >&5
+  echo "$as_me:1836: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1750,7 +1842,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1753: checking for $ac_word" >&5
+echo "$as_me:1845: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1765,7 +1857,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1768: found $ac_dir/$ac_word" >&5
+echo "$as_me:1860: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1773,10 +1865,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1776: result: $ac_ct_CC" >&5
+  echo "$as_me:1868: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1779: result: no" >&5
+  echo "$as_me:1871: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1789,7 +1881,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1792: checking for $ac_word" >&5
+echo "$as_me:1884: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1804,7 +1896,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1807: found $ac_dir/$ac_word" >&5
+echo "$as_me:1899: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1812,10 +1904,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1815: result: $CC" >&5
+  echo "$as_me:1907: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1818: result: no" >&5
+  echo "$as_me:1910: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1824,7 +1916,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1827: checking for $ac_word" >&5
+echo "$as_me:1919: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1839,7 +1931,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1842: found $ac_dir/$ac_word" >&5
+echo "$as_me:1934: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1847,10 +1939,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1850: result: $ac_ct_CC" >&5
+  echo "$as_me:1942: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1853: result: no" >&5
+  echo "$as_me:1945: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1863,7 +1955,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1866: checking for $ac_word" >&5
+echo "$as_me:1958: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1883,7 +1975,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1886: found $ac_dir/$ac_word" >&5
+echo "$as_me:1978: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1905,10 +1997,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1908: result: $CC" >&5
+  echo "$as_me:2000: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1911: result: no" >&5
+  echo "$as_me:2003: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1919,7 +2011,7 @@ if test -z "$CC"; then
   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:1922: checking for $ac_word" >&5
+echo "$as_me:2014: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1934,7 +2026,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1937: found $ac_dir/$ac_word" >&5
+echo "$as_me:2029: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1942,10 +2034,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1945: result: $CC" >&5
+  echo "$as_me:2037: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1948: result: no" >&5
+  echo "$as_me:2040: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1958,7 +2050,7 @@ if test -z "$CC"; then
 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:1961: checking for $ac_word" >&5
+echo "$as_me:2053: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1973,7 +2065,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1976: found $ac_dir/$ac_word" >&5
+echo "$as_me:2068: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1981,10 +2073,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1984: result: $ac_ct_CC" >&5
+  echo "$as_me:2076: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1987: result: no" >&5
+  echo "$as_me:2079: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1996,37 +2088,37 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1999: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:2091: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:2004:" \
+echo "$as_me:2096:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2007: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2099: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2010: \$? = $ac_status" >&5
+  echo "$as_me:2102: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2012: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2104: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2015: \$? = $ac_status" >&5
+  echo "$as_me:2107: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2017: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2109: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2020: \$? = $ac_status" >&5
+  echo "$as_me:2112: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:2023: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2115: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2029 "configure"
+#line 2121 "configure"
 #include "confdefs.h"
 
 int
@@ -2041,16 +2133,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2047: \$? = $ac_status" >&5
+  echo "$as_me:2139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2053: \$? = $ac_status" >&5
+  echo "$as_me:2145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2062,19 +2154,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2065: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2157: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:2071: checking whether $CC accepts -g" >&5
+echo "$as_me:2163: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2077 "configure"
+#line 2169 "configure"
 #include "confdefs.h"
 
 int
@@ -2086,16 +2178,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2181: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2092: \$? = $ac_status" >&5
+  echo "$as_me:2184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2098: \$? = $ac_status" >&5
+  echo "$as_me:2190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2105,7 +2197,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2108: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2200: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2132,16 +2224,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2138: \$? = $ac_status" >&5
+  echo "$as_me:2230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2144: \$? = $ac_status" >&5
+  echo "$as_me:2236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -2153,7 +2245,7 @@ if { (eval echo "$as_me:2135: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2156 "configure"
+#line 2248 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2166,16 +2258,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2172: \$? = $ac_status" >&5
+  echo "$as_me:2264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2178: \$? = $ac_status" >&5
+  echo "$as_me:2270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2185,7 +2277,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2188 "configure"
+#line 2280 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2197,16 +2289,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2203: \$? = $ac_status" >&5
+  echo "$as_me:2295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2209: \$? = $ac_status" >&5
+  echo "$as_me:2301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2245,7 +2337,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2248: checking for a BSD compatible install" >&5
+echo "$as_me:2340: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2294,7 +2386,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2297: result: $INSTALL" >&5
+echo "$as_me:2389: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2318,7 +2410,7 @@ if test -n "$ac_tool_prefix"; then
   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:2321: checking for $ac_word" >&5
+echo "$as_me:2413: 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
@@ -2333,7 +2425,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-echo "$as_me:2336: found $ac_dir/$ac_word" >&5
+echo "$as_me:2428: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2341,10 +2433,10 @@ fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  echo "$as_me:2344: result: $F77" >&5
+  echo "$as_me:2436: result: $F77" >&5
 echo "${ECHO_T}$F77" >&6
 else
-  echo "$as_me:2347: result: no" >&5
+  echo "$as_me:2439: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2357,7 +2449,7 @@ if test -z "$F77"; then
 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:2360: checking for $ac_word" >&5
+echo "$as_me:2452: 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
@@ -2372,7 +2464,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_F77="$ac_prog"
-echo "$as_me:2375: found $ac_dir/$ac_word" >&5
+echo "$as_me:2467: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2380,10 +2472,10 @@ fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  echo "$as_me:2383: result: $ac_ct_F77" >&5
+  echo "$as_me:2475: result: $ac_ct_F77" >&5
 echo "${ECHO_T}$ac_ct_F77" >&6
 else
-  echo "$as_me:2386: result: no" >&5
+  echo "$as_me:2478: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2394,30 +2486,30 @@ done
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:2397:" \
+echo "$as_me:2489:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2400: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2492: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2403: \$? = $ac_status" >&5
+  echo "$as_me:2495: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2405: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2497: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2408: \$? = $ac_status" >&5
+  echo "$as_me:2500: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2410: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2502: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2413: \$? = $ac_status" >&5
+  echo "$as_me:2505: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 # If we don't use `.F' as extension, the preprocessor is not run on the
 # input file.
 ac_save_ext=$ac_ext
 ac_ext=F
-echo "$as_me:2420: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo "$as_me:2512: 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
@@ -2431,16 +2523,16 @@ else
       end
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2526: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2437: \$? = $ac_status" >&5
+  echo "$as_me:2529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2443: \$? = $ac_status" >&5
+  echo "$as_me:2535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2452,14 +2544,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2455: result: $ac_cv_f77_compiler_gnu" >&5
+echo "$as_me:2547: result: $ac_cv_f77_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
 ac_ext=$ac_save_ext
 G77=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-echo "$as_me:2462: checking whether $F77 accepts -g" >&5
+echo "$as_me:2554: 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
@@ -2471,16 +2563,16 @@ cat >conftest.$ac_ext <<_ACEOF
       end
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2477: \$? = $ac_status" >&5
+  echo "$as_me:2569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2483: \$? = $ac_status" >&5
+  echo "$as_me:2575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_f77_g=yes
 else
@@ -2491,7 +2583,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2494: result: $ac_cv_prog_f77_g" >&5
+echo "$as_me:2586: 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
@@ -2527,7 +2619,7 @@ 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
-echo "$as_me:2530: checking how to get verbose linking output from $F77" >&5
+echo "$as_me:2622: checking how to get verbose linking output from $F77" >&5
 echo $ECHO_N "checking how to get verbose linking output from $F77... $ECHO_C" >&6
 if test "${ac_cv_prog_f77_v+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2539,16 +2631,16 @@ cat >conftest.$ac_ext <<_ACEOF
       end
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2545: \$? = $ac_status" >&5
+  echo "$as_me:2637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2551: \$? = $ac_status" >&5
+  echo "$as_me:2643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_f77_v=
 # Try some options frequently used verbose output
@@ -2570,7 +2662,7 @@ _ACEOF
 # flags.
 ac_save_FFLAGS=$FFLAGS
 FFLAGS="$FFLAGS $ac_verb"
-(eval echo $as_me:2573: \"$ac_link\") >&5
+(eval echo $as_me:2665: \"$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
@@ -2602,21 +2694,21 @@ fi
   done
 done
 if test -z "$ac_cv_prog_f77_v"; then
-   { echo "$as_me:2605: WARNING: cannot determine how to obtain linking information from $F77" >&5
+   { echo "$as_me:2697: WARNING: cannot determine how to obtain linking information from $F77" >&5
 echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;}
 fi
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ echo "$as_me:2611: WARNING: compilation failed" >&5
+{ echo "$as_me:2703: WARNING: compilation failed" >&5
 echo "$as_me: WARNING: compilation failed" >&2;}
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2617: result: $ac_cv_prog_f77_v" >&5
+echo "$as_me:2709: result: $ac_cv_prog_f77_v" >&5
 echo "${ECHO_T}$ac_cv_prog_f77_v" >&6
-echo "$as_me:2619: checking for Fortran 77 libraries" >&5
+echo "$as_me:2711: checking for Fortran 77 libraries" >&5
 echo $ECHO_N "checking for Fortran 77 libraries... $ECHO_C" >&6
 if test "${ac_cv_flibs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2642,7 +2734,7 @@ _ACEOF
 # flags.
 ac_save_FFLAGS=$FFLAGS
 FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
-(eval echo $as_me:2645: \"$ac_link\") >&5
+(eval echo $as_me:2737: \"$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
@@ -2797,7 +2889,7 @@ esac
 fi # test "x$FLIBS" = "x"
 
 fi
-echo "$as_me:2800: result: $ac_cv_flibs" >&5
+echo "$as_me:2892: result: $ac_cv_flibs" >&5
 echo "${ECHO_T}$ac_cv_flibs" >&6
 FLIBS="$ac_cv_flibs"
 
@@ -2864,7 +2956,7 @@ fi
 
 # SO is the extension of shared libraries `(including the dot!)
 # -- usually .so, .sl on HP-UX, .dll on Cygwin
-echo "$as_me:2867: checking SO" >&5
+echo "$as_me:2959: checking SO" >&5
 echo $ECHO_N "checking SO... $ECHO_C" >&6
 if test -z "$SO"
 then
@@ -2875,7 +2967,7 @@ then
 	*)	   SO=.so;;
 	esac
 fi
-echo "$as_me:2878: result: $SO" >&5
+echo "$as_me:2970: result: $SO" >&5
 echo "${ECHO_T}$SO" >&6
 
 ac_ext=cc
@@ -2910,7 +3002,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:2913: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:3005: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -3083,7 +3175,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:3086: error: ambiguous option: $1
+    { { echo "$as_me:3178: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -3102,7 +3194,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:3105: error: unrecognized option: $1
+  -*) { { echo "$as_me:3197: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -3168,7 +3260,7 @@ do
   "../test_problems/cxx_ex/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../test_problems/cxx_ex/Makefile" ;;
   "../test_problems/silane_equil/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../test_problems/silane_equil/Makefile" ;;
   "../config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ../config.h" ;;
-  *) { { echo "$as_me:3171: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:3263: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -3263,6 +3355,7 @@ s,@target@,$target,;t t
 s,@target_cpu@,$target_cpu,;t t
 s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t
+s,@buildlib@,$buildlib,;t t
 s,@MAKE@,$MAKE,;t t
 s,@ARCHIVE@,$ARCHIVE,;t t
 s,@SOEXT@,$SOEXT,;t t
@@ -3286,10 +3379,10 @@ s,@CANTERA_EXAMPLES_DIR@,$CANTERA_EXAMPLES_DIR,;t t
 s,@CANTERA_DATA_DIR@,$CANTERA_DATA_DIR,;t t
 s,@CT_SHARED_LIB@,$CT_SHARED_LIB,;t t
 s,@BUILD_F90@,$BUILD_F90,;t t
-s,@BUILD_PYTHON@,$BUILD_PYTHON,;t t
 s,@PYTHON_CMD@,$PYTHON_CMD,;t t
-s,@BUILD_MATLAB@,$BUILD_MATLAB,;t t
+s,@BUILD_PYTHON@,$BUILD_PYTHON,;t t
 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,@CXX@,$CXX,;t t
@@ -3438,7 +3531,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:3441: creating $ac_file" >&5
+    { echo "$as_me:3534: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -3456,7 +3549,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:3459: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:3552: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -3469,7 +3562,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:3472: error: cannot find input file: $f" >&5
+           { { echo "$as_me:3565: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -3530,7 +3623,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:3533: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:3626: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -3541,7 +3634,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:3544: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:3637: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -3554,7 +3647,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:3557: error: cannot find input file: $f" >&5
+           { { echo "$as_me:3650: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -3671,7 +3764,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:3674: $ac_file is unchanged" >&5
+      { echo "$as_me:3767: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/config/configure.in b/config/configure.in
index bdbb5e1a9..e93838ad9 100755
--- a/config/configure.in
+++ b/config/configure.in
@@ -28,6 +28,9 @@ AC_SUBST(ctroot)
 
 AC_CANONICAL_SYSTEM()
 
+buildlib=$ctroot/build/lib
+AC_SUBST(buildlib)
+
 #case "$target" in
 #mips-sgi-irix*.*) 
 #  if test -z "$CXX"; then CXX=CC; fi
@@ -239,18 +242,25 @@ AC_SUBST(BUILD_F90)
 #     Python Interface
 #
 BUILD_PYTHON=0
-if test "$BUILD_PYTHON_INTERFACE" = "y"; then BUILD_PYTHON=1; BUILD_CLIB=1; fi
+if test -z "$PYTHON_CMD"; then 
+  AC_PATH_PROGS(PYTHON_CMD, python2 python, "none")
+  if test "$PYTHON_CMD" != "none"; then BUILD_PYTHON=1; BUILD_CLIB=1; fi
+fi
 AC_SUBST(BUILD_PYTHON)
-AC_SUBST(PYTHON_CMD)
+#AC_SUBST(PYTHON_CMD)
 
 
 #       
 #     Matlab Interface
 #
 BUILD_MATLAB=0
-if test "$BUILD_MATLAB_TOOLBOX" = "y"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
+if test -z "$MATLAB_CMD"; then
+  AC_PATH_PROG(MATLAB_CMD, matlab, "none")
+  if test "$MATLAB_CMD" != "none"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
+fi
+#if test "$BUILD_MATLAB_TOOLBOX" = "y"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
 AC_SUBST(BUILD_MATLAB)
-AC_SUBST(MATLAB_CMD)
+# AC_SUBST(MATLAB_CMD)
 
 AC_SUBST(BUILD_CLIB)
 
diff --git a/configure b/configure
index 983704fa8..289f8658e 100755
--- a/configure
+++ b/configure
@@ -50,8 +50,8 @@ BUILD_FORTRAN_90_INTERFACE='n'       # Fortran is temporarily not working
 # to the path to the Python interpreter to use, if there is more than
 # one on your system.
 
-BUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE:="y"}
-PYTHON_CMD=${PYTHON_CMD:=python}
+#BUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE:="y"}
+#PYTHON_CMD=${PYTHON_CMD:=python}
 
 
 #----------- Matlab --------------------------------------------------
@@ -60,8 +60,8 @@ PYTHON_CMD=${PYTHON_CMD:=python}
 # be installed on your system first, since the build process runs a
 # Matlab script.
 
-BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
-MATLAB_CMD=${MATLAB_CMD:=matlab}
+# BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
+# MATLAB_CMD=${MATLAB_CMD:=matlab}
 
 
 
diff --git a/ext/blas/Makefile.in b/ext/blas/Makefile.in
index bb09358ef..0f77e1a82 100755
--- a/ext/blas/Makefile.in
+++ b/ext/blas/Makefile.in
@@ -2,7 +2,7 @@
 #
 #/bin/sh
 
-BLASLIB = ./libctblas.a
+BLASLIB = @buildlib@/libctblas.a
 
 SUFFIXES=
 SUFFIXES= .f .o
diff --git a/ext/cvode/Makefile.in b/ext/cvode/Makefile.in
index f0f055726..c865f53ce 100755
--- a/ext/cvode/Makefile.in
+++ b/ext/cvode/Makefile.in
@@ -22,7 +22,7 @@
 # If the ranlib utility is not available on your system, then remove the call
 # to ranlib from the commands to create libcvode.a.
 
-all: ./libcvode.a
+all: @buildlib@/libcvode.a
    
 COMPILER = @CC@
 
@@ -33,9 +33,9 @@ OBJS = source/cvode.o source/cvdense.o source/dense.o source/cvband.o \
        source/iterativ.o source/cvbandpre.o source/nvector.o source/llnlmath.o
 
 
-./libcvode.a: $(OBJS)
-	$(RM) ./libcvode.a
-	(ar rcv ./libcvode.a $(OBJS); ranlib ./libcvode.a)
+@buildlib@/libcvode.a: $(OBJS)
+	$(RM) @buildlib@/libcvode.a
+	(ar rcv @buildlib@/libcvode.a $(OBJS); ranlib @buildlib@/libcvode.a)
 
 source/cvode.o: source/cvode.c include/cvode.h include/llnltyps.h \
                 include/nvector.h include/llnlmath.h
diff --git a/ext/lapack/Makefile.in b/ext/lapack/Makefile.in
index ef4e7e29c..8c750284d 100755
--- a/ext/lapack/Makefile.in
+++ b/ext/lapack/Makefile.in
@@ -2,7 +2,7 @@
 #
 #/bin/sh
 
-LAPACKLIB = ./libctlapack.a
+LAPACKLIB = @buildlib@/libctlapack.a
 
 SUFFIXES=
 SUFFIXES= .f .o
diff --git a/ext/math/Makefile.in b/ext/math/Makefile.in
index d203cd0eb..b6c8b1dc4 100755
--- a/ext/math/Makefile.in
+++ b/ext/math/Makefile.in
@@ -5,7 +5,7 @@
 # $Date$
 #
 
-LIB = ./libctmath.a
+LIB = @buildlib@/libctmath.a
 
 SUFFIXES=
 SUFFIXES= .f .d .o
diff --git a/ext/recipes/Makefile.in b/ext/recipes/Makefile.in
index 582721266..646a12422 100755
--- a/ext/recipes/Makefile.in
+++ b/ext/recipes/Makefile.in
@@ -2,7 +2,7 @@
 #
 #/bin/sh
 
-LIB = ./librecipes.a
+LIB = @buildlib@/librecipes.a
 
 SUFFIXES=
 SUFFIXES= .f .d .o
diff --git a/ext/tpx/Makefile.in b/ext/tpx/Makefile.in
index 9a1f0e9b0..2efe9af98 100755
--- a/ext/tpx/Makefile.in
+++ b/ext/tpx/Makefile.in
@@ -13,7 +13,7 @@ FOBJS =
 
 CXX_LIBS = @LIBS@
 CXX_INCLUDES = -I../include 
-TPLIB = ./libtpx.a
+TPLIB = @buildlib@/libtpx.a
 
 DEPENDS = $(COBJS:.o=.d)