# HG changeset patch
# User jwe
# Date 1018560289 0
# Node ID efa508da7d5c6d7494cf2cb6bfe83e325d214cca
# Parent  0486f50a8ecb86e42fad95d5dbe7d66e7f3b5562
[project @ 2002-04-11 21:24:49 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-11  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Declare F2C and F2CFLAGS with AC_ARG_VAR.
+	Delete AC_SUBST calls for F77, FFLAGS, FLIBS, F2C, F2CFLAGS (no
+	need to do this explicitly now).
+
 2002-04-04  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makeconf.in: Set and substitute EXEEXT, not EXE.
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@
 ### 02111-1307, USA. 
 
 AC_INIT
-AC_REVISION($Revision: 1.355 $)
+AC_REVISION($Revision: 1.356 $)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -462,6 +462,8 @@
     have_fortran_compiler=true
   else
     AC_CHECK_PROG(F2C, f2c, f2c, [])
+    AC_ARG_VAR(F2C, [Fortran to C translator command])
+    AC_ARG_VAR(F2CFLAGS, [Fortran to C translator flags])
     if test -n "$F2C"; then
       have_f2c=true
     fi
@@ -528,11 +530,6 @@
 
 FC=$F77
 AC_SUBST(FC)
-AC_SUBST(F77)
-AC_SUBST(FFLAGS)
-AC_SUBST(FLIBS)
-AC_SUBST(F2C)
-AC_SUBST(F2CFLAGS)
 AC_SUBST_FILE(f77_rules_frag)
 
 ### Checks for BLAS and LAPACK libraries:
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-11  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* load-save.cc (hdf5_ofstream::hdf5_ofstream):
+	Explicitly List std::ostream(0) in constructor.
+	(hdf5_ifstream::hdf5_ifstream):
+	Explicitly List std::istream(0) in constructor.
+	(hdf5_fstreambase::hdf5_fstreambase): Use std::ios::setstate, not set.
+	(hdf5_fstreambase::close): Likewise.
+	(hdf5_fstreambase::open): Likewise.
+
 2002-04-10  Ben Sapp <bsapp@lanl.gov>
 
 	* pt-stmt.cc (delete_breakpoint): List breakpoints if line < 0.
diff --git a/src/load-save.cc b/src/load-save.cc
--- a/src/load-save.cc
+++ b/src/load-save.cc
@@ -1059,7 +1059,7 @@
 	file_id = H5Fcreate (name, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
       if (file_id < 0)
-	set (std::ios::badbit);
+	std::ios::setstate (std::ios::badbit);
 
       current_item = 0;
     }
@@ -1069,7 +1069,7 @@
       if (file_id >= 0)
 	{
 	  if (H5Fclose (file_id) < 0)
-	    set (std::ios::badbit);
+	    std::ios::setstate (std::ios::badbit);
 	  file_id = -1;
 	}
     }
@@ -1084,7 +1084,7 @@
 	file_id = H5Fcreate (name, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
       if (file_id < 0)
-	set (std::ios::badbit);
+	std::ios::setstate (std::ios::badbit);
 
       current_item = 0;
     }
@@ -1097,10 +1097,10 @@
 {
 public:
 
-  hdf5_ifstream () : hdf5_fstreambase () { }
+  hdf5_ifstream () : hdf5_fstreambase (), std::istream (0) { }
 
   hdf5_ifstream (const char *name, int mode = std::ios::in, int prot = 0)
-    : hdf5_fstreambase (name, mode, prot) { }
+    : hdf5_fstreambase (name, mode, prot), std::istream (0) { }
 
   void open (const char *name, int mode = std::ios::in, int prot = 0)
     { hdf5_fstreambase::open (name, mode, prot); }
@@ -1110,10 +1110,10 @@
 {
 public:
 
-  hdf5_ofstream () : hdf5_fstreambase () { }
+  hdf5_ofstream () : hdf5_fstreambase (), std::ostream (0) { }
 
   hdf5_ofstream (const char *name, int mode = std::ios::out, int prot = 0)
-    : hdf5_fstreambase (name, mode, prot) { }
+    : hdf5_fstreambase (name, mode, prot), std::ostream (0) { }
 
   void open (const char *name, int mode = std::ios::out, int prot = 0)
     { hdf5_fstreambase::open (name, mode, prot); }