List:Commits« Previous MessageNext Message »
From:paul Date:January 31 2006 4:26am
Subject:svn commit - mysqldoc@docsrva: r1146 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-31 05:26:46 +0100 (Tue, 31 Jan 2006)
New Revision: 1146

Log:
 r6968@frost:  paul | 2006-01-30 22:25:39 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/installing.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6964
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6968
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-31 03:56:32 UTC (rev 1145)
+++ trunk/refman-4.1/installing.xml	2006-01-31 04:26:46 UTC (rev 1146)
@@ -1326,15 +1326,13 @@
               Linux 2.4.xx x86 with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=pentiumpro" CXX=gcc
-              CXXFLAGS="-O2 -mcpu=pentiumpro -felide-constructors"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler --disable-shared
-              --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=pentiumpro" CXX=gcc CXXFLAGS="-O2 -mcpu=pentiumpro
+-felide-constructors" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --disable-shared
+--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1343,18 +1341,15 @@
               Compiler 8.1 or later releases):
             </para>
 
-            <para>
-              <literal>CC=icc CXX=icpc CFLAGS="-O3 -unroll2 -ip -mp
-              -no-gcc -restrict" CXXFLAGS="-O3 -unroll2 -ip -mp -no-gcc
-              -restrict" ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler --disable-shared
-              --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static --with-embedded-server
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=icc CXX=icpc CFLAGS="-O3 -unroll2 -ip -mp -no-gcc -restrict"
+CXXFLAGS="-O3 -unroll2 -ip -mp -no-gcc -restrict" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --enable-assembler
+--disable-shared --with-client-ldflags=-all-static
+--with-mysqld-ldflags=-all-static --with-embedded-server --with-innodb
+</programlisting>
 
             <para>
               Note that versions 8.1 and newer of the Intel compiler
@@ -1372,13 +1367,12 @@
               (Intel C++ Itanium Compiler 7.0):
             </para>
 
-            <para>
-              <literal>CC=ecc CFLAGS="-O2 -tpp2 -ip -nolib_inline"
-              CXX=ecc CXXFLAGS="-O2 -tpp2 -ip -nolib_inline" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client
-              --enable-local-infile</literal>
-            </para>
+<programlisting>
+CC=ecc CFLAGS="-O2 -tpp2 -ip -nolib_inline" CXX=ecc CXXFLAGS="-O2
+-tpp2 -ip -nolib_inline" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1387,12 +1381,11 @@
               (Intel C++ Itanium Compiler 7.0):
             </para>
 
-            <para>
-              <literal>CC=ecc CFLAGS=-tpp1 CXX=ecc CXXFLAGS=-tpp1
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile</literal>
-            </para>
+<programlisting>
+CC=ecc CFLAGS=-tpp1 CXX=ecc CXXFLAGS=-tpp1 ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1401,15 +1394,13 @@
               V6.2-505 / Compaq C++ V6.3-006):
             </para>
 
-            <para>
-              <literal>CC=ccc CFLAGS="-fast -arch generic" CXX=cxx
-              CXXFLAGS="-fast -arch generic -noexceptions -nortti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-mysqld-ldflags=-non_shared
-              --with-client-ldflags=-non_shared
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=ccc CFLAGS="-fast -arch generic" CXX=cxx CXXFLAGS="-fast -arch
+generic -noexceptions -nortti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-mysqld-ldflags=-non_shared
+--with-client-ldflags=-non_shared --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1417,17 +1408,15 @@
               Linux 2.x.xx ppc with <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-embedded-server
+--with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1435,14 +1424,12 @@
               Linux 2.4.xx s390 with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2" CXX=gcc CXXFLAGS="-O2
-              -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --disable-shared --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2" CXX=gcc CXXFLAGS="-O2 -felide-constructors" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1451,11 +1438,11 @@
               3.2.1:
             </para>
 
-            <para>
-              <literal>CXX=gcc ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CXX=gcc ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1463,17 +1450,14 @@
               Sun Solaris 8 x86 with <command>gcc</command> 3.2.3:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1481,16 +1465,14 @@
               Sun Solaris 8 SPARC with <command>gcc</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --with-named-z-libs=no --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-z-libs=no
+--with-named-curses-libs=-lcurses --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1499,16 +1481,14 @@
               3.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -m64 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -m64 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -m64 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-m64 -fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no
+--with-named-curses-libs=-lcurses --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1516,16 +1496,14 @@
               Sun Solaris 9 SPARC with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-curses-libs=-lcurses
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1534,15 +1512,13 @@
               Forte 5.0):
             </para>
 
-            <para>
-              <literal>CC=cc-5.0 CXX=CC ASFLAGS="-xarch=v9" CFLAGS="-Xa
-              -xstrconst -mt -D_FORTEC_ -xarch=v9" CXXFLAGS="-noex -mt
-              -D_FORTEC_ -xarch=v9" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler --with-named-z-libs=no
-              --enable-thread-safe-client --disable-shared</literal>
-            </para>
+<programlisting>
+CC=cc-5.0 CXX=CC ASFLAGS="-xarch=v9" CFLAGS="-Xa -xstrconst -mt
+-D_FORTEC_ -xarch=v9" CXXFLAGS="-noex -mt -D_FORTEC_ -xarch=v9"
+./configure --prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --enable-assembler
+--with-named-z-libs=no --enable-thread-safe-client --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1550,14 +1526,13 @@
               IBM AIX 4.3.2 ppc with <command>gcc</command> 3.2.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=powerpc -Wa,-many " CXX=gcc
-              CXXFLAGS="-O2 -mcpu=powerpc -Wa,-many -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=powerpc -Wa,-many " CXX=gcc CXXFLAGS="-O2
+-mcpu=powerpc -Wa,-many -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1566,17 +1541,14 @@
               Visual Age C/C++ 6.0):
             </para>
 
