--- trunk/OOPSE/ac-tools/aclocal.m4	2004/05/27 15:31:36	1201
+++ trunk/OOPSE/ac-tools/aclocal.m4	2004/05/27 16:20:36	1202
@@ -534,7 +534,7 @@ if test "$ac_test_CFLAGS" != "set"; then
         fi;;
    *darwin*)
 	if test "$CC" = xlc -o "$CC" = cc; then
-        	CFLAGS="-qthreaded -O5 -Q=20 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
+        	CFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
         fi;;
   esac
 
@@ -652,8 +652,8 @@ if test "$ac_test_CXXFLAGS" != "set"; then
 		echo "*******************************************************"
         fi;;
    *darwin*)
-	if test "$CXX" = xlC; then
-        	CXXFLAGS="-qthreaded -O5 -Q=20 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
+	if test "$CXX" = xlc++; then
+        	CXXFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
         fi;;
   esac
 
@@ -767,7 +767,7 @@ if test x"$F90FLAGS" = x ; then
 		echo "*******************************************************"
         fi;;
    *darwin*)
-	if test "$F90" = f90 -o "$F90" = xlf90; then
+	if test "$F90" = f90 -o "$F90" = xlf90 -o "$F90" = xlf95; then
         	F90FLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto"
         fi;;
   esac