--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: For building shared libaries, handle
+	i386-pc-solaris2* the same as sparc-sun-solaris2*.
+
 2000-02-29  Ben Sapp <bsapp@nua.lampf.lanl.gov>
 
 	* examples/make_int.cc (make_int): Handle new operator names.

--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.323 $)
+AC_REVISION($Revision: 1.324 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -624,7 +624,7 @@
     SH_LDFLAGS="-assert nodefinitions"
     RLD_FLAG='-L$(octlibdir)'
   ;;
-  sparc-sun-solaris2*)
+  sparc-sun-solaris2* | i386-pc-solaris2*)
     if test "$octave_cv_f77_is_g77" = yes; then
       FPICFLAG=-fPIC
     else

--- a/doc/conf.texi
+++ b/doc/conf.texi
@@ -2,6 +2,6 @@
 @c This is part of the Octave manual.
 @c For copying conditions, see the file gpl.texi.
 
-@set VERSION 2.0.5
+@set VERSION 2.1.x
 @set OCTAVEHOME /usr/local
 @set TARGETHOSTTYPE i586-pc-linux-gnu

--- a/doc/interpreter/octave.texi
+++ b/doc/interpreter/octave.texi
@@ -104,6 +104,8 @@
 02111--1307, USA.
 @end titlepage
 
+@contents
+
 @ifinfo
 @node Top, Preface, (dir), (dir)
 @top
@@ -159,9 +161,6 @@
 * Function Index::              An item for each documented function.
 * Operator Index::              An item for each documented operator.
 
-
-
-
 @detailmenu
  --- The Detailed Node Listing ---
 
@@ -544,6 +543,4 @@
 @include fn-idx.texi
 @include op-idx.texi
 
-@contents
-
 @bye

--- a/doc/liboctave/liboctave.texi
+++ b/doc/liboctave/liboctave.texi
@@ -82,6 +82,8 @@
 into another language, under the same conditions as for modified versions.
 @end titlepage
 
+@contents
+
 @ifinfo
 @node Top, Acknowledgements, (dir), (dir)
 @top
@@ -156,6 +158,4 @@
 @include cp-idx.texi
 @include fn-idx.texi
 
-@contents
-
 @bye

--- a/src/defun.cc
+++ b/src/defun.cc
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <string>
 
-#include "defun-int.h"
+#include "defun.h"
 #include "dynamic-ld.h"
 #include "error.h"
 #include "help.h"
@@ -35,6 +35,7 @@
 #include "ov-builtin.h"
 #include "ov-dld-fcn.h"
 #include "ov-mapper.h"
+#include "oct-obj.h"
 #include "pager.h"
 #include "symtab.h"
 #include "variables.h"
@@ -159,6 +160,47 @@
 	   alias.c_str ());
 }
 
+#if 0
+// This is insufficient to really make it possible to define an alias
+// for function.  There are a number of subtle problems related to
+// automatically reloading functions.
+DEFUN (alias, args, ,
+  "alias (alias, name)")
+{
+  octave_value retval;
+
+  int nargin = args.length ();
+
+  if (nargin == 2)
+    {
+      string alias = args(0).string_value ();
+      string name = args(1).string_value ();
+
+      if (! error_state)
+	{
+	  symbol_record *sr_name = lookup_by_name (name, false);
+
+	  if (sr_name && sr_name->is_function ())
+	    {
+	      symbol_record *sr_alias = global_sym_tab->lookup (alias, true);
+
+	      if (sr_alias)
+		sr_alias->alias (sr_name);
+	      else
+		error ("alias: unable to insert `%s' in symbol table",
+		       alias.c_str ());
+	    }
+	  else
+	    error ("alias: function `%s' does not exist", name.c_str ());
+	}
+    }
+  else
+    print_usage ("alias");
+
+  return retval;
+}
+#endif
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***