updates to the INSTALL files.

7 files changed, 15 insertions, 22 deletions

diff --git a/cpp/INSTALL.AIX b/cpp/INSTALL.AIX
index 5893e53853c..d69d6f3789d 100644
--- a/cpp/INSTALL.AIX
+++ b/cpp/INSTALL.AIX
@@ -38,6 +38,9 @@ Ice has dependencies on a number of third-party libraries:
   (plus --prefix=<dir> and/or --enable-java if you like)
   $ gmake
 
+  If you intend to use Ice for Java with Berkeley DB, you must also
+  include the option --enable-java.
+
   For 64 bit builds, use this configuration:
 
   $ export OBJECT_MODE=64
@@ -47,12 +50,11 @@ Ice has dependencies on a number of third-party libraries:
 
 - OpenSSL
 
-  For 32 bit builds, we recommend openssl-0.9.6m-2 from the "AIX
+  For 32 bit builds, we recommend openssl-0.9.7g-1 from the "AIX
   Toolbox for Linux Applications" (cryptographic section):
   http://www.ibm.com/servers/aix/products/aixos/linux/ezinstall.html
-  Do not use openssl-0.9.6m-1, as it was not built properly.
 
-  For 64 bit builds, we recommend using OpenSSL 0.9.7d (or later).
+  For 64 bit builds, we recommend using OpenSSL 0.9.8b (or later).
   You can download the source distribution from
   http://www.openssl.org.
 
diff --git a/cpp/INSTALL.FREEBSD b/cpp/INSTALL.FREEBSD
index c6f783e0794..cc268cf246e 100644
--- a/cpp/INSTALL.FREEBSD
+++ b/cpp/INSTALL.FREEBSD
@@ -25,7 +25,7 @@ Ice has dependencies on a number of third-party libraries:
   If you intend to use Ice for Java with Berkeley DB, you must also
   include the option --enable-java.
 
-- OpenSSL 0.9.6 or later
+- OpenSSL 0.9.7 or later (OpenSSL 0.9.8 recommended)
 
 - expat 1.9x
 
diff --git a/cpp/INSTALL.HP-UX b/cpp/INSTALL.HP-UX
index adaa20346ab..2ff09f2a28a 100644
--- a/cpp/INSTALL.HP-UX
+++ b/cpp/INSTALL.HP-UX
@@ -15,7 +15,7 @@ for free from http://software.hp.com.
 C++ compiler
 ------------
 
-HP aC++ A.03.37
+HP aC++ A.03.56
 
 More recent versions of aC++ are likely to work as well.
 
@@ -45,6 +45,9 @@ Ice has dependencies on a number of third-party libraries:
   (plus --prefix=<dir> and/or --enable-java if you like)
   $ gmake
 
+  If you intend to use Ice for Java with Berkeley DB, you must also
+  include the option --enable-java.
+
   For 64 bit builds, use:
 
   $ export CXXOPTS="-AA +DD64 -mt"
diff --git a/cpp/INSTALL.LINUX b/cpp/INSTALL.LINUX
index b4e34a4ab32..b35f75bda5b 100644
--- a/cpp/INSTALL.LINUX
+++ b/cpp/INSTALL.LINUX
@@ -28,17 +28,9 @@ Ice has dependencies on a number of third-party libraries:
   You can download the Berkeley DB source distribution from
   http://www.sleepycat.com/download
 
-  On Fedora Core 4, we recommend changing the default optimization
-  level when building Berkeley DB in order to avoid a compiler bug
-  in the FC4 version of GCC. If you are building with Java support
-  this is absolutely necessary. We recommend that you use the
-  following syntax when you run configure:
-
-  $ CFLAGS="-O1" ../dist/configure <your configure options>
-
 - expat 1.9x
 
-- OpenSSL 0.9.7 or later
+- OpenSSL 0.9.7 or later (OpenSSL 0.9.8 or later recommended)
 
 - bzip2 1.0
 
diff --git a/cpp/INSTALL.SOLARIS b/cpp/INSTALL.SOLARIS
index 81206e0f3fc..1d69820969f 100644
--- a/cpp/INSTALL.SOLARIS
+++ b/cpp/INSTALL.SOLARIS
@@ -46,7 +46,7 @@ Ice has dependencies on a number of third-party libraries:
 
 - expat 1.9x
 
-- OpenSSL 0.98
+- OpenSSL 0.9.7 or later (OpenSSL 0.9.8 or later recommended)
 
 - bzip2 1.0
 
diff --git a/cpp/INSTALL.WINDOWS b/cpp/INSTALL.WINDOWS
index 7d69b413bba..0a17db1217c 100644
--- a/cpp/INSTALL.WINDOWS
+++ b/cpp/INSTALL.WINDOWS
@@ -47,7 +47,7 @@ Ice has dependencies on a number of third-party libraries:
 - STLport 4.5 or later (required for Visual C++ 6.0)
 - Berkeley DB 4.3.29
 - expat 1.9x
-- OpenSSL 0.9.6 or later
+- OpenSSL 0.9.7 or later (OpenSSL 0.9.8 or later recommended)
 - bzip2 1.0
 
 If you have downloaded an Ice binary installer, you already have all 
@@ -182,7 +182,7 @@ If you built the tests you can run the test suite, provided that you
 have installed Python. Open a command prompt and change to the top-
 level Ice directory. At the command prompt, execute:
 
-python allTests.py
+  python allTests.py
 
 If everything worked out, you should see lots of "ok" messages. In
 case of a failure, the tests abort with "failed".
diff --git a/cpp/install/unix/README.AIX b/cpp/install/unix/README.AIX
index 337113b1df9..b64103f3017 100644
--- a/cpp/install/unix/README.AIX
+++ b/cpp/install/unix/README.AIX
@@ -44,11 +44,7 @@ The following binary RPMs are required to use this distribution:
 
 - bzip2-1.0.2-2.aix4.3.ppc.rpm
 - expat-1.95.7-1.aix5.1.ppc.rpm 
-- openssl-0.9.7d-1.aix5.1.ppc.rpm
-
-To build C++ applications, this RPM is also required:
-
-- openssl-devel-0.9.7d-1.aix5.1.ppc.rpm
+- openssl-0.9.7g-1.aix5.1.ppc.rpm
 
 The RPMs can be obtained from