-            <para>
-              <literal>CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2
-              -qmaxmem=8192" CXX=xlC_r CXXFLAGS ="-ma -O2 -qstrict
-              -qoptimize=2 -qmaxmem=8192" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --disable-shared --with-innodb</literal>
-            </para>
+<programlisting>
+CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+CXX=xlC_r CXXFLAGS ="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1584,14 +1556,13 @@
               IBM AIX 5.1.0 ppc with <command>gcc</command> 3.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=powerpc -Wa,-many" CXX=gcc
-              CXXFLAGS="-O2 -mcpu=powerpc -Wa,-many -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=powerpc -Wa,-many" CXX=gcc CXXFLAGS="-O2 -mcpu=powerpc
+-Wa,-many -felide-constructors -fno-exceptions -fno-rtti" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1600,18 +1571,14 @@
               Visual Age C/C++ 6.0):
             </para>
 
-            <para>
-              <literal>CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2
-              -qmaxmem=8192" CXX=xlC_r CXXFLAGS="-ma -O2 -qstrict
-              -qoptimize=2 -qmaxmem=8192" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --disable-shared --with-embedded-server
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+CXX=xlC_r CXXFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared --with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1619,16 +1586,14 @@
               HP-UX 10.20 pa-risc1.1 with <command>gcc</command> 3.1:
             </para>
 
-            <para>
-              <literal>CFLAGS="-DHPUX -I/opt/dce/include -O3 -fPIC"
-              CXX=gcc CXXFLAGS="-DHPUX -I/opt/dce /include
-              -felide-constructors -fno-exceptions -fno-rtti -O3 -fPIC"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-pthread
-              --with-named-thread-libs=-ldce --with-lib-ccflags=-fPIC
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-DHPUX -I/opt/dce/include -O3 -fPIC" CXX=gcc CXXFLAGS="-DHPUX
+-I/opt/dce /include -felide-constructors -fno-exceptions -fno-rtti
+-O3 -fPIC" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-pthread --with-named-thread-libs=-ldce
+--with-lib-ccflags=-fPIC --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1637,15 +1602,13 @@
               C++ B3910B A.03.50):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS=+DAportable
-              CXXFLAGS=+DAportable ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS=+DAportable CXXFLAGS=+DAportable ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1654,12 +1617,11 @@
               (HP ANSI C++ B3910B A.03.33):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS=+DD64 CXXFLAGS=+DD64
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS=+DD64 CXXFLAGS=+DD64 ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1668,16 +1630,13 @@
               (HP ANSI C++ B3910B A.03.33):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS="+DAportable"
-              CXXFLAGS="+DAportable" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS="+DAportable" CXXFLAGS="+DAportable" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1686,16 +1645,13 @@
               aC++/ANSI C B3910B A.05.50):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS="+DD64 +DSitanium2"
-              CXXFLAGS="+DD64 +DSitanium2" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS="+DD64 +DSitanium2" CXXFLAGS="+DD64 +DSitanium2"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1704,14 +1660,13 @@
               3.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1719,13 +1674,12 @@
               FreeBSD 4.7 i386 with <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CFLAGS=-DHAVE_BROKEN_REALPATH ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler --with-named-z-libs=not-used
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS=-DHAVE_BROKEN_REALPATH ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-z-libs=not-used
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1734,23 +1688,19 @@
               <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98
-              -D_REENTRANT -D_THREAD_SAFE
-              -I/usr/local/include/pthread/linuxthreads"
-              CXXFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98
-              -D_REENTRANT -D_THREAD_SAFE
-              -I/usr/local/include/pthread/linuxthreads" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler
-              --with-named-thread-libs="-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
-              -D_THREAD_SAFE -I /usr/local/include/pthread/linuxthreads
-              -L/usr/local/lib -llthread -llgcc_r" --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98 -D_REENTRANT
+-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
+CXXFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98 -D_REENTRANT
+-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --enable-thread-safe-client
+--enable-local-infile --enable-assembler
+--with-named-thread-libs="-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
+-D_THREAD_SAFE -I /usr/local/include/pthread/linuxthreads
+-L/usr/local/lib -llthread -llgcc_r" --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1759,14 +1709,13 @@
               2.95.3qnx-nto 20010315:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
         </itemizedlist>
@@ -1787,14 +1736,13 @@
               2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O3 -mpentium" LDFLAGS=-static CXX=gcc
-              CXXFLAGS="-O3 -mpentium -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O3 -mpentium" LDFLAGS=-static CXX=gcc CXXFLAGS="-O3 -mpentium
+-felide-constructors" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1802,13 +1750,12 @@
               SCO UnixWare 7.1.4 i386 with <command>CC</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=cc CFLAGS="-O" CXX=CC ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared --with-readline</literal>
-            </para>
+<programlisting>
+CC=cc CFLAGS="-O" CXX=CC ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared --with-readline
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1816,13 +1763,12 @@
               SCO OpenServer 6.0.0 i386 with <command>CC</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=cc CFLAGS="-O" CXX=CC ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared --with-readline</literal>
-            </para>
+<programlisting>
+CC=cc CFLAGS="-O" CXX=CC ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared --with-readline
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1832,17 +1778,15 @@
               C++ V6.1-027):
             </para>
 
