[Xcb] [PATCH util-image 12/12] Drop dependency on X11 Protocol package

[Gaetan Nadon]

No code left that needs #include <X11/Xfuncproto.h>

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac       |    1 -
 image/Makefile.am  |    3 +--
 image/xcb_bitops.h |    1 -
 image/xcb_pixel.h  |    1 -
 test/Makefile.am   |    2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4d1f07d..feee57d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,6 @@ XCB_UTIL_COMMON([1.4], [1.6])
 AC_CHECK_HEADERS([sys/shm.h])
 AM_CONDITIONAL(HAVE_SHM, test x$ac_cv_header_sys_shm_h = xyes)
 PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
-PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
 PKG_CHECK_MODULES(XCB_UTIL, xcb-util)
 
 AC_CONFIG_FILES([
diff --git a/image/Makefile.am b/image/Makefile.am
index 9e38277..a032d89 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -6,8 +6,7 @@ AM_CFLAGS = $(CWARNFLAGS)
 AM_CPPFLAGS = 			\
 	$(XCB_CFLAGS)		\
 	$(XCB_SHM_CFLAGS)	\
-	$(XCB_UTIL_CFLAGS)	\
-	$(XPROTO_CFLAGS)
+	$(XCB_UTIL_CFLAGS)
 
 XCB_IMAGE_LIBS = libxcb-image.la
 
diff --git a/image/xcb_bitops.h b/image/xcb_bitops.h
index d25bea7..9f1c110 100644
--- a/image/xcb_bitops.h
+++ b/image/xcb_bitops.h
@@ -28,7 +28,6 @@
 
 #include <assert.h>
 #include <inttypes.h>
-#include <X11/Xfuncproto.h>
 
 /**
  * @defgroup xcb__bitops XCB Bit Operations
diff --git a/image/xcb_pixel.h b/image/xcb_pixel.h
index 774c0c7..75cc0fc 100644
--- a/image/xcb_pixel.h
+++ b/image/xcb_pixel.h
@@ -27,7 +27,6 @@
  */
 
 #include <inttypes.h>
-#include <X11/Xfuncproto.h>
 #ifndef BUILD
 #include <xcb/xcb_bitops.h>
 #include <xcb/xcb_image.h>
diff --git a/test/Makefile.am b/test/Makefile.am
index 1116473..85a1b57 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,7 +21,7 @@ test_xcb_image_shm_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)
 test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
 
 test_formats_SOURCES = test_formats.c
-test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) $(XPROTO_CFLAGS) -I$(top_srcdir)/image
+test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
 test_formats_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
 
 test_bitmap_SOURCES = test_bitmap.c test.xbm
-- 
1.7.9.5