# HG changeset patch
# User jwe
# Date 963890914 0
# Node ID 8ce0d75eb4e3ee2dddccb68f412ca322174b7afd
# Parent  5a7174ebc684605547dc12ccd666d4bc5a324dc5
[project @ 2000-07-18 03:28:33 by jwe]

diff -r 5a7174ebc684 -r 8ce0d75eb4e3 ChangeLog
--- a/ChangeLog	Mon Jul 17 19:39:47 2000 +0000
+++ b/ChangeLog	Tue Jul 18 03:28:34 2000 +0000
@@ -1,3 +1,8 @@
+2000-07-17  Joao Cardoso  <jcardoso@inescn.pt>
+
+	* configure.in (LIBGLOB): Set to be the two object files in the
+	glob directory instead of libglob.a.
+
 2000-07-05  Steven G. Johnson  <stevenj@gil-galad.mit.edu>
 
 	* Use BLAS_LIBS to save the names of BLAS libraries instead of
diff -r 5a7174ebc684 -r 8ce0d75eb4e3 configure.in
--- a/configure.in	Mon Jul 17 19:39:47 2000 +0000
+++ b/configure.in	Tue Jul 18 03:28:34 2000 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.331 $)
+AC_REVISION($Revision: 1.332 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -861,9 +861,12 @@
   AC_MSG_ERROR([I couldn't find termios.h, termio.h, or sgtty.h!])
 fi
 
+## I'm told that setting LIBGLOB to be $(TOPDIR)/glob/libglob.a causes
+## trouble on SCO systems, but setting it to be the two object files
+## avoids the problem.
 
 GLOB_DIR=glob
-LIBGLOB='$(TOPDIR)/glob/libglob.$(LIBEXT)'
+LIBGLOB='$(TOPDIR)/glob/glob.o $(TOPDIR)/glob/fnmatch.o'
 GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob'
 if test "$ac_cv_header_fnmatch_h" = yes \
   && test "$ac_cv_header_glob_h" = yes; then
diff -r 5a7174ebc684 -r 8ce0d75eb4e3 src/ChangeLog
--- a/src/ChangeLog	Mon Jul 17 19:39:47 2000 +0000
+++ b/src/ChangeLog	Tue Jul 18 03:28:34 2000 +0000
@@ -1,3 +1,9 @@
+2000-07-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* load-save.cc (get_file_format): Call read_mat5_binary_file_header 
+	with third arg true instead of false, so we don't barf if the file
+	is not a matlab v5 binary file.
+
 2000-07-14  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (octave): Link to ../libcruft/blas-xtra/xerbla.o here.
diff -r 5a7174ebc684 -r 8ce0d75eb4e3 src/load-save.cc
--- a/src/load-save.cc	Mon Jul 17 19:39:47 2000 +0000
+++ b/src/load-save.cc	Tue Jul 18 03:28:34 2000 +0000
@@ -2857,7 +2857,7 @@
 	  file.clear ();
 	  file.seekg (0, std::ios::beg);
 
-	  err = read_mat5_binary_file_header (file, swap, false);
+	  err = read_mat5_binary_file_header (file, swap, true);
 
 	  if (! err)
   	    {