--- ./src/graphics/Makefile.in	Fri Jan 11 10:29:27 2002
+++ ../lyx-1.1.6fix4/./src/graphics/Makefile.in	Wed Feb  6 16:14:16 2002
@@ -267,7 +267,7 @@
 libgraphics_la_LIBADD = 
 libgraphics_la_OBJECTS =  Renderer.lo XPM_Renderer.lo EPS_Renderer.lo \
 GraphicsCache.lo GraphicsCacheItem.lo GraphicsCacheItem_pimpl.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/main.C	Tue Sep 19 07:18:34 2000
+++ ../lyx-1.1.6fix4/./src/main.C	Wed Feb  6 15:12:15 2002
@@ -40,3 +40,18 @@
 	LyX lyx(&argc, argv);
 	return 0; // SUCCESS
 }
+
+#ifdef __sgi
+extern void force_instantiation(void)
+{
+  // The MipsPRO 7.3 compilers are finicky about instantiating templates
+  // in archive libraries.  Forcing instantiation in the src/support
+  // library gives ambiguous overloading (e.g. abort() vs. lyx::abort()),
+  // so we just insert dummy references here in the main program.
+  //
+  // Probably this could be done with '#pragma instantiate', but I
+  // couldn't figure out the syntax.
+  const char c = '\0';
+  std::count(&c, &c, c);
+}
+#endif
--- ./src/mathed/Makefile.in	Fri Jan 11 10:29:23 2002
+++ ../lyx-1.1.6fix4/./src/mathed/Makefile.in	Wed Feb  6 15:29:24 2002
@@ -270,7 +270,7 @@
 math_delim.lo math_draw.lo math_forms.lo math_hash.lo math_inset.lo \
 math_iter.lo math_macro.lo math_panel.lo math_parser.lo math_root.lo \
 math_symbols.lo math_utils.lo math_write.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/Makefile.in	Fri Jan 11 10:29:20 2002
+++ ../lyx-1.1.6fix4/./src/Makefile.in	Wed Feb  6 16:14:09 2002
@@ -289,7 +289,7 @@
 tabular.o tabular-old.o tex-accent.o tex-strings.o texrow.o text.o \
 text2.o tracer.o trans.o trans_mgr.o undo.o vc-backend.o vspace.o
 lyx_LDFLAGS = 
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/kde/dlg/moc/Makefile.in	Fri Aug  3 08:21:31 2001
+++ ../lyx-1.1.6fix4/./src/frontends/kde/dlg/moc/Makefile.in	Wed Feb  6 16:14:07 2002
@@ -273,7 +273,7 @@
 paradlgdata_moc.lo parageneraldlgdata_moc.lo paraabovedlgdata_moc.lo \
 parabelowdlgdata_moc.lo paraextradlgdata_moc.lo printdlgdata_moc.lo \
 tabcreatedlgdata_moc.lo emptytable_moc.lo tabstack_moc.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/kde/dlg/Makefile.in	Fri Aug  3 08:21:31 2001
+++ ../lyx-1.1.6fix4/./src/frontends/kde/dlg/Makefile.in	Wed Feb  6 16:14:05 2002
@@ -277,7 +277,7 @@
 indexdlgdata.lo paradlgdata.lo parageneraldlgdata.lo \
 paraabovedlgdata.lo parabelowdlgdata.lo paraextradlgdata.lo \
 printdlgdata.lo tabcreatedlgdata.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/kde/moc/Makefile.in	Fri Aug  3 08:21:30 2001
+++ ../lyx-1.1.6fix4/./src/frontends/kde/moc/Makefile.in	Wed Feb  6 16:14:03 2002
@@ -273,7 +273,7 @@
 indexdlg_moc.lo paradlg_moc.lo parageneraldlg_moc.lo \
 paraextradlg_moc.lo printdlg_moc.lo refdlg_moc.lo tabcreatedlg_moc.lo \
 tocdlg_moc.lo urldlg_moc.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/kde/Makefile.in	Fri Aug  3 08:21:30 2001
+++ ../lyx-1.1.6fix4/./src/frontends/kde/Makefile.in	Wed Feb  6 16:14:01 2002
@@ -278,7 +278,7 @@
 copyrightdlg.lo indexdlg.lo paradlg.lo parageneraldlg.lo \
 paraextradlg.lo printdlg.lo refdlg.lo tabcreatedlg.lo tocdlg.lo \
 urldlg.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/support/Makefile.in	Fri Jan 11 10:29:32 2002
+++ ../lyx-1.1.6fix4/./src/frontends/support/Makefile.in	Wed Feb  6 16:13:59 2002
@@ -269,7 +269,7 @@
 libfrontendsupport_la_LDFLAGS = 
 libfrontendsupport_la_LIBADD = 
 libfrontendsupport_la_OBJECTS =  LyXImage.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/Makefile.in	Fri Jan 11 10:29:31 2002
+++ ../lyx-1.1.6fix4/./src/frontends/Makefile.in	Wed Feb  6 16:07:31 2002
@@ -273,7 +273,7 @@
 libfrontends_la_LIBADD = 
 libfrontends_la_OBJECTS =  ButtonPolicies.lo Liason.lo Menubar.lo \
 Toolbar.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/xforms/Makefile.in	Fri Jan 11 10:29:35 2002
+++ ../lyx-1.1.6fix4/./src/frontends/xforms/Makefile.in	Wed Feb  6 16:13:54 2002
@@ -278,7 +278,7 @@
 FormTabularCreate.lo form_tabular_create.lo FormToc.lo form_toc.lo \
 FormUrl.lo form_url.lo input_validators.lo Menubar_pimpl.lo \
 RadioButtonGroup.lo Toolbar_pimpl.lo xform_helpers.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/frontends/gnome/Makefile.in	Fri Aug  3 08:21:31 2001
+++ ../lyx-1.1.6fix4/./src/frontends/gnome/Makefile.in	Wed Feb  6 16:13:50 2002
@@ -276,7 +276,7 @@
 diainserturl_interface.lo diainsertindex_callbacks.lo \
 diainsertindex_interface.lo diatoc_callbacks.lo diatoc_interface.lo \
 diainsertcitation_interface.lo diainsertcitation_callbacks.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
--- ./src/insets/Makefile.in	Fri Jan 11 10:29:25 2002
+++ ../lyx-1.1.6fix4/./src/insets/Makefile.in	Wed Feb  6 15:29:50 2002
@@ -275,7 +275,7 @@
 insetmarginal.lo insetminipage.lo insetparent.lo insetquotes.lo \
 insetref.lo insetsection.lo insetspecialchar.lo insettabular.lo \
 insettext.lo insettheorem.lo insettoc.lo inseturl.lo
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -ptused -prelink
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)