-            <para>
-              <literal>CC="cc -pthread" CFLAGS="-O4 -ansi_alias
-              -ansi_args -fast -inline speed -speculate all" CXX="cxx
-              -pthread" CXXFLAGS="-O4 -ansi_alias -fast -inline speed
-              -speculate all -noexceptions -nortti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-thread-libs="-lpthread -lmach -lexc -lc"
-              --disable-shared
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CC="cc -pthread" CFLAGS="-O4 -ansi_alias -ansi_args -fast -inline
+speed -speculate all" CXX="cxx -pthread" CXXFLAGS="-O4 -ansi_alias
+-fast -inline speed -speculate all -noexceptions -nortti" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile
+--with-named-thread-libs="-lpthread -lmach -lexc -lc" --disable-shared
+--with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1850,14 +1794,13 @@
               SGI Irix 6.5 IP32 with <command>gcc</command> 3.0.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1865,15 +1808,12 @@
               FreeBSD/sparc64 5.0 with <command>gcc</command> 3.2.1:
             </para>
 
-            <para>
-              <literal>CFLAGS=-DHAVE_BROKEN_REALPATH ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CFLAGS=-DHAVE_BROKEN_REALPATH ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-innodb
+</programlisting>
           </listitem>
 
         </itemizedlist>
@@ -1892,15 +1832,13 @@
               Linux 2.2.xx SPARC with <command>egcs</command> 1.1.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1908,13 +1846,13 @@
               Linux 2.2.x with x686 with <command>gcc</command> 2.95.2:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3
-              -mpentiumpro -felide-constructors -fno-exceptions
-              -fno-rtti" ./configure --prefix=/usr/local/mysql
-              --enable-assembler --with-mysqld-ldflags=-all-static
-              --disable-shared --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3 -mpentiumpro
+-felide-constructors -fno-exceptions -fno-rtti" ./configure
+--prefix=/usr/local/mysql --enable-assembler
+--with-mysqld-ldflags=-all-static --disable-shared
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1922,27 +1860,25 @@
               SunOS 4.1.4 2 sun4c with <command>gcc</command> 2.7.2.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS="-O3
-              -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --disable-shared
-              --with-extra-charsets=complex --enable-assembler</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS="-O3 -felide-constructors" ./configure
+--prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex
+--enable-assembler
+</programlisting>
           </listitem>
 
           <listitem>
             <para>
               SunOS 5.5.1 (and above) sun4u with <command>egcs</command>
-              1.0.3a or 2.90.27 or
+              1.0.3a or 2.90.27 or <command>gcc</command> 2.95.2 and
+              newer:
             </para>
 
-            <para>
-              <command>gcc</command> 2.95.2 and newer: <literal>CC=gcc
-              CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-low-memory
-              --with-extra-charsets=complex --enable-assembler</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors
+-fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-low-memory --with-extra-charsets=complex --enable-assembler
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1950,11 +1886,10 @@
               SunOS 5.6 i86pc with <command>gcc</command> 2.8.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql --with-low-memory
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-low-memory --with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1962,11 +1897,10 @@
               BSDI BSD/OS 3.1 i386 with <command>gcc</command> 2.7.2.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1974,11 +1908,10 @@
               BSDI BSD/OS 2.1 i386 with <command>gcc</command> 2.7.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1986,11 +1919,10 @@
               AIX 4.2 with <command>gcc</command> 2.7.2.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
         </itemizedlist>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-31 03:56:32 UTC (rev 1145)
+++ trunk/refman-5.0/installing.xml	2006-01-31 04:26:46 UTC (rev 1146)
@@ -1326,15 +1326,13 @@
               Linux 2.4.xx x86 with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=pentiumpro" CXX=gcc
-              CXXFLAGS="-O2 -mcpu=pentiumpro -felide-constructors"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler --disable-shared
-              --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=pentiumpro" CXX=gcc CXXFLAGS="-O2 -mcpu=pentiumpro
+-felide-constructors" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --disable-shared
+--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1343,18 +1341,15 @@
               Compiler 8.1 or later releases):
             </para>
 
-            <para>
-              <literal>CC=icc CXX=icpc CFLAGS="-O3 -unroll2 -ip -mp
-              -no-gcc -restrict" CXXFLAGS="-O3 -unroll2 -ip -mp -no-gcc
-              -restrict" ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler --disable-shared
-              --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static --with-embedded-server
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=icc CXX=icpc CFLAGS="-O3 -unroll2 -ip -mp -no-gcc -restrict"
+CXXFLAGS="-O3 -unroll2 -ip -mp -no-gcc -restrict" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --enable-assembler
+--disable-shared --with-client-ldflags=-all-static
+--with-mysqld-ldflags=-all-static --with-embedded-server --with-innodb
+</programlisting>
 
             <para>
               Note that versions 8.1 and newer of the Intel compiler
@@ -1372,13 +1367,12 @@
               (Intel C++ Itanium Compiler 7.0):
             </para>
 
-            <para>
-              <literal>CC=ecc CFLAGS="-O2 -tpp2 -ip -nolib_inline"
-              CXX=ecc CXXFLAGS="-O2 -tpp2 -ip -nolib_inline" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client
-              --enable-local-infile</literal>
-            </para>
+<programlisting>
+CC=ecc CFLAGS="-O2 -tpp2 -ip -nolib_inline" CXX=ecc CXXFLAGS="-O2
+-tpp2 -ip -nolib_inline" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1387,12 +1381,11 @@
               (Intel C++ Itanium Compiler 7.0):
             </para>
 
-            <para>
-              <literal>CC=ecc CFLAGS=-tpp1 CXX=ecc CXXFLAGS=-tpp1
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile</literal>
-            </para>
+<programlisting>
+CC=ecc CFLAGS=-tpp1 CXX=ecc CXXFLAGS=-tpp1 ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1401,15 +1394,13 @@
               V6.2-505 / Compaq C++ V6.3-006):
             </para>
 
