#
# Updated but not checked in:
#   (will commit)
#
#	modified: xcb-util/atom/Makefile.am
#	modified: xcb-util/configure.ac
#	modified: xcb-util/convenient/Makefile.am
#	modified: xcb-util/event/Makefile.am
#	modified: xcb-util/icccm/Makefile.am
#	modified: xcb-util/image/Makefile.am
#	modified: xcb-util/keysyms/Makefile.am
#	modified: xcb-util/property/Makefile.am
#	modified: xcb-util/reply/Makefile.am
#	modified: xcb-util/wm/Makefile.am
diff --git a/xcb-util/atom/Makefile.am b/xcb-util/atom/Makefile.am
index 62119d1..a537d11 100644
--- a/xcb-util/atom/Makefile.am
+++ b/xcb-util/atom/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBAtom.la
 
 xcbinclude_HEADERS = xcb_atom.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 libXCBAtom_la_SOURCES = atoms.c
 libXCBAtom_la_CFLAGS = $(XCB_CFLAGS)
diff --git a/xcb-util/configure.ac b/xcb-util/configure.ac
index e29ba58..5bbad95 100644
--- a/xcb-util/configure.ac
+++ b/xcb-util/configure.ac
@@ -11,6 +11,16 @@ fi
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+if  test "x$GCC" = xyes ; then
+    CWARNFLAGS="-Wall"
+else
+    AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+    if test "x$SUNCC" = "xyes"; then
+	CWARNFLAGS="-v"
+    fi
+fi
+AC_SUBST(CWARNFLAGS)
+
 xcbincludedir='${includedir}/X11/XCB'
 AC_SUBST(xcbincludedir)
 
diff --git a/xcb-util/convenient/Makefile.am b/xcb-util/convenient/Makefile.am
index bd9eab4..ebc4a10 100644
--- a/xcb-util/convenient/Makefile.am
+++ b/xcb-util/convenient/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBAux.la
 
 xcbinclude_HEADERS = xcb_aux.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 libXCBAux_la_SOURCES = xcb_aux.c
 libXCBAux_la_CFLAGS = $(XCB_CFLAGS)
diff --git a/xcb-util/event/Makefile.am b/xcb-util/event/Makefile.am
index 32440bd..bd53055 100644
--- a/xcb-util/event/Makefile.am
+++ b/xcb-util/event/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBEvent.la
 
 xcbinclude_HEADERS = xcb_event.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 libXCBEvent_la_SOURCES = events.c
 libXCBEvent_la_CFLAGS = $(XCB_CFLAGS)
diff --git a/xcb-util/icccm/Makefile.am b/xcb-util/icccm/Makefile.am
index cf78df0..f5ff32a 100644
--- a/xcb-util/icccm/Makefile.am
+++ b/xcb-util/icccm/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBICCCM.la
 
 xcbinclude_HEADERS = xcb_icccm.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 libXCBICCCM_la_SOURCES = icccm.c
 libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) $(XCB_ATOM_CFLAGS) $(XCB_EVENT_CFLAGS) \
diff --git a/xcb-util/image/Makefile.am b/xcb-util/image/Makefile.am
index 1237aad..d688fca 100644
--- a/xcb-util/image/Makefile.am
+++ b/xcb-util/image/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBImage.la
 
 xcbinclude_HEADERS = xcb_image.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 XCB_IMAGE_LIBS = libXCBImage.la
 
diff --git a/xcb-util/keysyms/Makefile.am b/xcb-util/keysyms/Makefile.am
index 6765333..e5a38cd 100644
--- a/xcb-util/keysyms/Makefile.am
+++ b/xcb-util/keysyms/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBKeysyms.la
 
 xcbinclude_HEADERS = xcb_keysyms.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 libXCBKeysyms_la_SOURCES = keysyms.c
 libXCBKeysyms_la_CFLAGS = $(XCB_CFLAGS)
diff --git a/xcb-util/property/Makefile.am b/xcb-util/property/Makefile.am
index 9282a10..221bdcb 100644
--- a/xcb-util/property/Makefile.am
+++ b/xcb-util/property/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBProperty.la
 
 xcbinclude_HEADERS = xcb_property.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 libXCBProperty_la_SOURCES = prop.c
 libXCBProperty_la_CFLAGS = $(XCB_CFLAGS) -I../event
diff --git a/xcb-util/reply/Makefile.am b/xcb-util/reply/Makefile.am
index 504c68d..06b03c8 100644
--- a/xcb-util/reply/Makefile.am
+++ b/xcb-util/reply/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBReply.la
 
 xcbinclude_HEADERS = xcb_reply.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 XCB_REPLY_LIBS = libXCBReply.la
 
diff --git a/xcb-util/wm/Makefile.am b/xcb-util/wm/Makefile.am
index a5fbc9c..c436185 100644
--- a/xcb-util/wm/Makefile.am
+++ b/xcb-util/wm/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libXCBWM.la
 
 xcbinclude_HEADERS = xcb_wm.h
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = $(CWARNFLAGS)
 
 XCB_XCBWM_LIBS = libXCBWM.la