6 files changed, 34 insertions, 41 deletions
diff --git a/config/conclude.in b/config/conclude.in
index 3740080..2f55ede 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -81,7 +81,8 @@ uninstall:
 # remove things like object files but not libraries or executables.
 #
 mostlyclean:
-	-$(RM) $(LIB_OBJ) $(TEST_OBJ) $(PROG_OBJ) $(MOSTLYCLEAN)
+	-$(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o)
+	-$(RM) $(TEST_OBJ) $(PROG_OBJ) $(MOSTLYCLEAN)
 
 # Like `mostlyclean' except it also removes the final targets: things like
 # libraries and executables.  This target doesn't remove any file that
diff --git a/config/dec-osf4.x b/config/dec-osf4.x
index c16f212..fcfc0e3 100644
--- a/config/dec-osf4.x
+++ b/config/dec-osf4.x
@@ -12,9 +12,9 @@ if test "X-" =  "X-$CC"; then
     CC_BASENAME=cc
 fi
 
-# Architecture dependent flags
-ARCH=${ARCH:='-arch host -tune host'}
-
-# Try compiler flags.
+# Try GNU compiler flags.
 . ./config/gnu-flags
+
+# Try native DEC compiler
+ARCH=${ARCH:='-arch host -tune host'}
 . ./config/dec-flags
diff --git a/config/powerpc-ibm-aix4.2.1.0 b/config/powerpc-ibm-aix4.x
index 24176a5..24176a5 100644
--- a/config/powerpc-ibm-aix4.2.1.0
+++ b/config/powerpc-ibm-aix4.x
diff --git a/config/rs6000-ibm-aix4.1.4.0 b/config/rs6000-ibm-aix4.x
index 2f7cc86..2f7cc86 100644
--- a/config/rs6000-ibm-aix4.1.4.0
+++ b/config/rs6000-ibm-aix4.x
diff --git a/config/solaris2.5 b/config/solaris2.5
deleted file mode 100644
index 686fc75..0000000
--- a/config/solaris2.5
+++ /dev/null
@@ -1,36 +0,0 @@
-#							-*- shell-script -*-
-#
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details
-
-# The default compiler is `gcc'
-if test "X-" =  "X-$CC"; then
-    CC=gcc
-    CC_BASENAME=gcc
-fi
-
-# Compiler flags
-case "X-$CC_BASENAME" in
-    X-gcc)
-	CFLAGS="$CFLAGS -ansi"
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS="-DH5F_LOW_DFLT=H5F_LOW_SEC2"
-	PROD_CFLAGS="-O3 -finline-functions"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS=-pg
-	PROFILE_CPPFLAGS=
-	;;
-
-    *)
-	CFLAGS="-erroff=%none"
-	DEBUG_CFLAGS=-g
-	DEBUG_CPPFLAGS="-DH5F_LOW_DFLT=H5F_LOW_SEC2"
-	PROD_CFLAGS=-xO2
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS=-xpg
-	PROFILE_CPPFLAGS=
-	;;
-esac
diff --git a/config/solaris2.x b/config/solaris2.x
new file mode 100644
index 0000000..5817957
--- /dev/null
+++ b/config/solaris2.x
@@ -0,0 +1,28 @@
+#							-*- shell-script -*-
+#
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+#
+# See BlankForm in this directory for details
+
+# The default compiler is `gcc'
+if test "X-" =  "X-$CC"; then
+    CC=gcc
+    CC_BASENAME=gcc
+fi
+
+# Try gcc compiler flags
+. ./config/gnu-flags
+
+# Try solaris native compiler flags
+if test "X-" = "X-$cc_flags_set; then
+    CFLAGS="-erroff=%none"
+    DEBUG_CFLAGS=-g
+    DEBUG_CPPFLAGS="-DH5F_LOW_DFLT=H5F_LOW_SEC2"
+    PROD_CFLAGS=-xO2
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS=-xpg
+    PROFILE_CPPFLAGS=
+    cc_flags_set=yes
+fi