From b0eee798689ddc2458ccd507230608d8f7a721c1 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 16 Mar 2003 16:43:04 +0000 Subject: [PATCH] added -lstc++ info, convert more plain text to html --- docs/download.html | 2 +- docs/install.html | 97 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 25 deletions(-) diff --git a/docs/download.html b/docs/download.html index 79b34e4990f..78c43bbb5ae 100644 --- a/docs/download.html +++ b/docs/download.html @@ -71,7 +71,7 @@ util/ - handly utility functions widgets-mesa/ - Mesa widgets for Xt/Motif (obsolete) widgets-sgi/ - SGI OpenGL widgets for Xt/Motif -and if you downloaded and unpacked the demos: +and if you downloaded and unpacked the MesaDemos.X.Y archive: src-glut/ - source code for GLUT toolkit demos/ - GLUT demos diff --git a/docs/install.html b/docs/install.html index 1dedfa19c45..f126097bba2 100644 --- a/docs/install.html +++ b/docs/install.html @@ -57,26 +57,52 @@ package)

NEW-STYLE compilation and installation

-
-0) If you've downloaded Mesa via CVS there will not be a "configure"
+

+ 0. If you've downloaded Mesa via CVS there will not be a "configure"
    script.  You'll have to run the "bootstrap" script first.  This script
    may not work on any OS other than Linux.  You'll need these programs
    to run the bootstrap script:
+

 
+
 	autoconf 2.50
 	automake 1.4-p2
 	libtool 1.4
+

 
+

+1. Run the configure script
+

 
-1) Run the configure script
-
+
 	./configure [options]
+

 
+

 For Linux, it is recommended that you use:
+

+
 	./configure --prefix=/usr
+

+
 So that the headers and libs are located according to the Linux/OpenGL
 standard spec at http://oss.sgi.com/projects/ogl-sample/ABI/
-
+

+

+For Red Hat 8.0, Mandrake 9.1 and other Linux distros, you may have to use
+the following:
+

+
+	export LDFLAGS="-lstdc++" ; ./configure --prefix=/usr
+    or
+        setenv LDFLAGS -lstdc++ ; ./configure --prefix=/usr
+

+

+This works around a problem when building the GLU library.  It needs to
+be linked with the C++ runtime library, but libtool (for some reason)
+doesn't do this.
+

+
 Possible options are:
 
 --prefix=DIR
@@ -185,47 +211,69 @@ Possible options are:
 	
 --x-libraries=DIR
 	Search for the X library files in DIR.
+

 
+

 User specific compiler options can be set using the shell variable
 CFLAGS. For instance,
+

+
 	CFLAGS="-g -O2" ./configure
+

+

 (on some systems: env CFLAGS="-g -O2" ./configure)
 sets the compiler flags to "-g -O2".
-
+

+

 For more options run "./configure --help" and read INSTALL.GNU.
+

 
-2) To build the Mesa libraries run:
-
+

+2. To build the Mesa libraries run:
+

+
 	make
-
-When finished, libGL.so will be in src/.libs/, libGLU.so will be in
+

+

+When finished, libGL.so will be in src/.libs/ and libGLU.so will be in
 si-glu/.libs/, etc.
-
+

+

 Optionally, you can strip the libraries using
-
+

+
 	make strip
-	
+

+

 Now make sure that you have the permissions to install Mesa in the 
 specified directories, for example, by becoming super user ("su")
 Then run:
-
+

+
 	make install
-
+

+

 Mesa is now installed.
 Please don't move the installed files but rerun all installation
 steps if you want to use other directories.
+

 
-
-3) To test whether Mesa works properly you might want to run the Mesa demos:
-
+

+3.To test whether Mesa works properly you might want to run the
+Mesa demos:
+

+
 	make check
-	
+

+

 Builds all demos.
-
+

+
 	make exec
-
-Builds and executes all demos.	
 

+

+Builds and executes all demos.	
+

 
 
 
@@ -242,9 +290,10 @@ first copy the top-level Makefile.X11 file over
 

 
 

-First, just type make alone.
+Just type make alone.
 You'll see a list of supported system configurations.
-Choose one and type make config.
+Choose one and type make config
+(for example make linux-x86).
 The Mesa libraries and demo programs will be compiled.
 

 
-- 
2.30.2