-            <para>
-              <literal>CC=ccc CFLAGS="-fast -arch generic" CXX=cxx
-              CXXFLAGS="-fast -arch generic -noexceptions -nortti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-mysqld-ldflags=-non_shared
-              --with-client-ldflags=-non_shared
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=ccc CFLAGS="-fast -arch generic" CXX=cxx CXXFLAGS="-fast -arch
+generic -noexceptions -nortti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-mysqld-ldflags=-non_shared
+--with-client-ldflags=-non_shared --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1417,17 +1408,15 @@
               Linux 2.x.xx ppc with <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-embedded-server
+--with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1435,14 +1424,12 @@
               Linux 2.4.xx s390 with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2" CXX=gcc CXXFLAGS="-O2
-              -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --disable-shared --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2" CXX=gcc CXXFLAGS="-O2 -felide-constructors" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1451,11 +1438,11 @@
               3.2.1:
             </para>
 
-            <para>
-              <literal>CXX=gcc ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CXX=gcc ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1463,17 +1450,14 @@
               Sun Solaris 8 x86 with <command>gcc</command> 3.2.3:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1481,16 +1465,14 @@
               Sun Solaris 8 SPARC with <command>gcc</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --with-named-z-libs=no --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-z-libs=no
+--with-named-curses-libs=-lcurses --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1499,16 +1481,14 @@
               3.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -m64 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -m64 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -m64 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-m64 -fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no
+--with-named-curses-libs=-lcurses --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1516,16 +1496,14 @@
               Sun Solaris 9 SPARC with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-curses-libs=-lcurses
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1534,15 +1512,13 @@
               Forte 5.0):
             </para>
 
-            <para>
-              <literal>CC=cc-5.0 CXX=CC ASFLAGS="-xarch=v9" CFLAGS="-Xa
-              -xstrconst -mt -D_FORTEC_ -xarch=v9" CXXFLAGS="-noex -mt
-              -D_FORTEC_ -xarch=v9" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler --with-named-z-libs=no
-              --enable-thread-safe-client --disable-shared</literal>
-            </para>
+<programlisting>
+CC=cc-5.0 CXX=CC ASFLAGS="-xarch=v9" CFLAGS="-Xa -xstrconst -mt
+-D_FORTEC_ -xarch=v9" CXXFLAGS="-noex -mt -D_FORTEC_ -xarch=v9"
+./configure --prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --enable-assembler
+--with-named-z-libs=no --enable-thread-safe-client --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1550,14 +1526,13 @@
               IBM AIX 4.3.2 ppc with <command>gcc</command> 3.2.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=powerpc -Wa,-many " CXX=gcc
-              CXXFLAGS="-O2 -mcpu=powerpc -Wa,-many -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=powerpc -Wa,-many " CXX=gcc CXXFLAGS="-O2
+-mcpu=powerpc -Wa,-many -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1566,17 +1541,14 @@
               Visual Age C/C++ 6.0):
             </para>
 
-            <para>
-              <literal>CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2
-              -qmaxmem=8192" CXX=xlC_r CXXFLAGS ="-ma -O2 -qstrict
-              -qoptimize=2 -qmaxmem=8192" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --disable-shared --with-innodb</literal>
-            </para>
+<programlisting>
+CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+CXX=xlC_r CXXFLAGS ="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1584,14 +1556,13 @@
               IBM AIX 5.1.0 ppc with <command>gcc</command> 3.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=powerpc -Wa,-many" CXX=gcc
-              CXXFLAGS="-O2 -mcpu=powerpc -Wa,-many -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=powerpc -Wa,-many" CXX=gcc CXXFLAGS="-O2 -mcpu=powerpc
+-Wa,-many -felide-constructors -fno-exceptions -fno-rtti" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1600,18 +1571,14 @@
               Visual Age C/C++ 6.0):
             </para>
 
-            <para>
-              <literal>CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2
-              -qmaxmem=8192" CXX=xlC_r CXXFLAGS="-ma -O2 -qstrict
-              -qoptimize=2 -qmaxmem=8192" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --disable-shared --with-embedded-server
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+CXX=xlC_r CXXFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared --with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1619,16 +1586,14 @@
               HP-UX 10.20 pa-risc1.1 with <command>gcc</command> 3.1:
             </para>
 
-            <para>
-              <literal>CFLAGS="-DHPUX -I/opt/dce/include -O3 -fPIC"
-              CXX=gcc CXXFLAGS="-DHPUX -I/opt/dce /include
-              -felide-constructors -fno-exceptions -fno-rtti -O3 -fPIC"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-pthread
-              --with-named-thread-libs=-ldce --with-lib-ccflags=-fPIC
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-DHPUX -I/opt/dce/include -O3 -fPIC" CXX=gcc CXXFLAGS="-DHPUX
+-I/opt/dce /include -felide-constructors -fno-exceptions -fno-rtti
+-O3 -fPIC" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-pthread --with-named-thread-libs=-ldce
+--with-lib-ccflags=-fPIC --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1637,15 +1602,13 @@
               C++ B3910B A.03.50):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS=+DAportable
-              CXXFLAGS=+DAportable ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS=+DAportable CXXFLAGS=+DAportable ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1654,12 +1617,11 @@
               (HP ANSI C++ B3910B A.03.33):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS=+DD64 CXXFLAGS=+DD64
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS=+DD64 CXXFLAGS=+DD64 ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1668,16 +1630,13 @@
               (HP ANSI C++ B3910B A.03.33):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS="+DAportable"
-              CXXFLAGS="+DAportable" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS="+DAportable" CXXFLAGS="+DAportable" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1686,16 +1645,13 @@
               aC++/ANSI C B3910B A.05.50):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS="+DD64 +DSitanium2"
