summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2011-05-13 09:31:24 +0000
committerDRC <dcommander@users.sourceforge.net>2011-05-13 09:31:24 +0000
commit69854b4f09e2c131d4f692b4dff992e9a51c65c4 (patch)
treef585b0c3397fbf6206102f458009aa7dfe7b2973
parent9a43929627a0ae3f844f4ae66d0534e3a666b869 (diff)
downloadtigervnc-69854b4f09e2c131d4f692b4dff992e9a51c65c4.tar.gz
tigervnc-69854b4f09e2c131d4f692b4dff992e9a51c65c4.zip
Require gettext 0.14.4 to fix a problem with detection of NLS support
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4409 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--BUILDING.txt26
-rw-r--r--configure.ac2
2 files changed, 21 insertions, 7 deletions
diff --git a/BUILDING.txt b/BUILDING.txt
index 3048647e..8bb18f22 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -7,10 +7,6 @@
Build Requirements
==================
--- autoconf 2.57 or later
--- automake 1.7 or later
--- libtool 1.4 or later
-
-- NASM
* 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
@@ -36,13 +32,31 @@ Build Requirements
-- X11 development kit
+-- If building TLS support:
+ * GnuTLS and its dependencies (libgcrypt, libtasn1, libgpg-error)
+
-- If building Xvnc:
* Python v2.3 or later
* zlib v1.2 or later
* OpenSSL v0.9.7 or later
--- If building TLS support:
- * GnuTLS and its dependencies (libgcrypt, libtasn1, libgpg-error)
+ * pkgconfig 0.20 or later
+ If you are using an older RPM-based system which does not meet this
+ minimum requirement (such as Red Hat Enterprise Linux 4), then you can
+ build pkgconfig 0.20 from the Fedora 5 source RPM:
+ http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/source/SRPMS/pkgconfig-0.20-2.2.1.src.rpm
+
+-- If building Xvnc or building TigerVNC from the subversion repository:
+ * autoconf 2.57 or later
+ * automake 1.7 or later
+ * libtool 1.4 or later
+
+ * gettext 0.14.4 or later
+ If you are using an older RPM-based system which does not meet this
+ minimum requirement (such as Red Hat Enterprise Linux 4), then you can
+ build gettext 0.14.5 from the Fedora 5 source RPM:
+ http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/source/SRPMS/gettext-0.14.5-3.src.rpm
+ NOTE: gcj and libgcj are required when building the above source RPM.
==================
diff --git a/configure.ac b/configure.ac
index 64c0b7a0..e7ced46a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PROG_CXX
AC_PROG_LIBTOOL
AC_LANG([C++])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.14.1])
+AM_GNU_GETTEXT_VERSION([0.14.4])
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)