[svn-r27653] Merge of r27645 from the autotools branch.

Updates to older special config files in configure.ac:

- solaris2.x renamed to solaris. There are recent changes to this file
  but the "2.x" is misleading since the changes are applied to all
  versions.

- Removed support for OSF 4.x/5.x (Digital and Tru64 Unix). We no
  longer have the config files for these.


Tested on: h5committest

4 files changed, 5 insertions, 17 deletions

diff --git a/MANIFEST b/MANIFEST
index d557809..6490071 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -113,7 +113,7 @@
 ./config/pgi-fflags
 ./config/pgi-flags
 ./config/powerpc-ibm-aix5.x
-./config/solaris2.x
+./config/solaris
 ./config/x86_64-pc-cygwin
 
 ./config/site-specific/BlankForm
diff --git a/config/solaris2.x b/config/solaris
index 310c373..310c373 100644
--- a/config/solaris2.x
+++ b/config/solaris
diff --git a/configure b/configure
index 9d4726f..6c8b0ff 100755
--- a/configure
+++ b/configure
@@ -3956,14 +3956,8 @@ case $host_os in
   freebsd*)
     host_os_novers=freebsd
     ;;
-  osf4.*)
-    host_os_novers=osf4.x
-    ;;
-  osf5.*)
-    host_os_novers=osf5.x
-    ;;
-  solaris2.*)
-    host_os_novers=solaris2.x
+  solaris*)
+    host_os_novers=solaris
     ;;
   *)
     host_os_novers=$host_os
diff --git a/configure.ac b/configure.ac
index 63170b7..3d4c4a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,14 +246,8 @@ case $host_os in
   freebsd*)
     host_os_novers=freebsd
     ;;
-  osf4.*)
-    host_os_novers=osf4.x
-    ;;
-  osf5.*)
-    host_os_novers=osf5.x
-    ;;
-  solaris2.*)
-    host_os_novers=solaris2.x
+  solaris*)
+    host_os_novers=solaris
     ;;
   *)
     host_os_novers=$host_os