-              CXXFLAGS="+DD64 +DSitanium2" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS="+DD64 +DSitanium2" CXXFLAGS="+DD64 +DSitanium2"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1704,14 +1660,13 @@
               3.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1719,13 +1674,12 @@
               FreeBSD 4.7 i386 with <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CFLAGS=-DHAVE_BROKEN_REALPATH ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler --with-named-z-libs=not-used
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS=-DHAVE_BROKEN_REALPATH ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-z-libs=not-used
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1734,23 +1688,19 @@
               <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98
-              -D_REENTRANT -D_THREAD_SAFE
-              -I/usr/local/include/pthread/linuxthreads"
-              CXXFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98
-              -D_REENTRANT -D_THREAD_SAFE
-              -I/usr/local/include/pthread/linuxthreads" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler
-              --with-named-thread-libs="-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
-              -D_THREAD_SAFE -I /usr/local/include/pthread/linuxthreads
-              -L/usr/local/lib -llthread -llgcc_r" --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98 -D_REENTRANT
+-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
+CXXFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98 -D_REENTRANT
+-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --enable-thread-safe-client
+--enable-local-infile --enable-assembler
+--with-named-thread-libs="-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
+-D_THREAD_SAFE -I /usr/local/include/pthread/linuxthreads
+-L/usr/local/lib -llthread -llgcc_r" --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1759,14 +1709,13 @@
               2.95.3qnx-nto 20010315:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
         </itemizedlist>
@@ -1787,14 +1736,13 @@
               2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O3 -mpentium" LDFLAGS=-static CXX=gcc
-              CXXFLAGS="-O3 -mpentium -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O3 -mpentium" LDFLAGS=-static CXX=gcc CXXFLAGS="-O3 -mpentium
+-felide-constructors" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1802,13 +1750,12 @@
               SCO UnixWare 7.1.4 i386 with <command>CC</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=cc CFLAGS="-O" CXX=CC ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared --with-readline</literal>
-            </para>
+<programlisting>
+CC=cc CFLAGS="-O" CXX=CC ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared --with-readline
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1816,13 +1763,12 @@
               SCO OpenServer 6.0.0 i386 with <command>CC</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=cc CFLAGS="-O" CXX=CC ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared --with-readline</literal>
-            </para>
+<programlisting>
+CC=cc CFLAGS="-O" CXX=CC ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared --with-readline
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1832,17 +1778,15 @@
               C++ V6.1-027):
             </para>
 
-            <para>
-              <literal>CC="cc -pthread" CFLAGS="-O4 -ansi_alias
-              -ansi_args -fast -inline speed -speculate all" CXX="cxx
-              -pthread" CXXFLAGS="-O4 -ansi_alias -fast -inline speed
-              -speculate all -noexceptions -nortti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-thread-libs="-lpthread -lmach -lexc -lc"
-              --disable-shared
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CC="cc -pthread" CFLAGS="-O4 -ansi_alias -ansi_args -fast -inline
+speed -speculate all" CXX="cxx -pthread" CXXFLAGS="-O4 -ansi_alias
+-fast -inline speed -speculate all -noexceptions -nortti" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile
+--with-named-thread-libs="-lpthread -lmach -lexc -lc" --disable-shared
+--with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1850,14 +1794,13 @@
               SGI Irix 6.5 IP32 with <command>gcc</command> 3.0.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1865,15 +1808,12 @@
               FreeBSD/sparc64 5.0 with <command>gcc</command> 3.2.1:
             </para>
 
-            <para>
-              <literal>CFLAGS=-DHAVE_BROKEN_REALPATH ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CFLAGS=-DHAVE_BROKEN_REALPATH ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-innodb
+</programlisting>
           </listitem>
 
         </itemizedlist>
@@ -1892,15 +1832,13 @@
               Linux 2.2.xx SPARC with <command>egcs</command> 1.1.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1908,13 +1846,13 @@
               Linux 2.2.x with x686 with <command>gcc</command> 2.95.2:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3
-              -mpentiumpro -felide-constructors -fno-exceptions
-              -fno-rtti" ./configure --prefix=/usr/local/mysql
-              --enable-assembler --with-mysqld-ldflags=-all-static
-              --disable-shared --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3 -mpentiumpro
+-felide-constructors -fno-exceptions -fno-rtti" ./configure
+--prefix=/usr/local/mysql --enable-assembler
+--with-mysqld-ldflags=-all-static --disable-shared
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1922,27 +1860,25 @@
               SunOS 4.1.4 2 sun4c with <command>gcc</command> 2.7.2.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS="-O3
-              -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --disable-shared
-              --with-extra-charsets=complex --enable-assembler</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS="-O3 -felide-constructors" ./configure
+--prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex
+--enable-assembler
+</programlisting>
           </listitem>
 
           <listitem>
             <para>
               SunOS 5.5.1 (and above) sun4u with <command>egcs</command>
-              1.0.3a or 2.90.27 or
+              1.0.3a or 2.90.27 or <command>gcc</command> 2.95.2 and
+              newer:
             </para>
 
-            <para>
-              <command>gcc</command> 2.95.2 and newer: <literal>CC=gcc
-              CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-low-memory
-              --with-extra-charsets=complex --enable-assembler</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors
+-fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-low-memory --with-extra-charsets=complex --enable-assembler
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1950,11 +1886,10 @@
               SunOS 5.6 i86pc with <command>gcc</command> 2.8.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql --with-low-memory
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-low-memory --with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1962,11 +1897,10 @@
               BSDI BSD/OS 3.1 i386 with <command>gcc</command> 2.7.2.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1974,11 +1908,10 @@
               BSDI BSD/OS 2.1 i386 with <command>gcc</command> 2.7.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1986,11 +1919,10 @@
               AIX 4.2 with <command>gcc</command> 2.7.2.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
         </itemizedlist>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-31 03:56:32 UTC (rev 1145)
