--- a/ChangeLog	Tue Jan 25 10:17:56 2000 +0000
+++ b/ChangeLog	Tue Jan 25 21:23:09 2000 +0000
@@ -1,5 +1,11 @@
 2000-01-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* configure.in: Don't look for the sunmath library.
+	Don't check for infinity or quiet_nan.
+
+	* emacs/octave-mod.el (octave-mode-syntax-table):
+	Undo previous change, but add a comment explaining why.
+
 	* install-octave.in: Exit on any error instead of continuing.
 	Install Octave binary last.
 

--- a/configure.in	Tue Jan 25 10:17:56 2000 +0000
+++ b/configure.in	Tue Jan 25 21:23:09 2000 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.321 $)
+AC_REVISION($Revision: 1.322 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -908,14 +908,6 @@
 dnl fails, we try again by including math.h and invoking the function
 dnl with an argument. 
 
-### Check to see if we have IEEE math functions, and if so, which ones.
-###
-### Also check for some additional trig functions that aren't ANSI but
-### are often available.  If they are missing, we try to replace them
-### with functions from the BSD/NET2 math library.
-
-AC_CHECK_LIB(sunmath, quiet_nan)
-
 ### I am told that Inf and NaN don't work on m68k HP sytems, and that
 ### on SCO systems, isnan and isinf don't work, but they can be
 ### replaced by something that does.
@@ -932,7 +924,7 @@
     AC_DEFINE(HAVE_ISNAN, 1)
   ;;
   *)
-    AC_CHECK_FUNCS(finite isnan isinf infinity quiet_nan)
+    AC_CHECK_FUNCS(finite isnan isinf)
   ;;
 esac
 

--- a/emacs/octave-mod.el	Tue Jan 25 10:17:56 2000 +0000
+++ b/emacs/octave-mod.el	Tue Jan 25 21:23:09 2000 +0000
@@ -279,6 +279,15 @@
 	["Lookup Octave Index"		octave-help t])
   "Menu for Octave mode.")
 
+;; XXX FIXME XXX -- the syntax mode for `%' is punctuation instead of
+;; begin-comment because if it is begin-comment, then typing M-;
+;; (octave-indent-for-comment) on lines like
+;;
+;;  sprintf ("%d", foobar);
+;;
+;; causes them to be improperly indented (the `%' is moved over to the
+;; comment-column).
+
 (defvar octave-mode-syntax-table nil
   "Syntax table in use in octave-mode buffers.")
 (if octave-mode-syntax-table
@@ -301,7 +310,7 @@
     (modify-syntax-entry ?\" "\"" table)
     (modify-syntax-entry ?. "w"   table)
     (modify-syntax-entry ?_ "w"   table)
-    (modify-syntax-entry ?\% "<"  table)
+    (modify-syntax-entry ?\% "."  table) ; see above
     (modify-syntax-entry ?\# "<"  table)
     (modify-syntax-entry ?\n ">"  table)
     (setq octave-mode-syntax-table table)))

--- a/liboctave/ChangeLog	Tue Jan 25 10:17:56 2000 +0000
+++ b/liboctave/ChangeLog	Tue Jan 25 21:23:09 2000 +0000
@@ -1,5 +1,8 @@
 2000-01-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* lo-ieee.cc (octave_ieee_init): Don't include sunmath.h.
+	No longer bother with infinity or quiet_nan.
+
 	* Array2.cc (Array2<T>::get_size): New function.
 	(Array2<T>::Array2, Array2<T>::resize): Use it.
 

--- a/liboctave/lo-ieee.cc	Tue Jan 25 10:17:56 2000 +0000
+++ b/liboctave/lo-ieee.cc	Tue Jan 25 21:23:09 2000 +0000
@@ -35,10 +35,6 @@
 #include <ieeefp.h>
 #endif
 
-#if defined (HAVE_SUNMATH_H)
-#include <sunmath.h>
-#endif
-
 #if defined (HAVE_NAN_H)
 #if defined (SCO)
 #define _IEEE 1
@@ -71,8 +67,6 @@
 #elif defined (__alpha__) && ! defined (linux)
   extern unsigned int DINFINITY[2];
   octave_Inf =  (*(X_CAST(double *, DINFINITY)));
-#elif defined (HAVE_INFINITY)
-  octave_Inf = infinity ();
 #else
   double tmp = 1e+10;
   octave_Inf = tmp;
@@ -92,8 +86,6 @@
 #if defined (__alpha__) && ! defined (linux)
   extern unsigned int DQNAN[2];
   octave_NaN = (*(X_CAST(double *, DQNAN)));
-#elif defined (HAVE_QUIET_NAN)
-  octave_NaN = quiet_nan (0L);
 #else
   octave_NaN = octave_Inf / octave_Inf;
 #endif