Update build documentation to reflect the fact that libjpeg-turbo 32-bit will not build on NASM 0.99 or 2.00 (due to what appears to be a NASM bug, but scant information is available on it), and make the instructions applicable to any NASM version, not just 2.05.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_1@4377 3789f03b-4d11-0410-bbf8-ca57d06f2519

1 files changed, 13 insertions, 9 deletions

diff --git a/BUILDING.txt b/BUILDING.txt
index 043ad2a4..3048647e 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -12,21 +12,25 @@ Build Requirements
 -- libtool 1.4 or later
 
 -- NASM
-   * 0.98 or later is required for a 32-bit build
-   * NASM 2.05 or later is required for a 64-bit build
+   * 0.98, or 2.01 or later is required for a 32-bit build
+   * NASM 2.00 or later is required for a 64-bit build
    * NASM 2.07 or later is required for a 64-bit build on OS X.  This can be
      obtained from MacPorts (http://www.macports.org/).
 
-   The NASM 2.05 RPMs do not work on older Linux systems, such as Red Hat
-   Enterprise Linux 4.  On such systems, you can easily build and install NASM
-   2.05 from the source RPM by executing the following as root:
+   The binary RPMs released by the NASM project do not work on older Linux
+   systems, such as Red Hat Enterprise Linux 4.  On such systems, you can
+   easily build and install NASM from a source RPM by downloading one of the
+   SRPMs from
+
+   http://www.nasm.us/pub/nasm/releasebuilds
+
+   and executing the following as root:
 
      ARCH=`uname -m`
-     wget http://www.nasm.us/pub/nasm/releasebuilds/2.05.01/nasm-2.05.01-1.src.rpm
-     rpmbuild --rebuild nasm-2.05.01-1.src.rpm
-     rpm -Uvh /usr/src/redhat/RPMS/$ARCH/nasm-2.05.01-1.$ARCH.rpm
+     rpmbuild --rebuild nasm-{version}.src.rpm
+     rpm -Uvh /usr/src/redhat/RPMS/$ARCH/nasm-{version}.$ARCH.rpm
 
-   NOTE: NASM build will fail if texinfo is not installed.
+   NOTE: the NASM build will fail if texinfo is not installed.
 
 -- GCC v4.1 or later recommended for best performance