+++ trunk/refman-5.1/installing.xml	2006-01-31 04:26:46 UTC (rev 1146)
@@ -1326,15 +1326,13 @@
               Linux 2.4.xx x86 with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=pentiumpro" CXX=gcc
-              CXXFLAGS="-O2 -mcpu=pentiumpro -felide-constructors"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler --disable-shared
-              --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=pentiumpro" CXX=gcc CXXFLAGS="-O2 -mcpu=pentiumpro
+-felide-constructors" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --disable-shared
+--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1343,18 +1341,15 @@
               Compiler 8.1 or later releases):
             </para>
 
-            <para>
-              <literal>CC=icc CXX=icpc CFLAGS="-O3 -unroll2 -ip -mp
-              -no-gcc -restrict" CXXFLAGS="-O3 -unroll2 -ip -mp -no-gcc
-              -restrict" ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler --disable-shared
-              --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static --with-embedded-server
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=icc CXX=icpc CFLAGS="-O3 -unroll2 -ip -mp -no-gcc -restrict"
+CXXFLAGS="-O3 -unroll2 -ip -mp -no-gcc -restrict" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --enable-assembler
+--disable-shared --with-client-ldflags=-all-static
+--with-mysqld-ldflags=-all-static --with-embedded-server --with-innodb
+</programlisting>
 
             <para>
               Note that versions 8.1 and newer of the Intel compiler
@@ -1372,13 +1367,12 @@
               (Intel C++ Itanium Compiler 7.0):
             </para>
 
-            <para>
-              <literal>CC=ecc CFLAGS="-O2 -tpp2 -ip -nolib_inline"
-              CXX=ecc CXXFLAGS="-O2 -tpp2 -ip -nolib_inline" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client
-              --enable-local-infile</literal>
-            </para>
+<programlisting>
+CC=ecc CFLAGS="-O2 -tpp2 -ip -nolib_inline" CXX=ecc CXXFLAGS="-O2
+-tpp2 -ip -nolib_inline" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1387,12 +1381,11 @@
               (Intel C++ Itanium Compiler 7.0):
             </para>
 
-            <para>
-              <literal>CC=ecc CFLAGS=-tpp1 CXX=ecc CXXFLAGS=-tpp1
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile</literal>
-            </para>
+<programlisting>
+CC=ecc CFLAGS=-tpp1 CXX=ecc CXXFLAGS=-tpp1 ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1401,15 +1394,13 @@
               V6.2-505 / Compaq C++ V6.3-006):
             </para>
 
-            <para>
-              <literal>CC=ccc CFLAGS="-fast -arch generic" CXX=cxx
-              CXXFLAGS="-fast -arch generic -noexceptions -nortti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-mysqld-ldflags=-non_shared
-              --with-client-ldflags=-non_shared
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=ccc CFLAGS="-fast -arch generic" CXX=cxx CXXFLAGS="-fast -arch
+generic -noexceptions -nortti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-mysqld-ldflags=-non_shared
+--with-client-ldflags=-non_shared --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1417,17 +1408,15 @@
               Linux 2.x.xx ppc with <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-embedded-server
+--with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1435,14 +1424,12 @@
               Linux 2.4.xx s390 with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2" CXX=gcc CXXFLAGS="-O2
-              -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --disable-shared --with-client-ldflags=-all-static
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2" CXX=gcc CXXFLAGS="-O2 -felide-constructors" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1451,11 +1438,11 @@
               3.2.1:
             </para>
 
-            <para>
-              <literal>CXX=gcc ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CXX=gcc ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1463,17 +1450,14 @@
               Sun Solaris 8 x86 with <command>gcc</command> 3.2.3:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1481,16 +1465,14 @@
               Sun Solaris 8 SPARC with <command>gcc</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --with-named-z-libs=no --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-z-libs=no
+--with-named-curses-libs=-lcurses --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1499,16 +1481,14 @@
               3.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -m64 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -m64 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -m64 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-m64 -fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no
+--with-named-curses-libs=-lcurses --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1516,16 +1496,14 @@
               Sun Solaris 9 SPARC with <command>gcc</command> 2.95.3:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --with-named-curses-libs=-lcurses
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-curses-libs=-lcurses
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1534,15 +1512,13 @@
               Forte 5.0):
             </para>
 
-            <para>
-              <literal>CC=cc-5.0 CXX=CC ASFLAGS="-xarch=v9" CFLAGS="-Xa
-              -xstrconst -mt -D_FORTEC_ -xarch=v9" CXXFLAGS="-noex -mt
-              -D_FORTEC_ -xarch=v9" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler --with-named-z-libs=no
-              --enable-thread-safe-client --disable-shared</literal>
-            </para>
+<programlisting>
+CC=cc-5.0 CXX=CC ASFLAGS="-xarch=v9" CFLAGS="-Xa -xstrconst -mt
+-D_FORTEC_ -xarch=v9" CXXFLAGS="-noex -mt -D_FORTEC_ -xarch=v9"
+./configure --prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --enable-assembler
+--with-named-z-libs=no --enable-thread-safe-client --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1550,14 +1526,13 @@
               IBM AIX 4.3.2 ppc with <command>gcc</command> 3.2.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=powerpc -Wa,-many " CXX=gcc
-              CXXFLAGS="-O2 -mcpu=powerpc -Wa,-many -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=powerpc -Wa,-many " CXX=gcc CXXFLAGS="-O2
+-mcpu=powerpc -Wa,-many -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1566,17 +1541,14 @@
               Visual Age C/C++ 6.0):
             </para>
 
