diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86 b/configure/os/CONFIG.solaris-x86.solaris-x86
index eb1de16c7..7eebbf593 100644
--- a/configure/os/CONFIG.solaris-x86.solaris-x86
+++ b/configure/os/CONFIG.solaris-x86.solaris-x86
@@ -52,7 +52,11 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS_YES =  -G -h $@
+SHRLIB_LDFLAGS_YES = -G -h $@
 
-DEPENDS_FLAG = -xM1
+# gnu compiler used because Sun compiler output
+# includes headers from /opt/SUNWspro and does
+# not work for c++ headers without .h suffix.
+DEPENDS_FLAG = -MM
+DEPENDS.cpp = g++