-            <para>
-              <literal>CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2
-              -qmaxmem=8192" CXX=xlC_r CXXFLAGS ="-ma -O2 -qstrict
-              -qoptimize=2 -qmaxmem=8192" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --disable-shared --with-innodb</literal>
-            </para>
+<programlisting>
+CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+CXX=xlC_r CXXFLAGS ="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1584,14 +1556,13 @@
               IBM AIX 5.1.0 ppc with <command>gcc</command> 3.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O2 -mcpu=powerpc -Wa,-many" CXX=gcc
-              CXXFLAGS="-O2 -mcpu=powerpc -Wa,-many -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O2 -mcpu=powerpc -Wa,-many" CXX=gcc CXXFLAGS="-O2 -mcpu=powerpc
+-Wa,-many -felide-constructors -fno-exceptions -fno-rtti" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1600,18 +1571,14 @@
               Visual Age C/C++ 6.0):
             </para>
 
-            <para>
-              <literal>CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2
-              -qmaxmem=8192" CXX=xlC_r CXXFLAGS="-ma -O2 -qstrict
-              -qoptimize=2 -qmaxmem=8192" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-named-z-libs=no
-              --disable-shared --with-embedded-server
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=xlc_r CFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+CXX=xlC_r CXXFLAGS="-ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --with-named-z-libs=no
+--disable-shared --with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1619,16 +1586,14 @@
               HP-UX 10.20 pa-risc1.1 with <command>gcc</command> 3.1:
             </para>
 
-            <para>
-              <literal>CFLAGS="-DHPUX -I/opt/dce/include -O3 -fPIC"
-              CXX=gcc CXXFLAGS="-DHPUX -I/opt/dce /include
-              -felide-constructors -fno-exceptions -fno-rtti -O3 -fPIC"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --with-pthread
-              --with-named-thread-libs=-ldce --with-lib-ccflags=-fPIC
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-DHPUX -I/opt/dce/include -O3 -fPIC" CXX=gcc CXXFLAGS="-DHPUX
+-I/opt/dce /include -felide-constructors -fno-exceptions -fno-rtti
+-O3 -fPIC" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-pthread --with-named-thread-libs=-ldce
+--with-lib-ccflags=-fPIC --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1637,15 +1602,13 @@
               C++ B3910B A.03.50):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS=+DAportable
-              CXXFLAGS=+DAportable ./configure --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS=+DAportable CXXFLAGS=+DAportable ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1654,12 +1617,11 @@
               (HP ANSI C++ B3910B A.03.33):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS=+DD64 CXXFLAGS=+DD64
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS=+DD64 CXXFLAGS=+DD64 ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1668,16 +1630,13 @@
               (HP ANSI C++ B3910B A.03.33):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS="+DAportable"
-              CXXFLAGS="+DAportable" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS="+DAportable" CXXFLAGS="+DAportable" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1686,16 +1645,13 @@
               aC++/ANSI C B3910B A.05.50):
             </para>
 
-            <para>
-              <literal>CC=cc CXX=aCC CFLAGS="+DD64 +DSitanium2"
-              CXXFLAGS="+DD64 +DSitanium2" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CC=cc CXX=aCC CFLAGS="+DD64 +DSitanium2" CXXFLAGS="+DD64 +DSitanium2"
+./configure --prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1704,14 +1660,13 @@
               3.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1719,13 +1674,12 @@
               FreeBSD 4.7 i386 with <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CFLAGS=-DHAVE_BROKEN_REALPATH ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler --with-named-z-libs=not-used
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS=-DHAVE_BROKEN_REALPATH ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --with-named-z-libs=not-used
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1734,23 +1688,19 @@
               <command>gcc</command> 2.95.4:
             </para>
 
-            <para>
-              <literal>CFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98
-              -D_REENTRANT -D_THREAD_SAFE
-              -I/usr/local/include/pthread/linuxthreads"
-              CXXFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98
-              -D_REENTRANT -D_THREAD_SAFE
-              -I/usr/local/include/pthread/linuxthreads" ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --enable-thread-safe-client --enable-local-infile
-              --enable-assembler
-              --with-named-thread-libs="-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
-              -D_THREAD_SAFE -I /usr/local/include/pthread/linuxthreads
-              -L/usr/local/lib -llthread -llgcc_r" --disable-shared
-              --with-embedded-server --with-innodb</literal>
-            </para>
+<programlisting>
+CFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98 -D_REENTRANT
+-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
+CXXFLAGS="-DHAVE_BROKEN_REALPATH -D__USE_UNIX98 -D_REENTRANT
+-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads" ./configure
+--prefix=/usr/local/mysql --localstatedir=/usr/local/mysql/data
+--libexecdir=/usr/local/mysql/bin --enable-thread-safe-client
+--enable-local-infile --enable-assembler
+--with-named-thread-libs="-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
+-D_THREAD_SAFE -I /usr/local/include/pthread/linuxthreads
+-L/usr/local/lib -llthread -llgcc_r" --disable-shared
+--with-embedded-server --with-innodb
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1759,14 +1709,13 @@
               2.95.3qnx-nto 20010315:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
         </itemizedlist>
@@ -1787,14 +1736,13 @@
               2.95.3:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O3 -mpentium" LDFLAGS=-static CXX=gcc
-              CXXFLAGS="-O3 -mpentium -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CFLAGS="-O3 -mpentium" LDFLAGS=-static CXX=gcc CXXFLAGS="-O3 -mpentium
+-felide-constructors" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1802,13 +1750,12 @@
               SCO UnixWare 7.1.4 i386 with <command>CC</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=cc CFLAGS="-O" CXX=CC ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared --with-readline</literal>
-            </para>
+<programlisting>
+CC=cc CFLAGS="-O" CXX=CC ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared --with-readline
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1816,13 +1763,12 @@
               SCO OpenServer 6.0.0 i386 with <command>CC</command> 3.2:
             </para>
 
-            <para>
-              <literal>CC=cc CFLAGS="-O" CXX=CC ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-z-libs=no --enable-thread-safe-client
-              --disable-shared --with-readline</literal>
-            </para>
+<programlisting>
+CC=cc CFLAGS="-O" CXX=CC ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --with-named-z-libs=no --enable-thread-safe-client
+--disable-shared --with-readline
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1832,17 +1778,15 @@
               C++ V6.1-027):
             </para>
 
-            <para>
-              <literal>CC="cc -pthread" CFLAGS="-O4 -ansi_alias
-              -ansi_args -fast -inline speed -speculate all" CXX="cxx
-              -pthread" CXXFLAGS="-O4 -ansi_alias -fast -inline speed
-              -speculate all -noexceptions -nortti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --with-named-thread-libs="-lpthread -lmach -lexc -lc"
-              --disable-shared
-              --with-mysqld-ldflags=-all-static</literal>
-            </para>
+<programlisting>
+CC="cc -pthread" CFLAGS="-O4 -ansi_alias -ansi_args -fast -inline
+speed -speculate all" CXX="cxx -pthread" CXXFLAGS="-O4 -ansi_alias
+-fast -inline speed -speculate all -noexceptions -nortti" ./configure
+--prefix=/usr/local/mysql --with-extra-charsets=complex
+--enable-thread-safe-client --enable-local-infile
+--with-named-thread-libs="-lpthread -lmach -lexc -lc" --disable-shared
+--with-mysqld-ldflags=-all-static
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1850,14 +1794,13 @@
               SGI Irix 6.5 IP32 with <command>gcc</command> 3.0.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-extra-charsets=complex
-              --enable-thread-safe-client --enable-local-infile
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1865,15 +1808,12 @@
               FreeBSD/sparc64 5.0 with <command>gcc</command> 3.2.1:
             </para>
 
-            <para>
-              <literal>CFLAGS=-DHAVE_BROKEN_REALPATH ./configure
-              --prefix=/usr/local/mysql
-              --localstatedir=/usr/local/mysql/data
-              --libexecdir=/usr/local/mysql/bin
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --disable-shared
-              --with-innodb</literal>
-            </para>
+<programlisting>
+CFLAGS=-DHAVE_BROKEN_REALPATH ./configure --prefix=/usr/local/mysql
+--localstatedir=/usr/local/mysql/data --libexecdir=/usr/local/mysql/bin
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --disable-shared --with-innodb
+</programlisting>
           </listitem>
 
         </itemizedlist>
@@ -1892,15 +1832,13 @@
               Linux 2.2.xx SPARC with <command>egcs</command> 1.1.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer"
-              CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer
-              -felide-constructors -fno-exceptions -fno-rtti"
-              ./configure --prefix=/usr/local/mysql
-              --with-extra-charsets=complex --enable-thread-safe-client
-              --enable-local-infile --enable-assembler
-              --disable-shared</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3
+-fno-omit-frame-pointer -felide-constructors -fno-exceptions
+-fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex --enable-thread-safe-client
+--enable-local-infile --enable-assembler --disable-shared
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1908,13 +1846,13 @@
               Linux 2.2.x with x686 with <command>gcc</command> 2.95.2:
             </para>
 
-            <para>
-              <literal>CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3
-              -mpentiumpro -felide-constructors -fno-exceptions
-              -fno-rtti" ./configure --prefix=/usr/local/mysql
-              --enable-assembler --with-mysqld-ldflags=-all-static
-              --disable-shared --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3 -mpentiumpro
+-felide-constructors -fno-exceptions -fno-rtti" ./configure
+--prefix=/usr/local/mysql --enable-assembler
+--with-mysqld-ldflags=-all-static --disable-shared
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1922,27 +1860,25 @@
               SunOS 4.1.4 2 sun4c with <command>gcc</command> 2.7.2.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS="-O3
-              -felide-constructors" ./configure
-              --prefix=/usr/local/mysql --disable-shared
-              --with-extra-charsets=complex --enable-assembler</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS="-O3 -felide-constructors" ./configure
+--prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex
+--enable-assembler
+</programlisting>
           </listitem>
 
           <listitem>
             <para>
               SunOS 5.5.1 (and above) sun4u with <command>egcs</command>
-              1.0.3a or 2.90.27 or
+              1.0.3a or 2.90.27 or <command>gcc</command> 2.95.2 and
+              newer:
             </para>
 
-            <para>
-              <command>gcc</command> 2.95.2 and newer: <literal>CC=gcc
-              CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors
-              -fno-exceptions -fno-rtti" ./configure
-              --prefix=/usr/local/mysql --with-low-memory
-              --with-extra-charsets=complex --enable-assembler</literal>
-            </para>
+<programlisting>
+CC=gcc CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors
+-fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql
+--with-low-memory --with-extra-charsets=complex --enable-assembler
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1950,11 +1886,10 @@
               SunOS 5.6 i86pc with <command>gcc</command> 2.8.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql --with-low-memory
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-low-memory --with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1962,11 +1897,10 @@
               BSDI BSD/OS 3.1 i386 with <command>gcc</command> 2.7.2.1:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1974,11 +1908,10 @@
               BSDI BSD/OS 2.1 i386 with <command>gcc</command> 2.7.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
           <listitem>
@@ -1986,11 +1919,10 @@
               AIX 4.2 with <command>gcc</command> 2.7.2.2:
             </para>
 
-            <para>
-              <literal>CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure
-              --prefix=/usr/local/mysql
-              --with-extra-charsets=complex</literal>
-            </para>
+<programlisting>
+CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql
+--with-extra-charsets=complex
+</programlisting>
           </listitem>
 
         </itemizedlist>

Thread
svn commit - mysqldoc@docsrva: r1146 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul31 Jan