[cairo-commit] 2 commits - configure.in src/Makefile.am src/cairo-xcb-surface.c src/cairo-xcb-xrender.h

[Jamey Sharp]

 configure.in            |   16 ++++++++--------
 src/Makefile.am         |   14 +++++++-------
 src/cairo-xcb-surface.c |    1 +
 src/cairo-xcb-xrender.h |    1 -
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
diff-tree 25353fdb57cd987fff01538be2c0fd27e7155879 (from aa017161a59bd643f3b369875ae3ba54e4a6c425)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Oct 16 11:44:08 2006 -0700

    XCB: Move slim_hidden_def to cairo-xcb-surface.c, not cairo-xcb-xrender.h.
    
    I didn't understand that the _def does not need to be public any more
    than the _proto does.

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 51cd681..5c1d903 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -1320,6 +1320,7 @@ cairo_xcb_surface_create_with_xrender_fo
 					       NULL, format,
 					       width, height, 0);
 }
+slim_hidden_def (cairo_xcb_surface_create_with_xrender_format);
 
 /**
  * cairo_xcb_surface_set_size:
diff --git a/src/cairo-xcb-xrender.h b/src/cairo-xcb-xrender.h
index 3c8c970..9df6856 100644
--- a/src/cairo-xcb-xrender.h
+++ b/src/cairo-xcb-xrender.h
@@ -53,7 +53,6 @@ cairo_xcb_surface_create_with_xrender_fo
 					      xcb_render_pictforminfo_t *format,
 					      int		     width,
 					      int		     height);
-slim_hidden_def (cairo_xcb_surface_create_with_xrender_format);
 
 CAIRO_END_DECLS
 
diff-tree aa017161a59bd643f3b369875ae3ba54e4a6c425 (from 8dabfc7ffe36649f85873043f8fc4f06714e5845)
Author: Ian Osgood <iano at quirkster.com>
Date:   Thu Oct 12 20:17:22 2006 -0700

    Move XCB sections next to XLIB sections.

diff --git a/configure.in b/configure.in
index 0d81131..2817470 100644
--- a/configure.in
+++ b/configure.in
@@ -254,6 +254,14 @@ CAIRO_BACKEND_ENABLE(xlib_xrender, Xlib 
 
 dnl ===========================================================================
 
+CAIRO_BACKEND_ENABLE(xcb, XCB, xcb, XCB_SURFACE, no, [
+  xcb_REQUIRES="xcb >= 0.9.92 xcb-render >= 0.9.92 xcb-renderutil"
+  PKG_CHECK_MODULES(xcb, $xcb_REQUIRES, , [
+  use_xcb="no (requires XCB http://xcb.freedesktop.org)"])
+])
+
+dnl ===========================================================================
+
 CAIRO_BACKEND_ENABLE(quartz, Quartz, quartz, QUARTZ_SURFACE, no, [
   dnl There is no pkgconfig for quartz; lets do a header check
   AC_CHECK_HEADER(Carbon/Carbon.h, , [use_quartz="no (Carbon headers not found)"])
@@ -268,14 +276,6 @@ CAIRO_BACKEND_ENABLE(nquartz, NativeQuar
 
 dnl ===========================================================================
 
-CAIRO_BACKEND_ENABLE(xcb, XCB, xcb, XCB_SURFACE, no, [
-  xcb_REQUIRES="xcb >= 0.9.92 xcb-render >= 0.9.92 xcb-renderutil"
-  PKG_CHECK_MODULES(xcb, $xcb_REQUIRES, , [
-  use_xcb="no (requires XCB http://xcb.freedesktop.org)"])
-])
-
-dnl ===========================================================================
-
 CAIRO_BACKEND_ENABLE(win32, Microsoft Windows, win32, WIN32_SURFACE, auto, [
   case "$host" in
     *-*-mingw*|*-*-cygwin*)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e7f385..f6ac7d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,6 +53,12 @@ libcairo_xlib_xrender_headers = cairo-xl
 backend_pkgconfigs += cairo-xlib-xrender.pc
 endif
 
+if CAIRO_HAS_XCB_SURFACE
+libcairo_xcb_headers = cairo-xcb.h cairo-xcb-xrender.h
+libcairo_xcb_sources = cairo-xcb-surface.c
+backend_pkgconfigs += cairo-xcb.pc
+endif
+
 if CAIRO_HAS_QUARTZ_SURFACE
 libcairo_quartz_headers = cairo-quartz.h
 libcairo_quartz_sources = cairo-quartz-surface.c cairo-quartz-private.h
@@ -65,12 +71,6 @@ libcairo_nquartz_sources = cairo-nquartz
 backend_pkgconfigs += cairo-nquartz.pc
 endif
 
-if CAIRO_HAS_XCB_SURFACE
-libcairo_xcb_headers = cairo-xcb.h cairo-xcb-xrender.h
-libcairo_xcb_sources = cairo-xcb-surface.c
-backend_pkgconfigs += cairo-xcb.pc
-endif
-
 libcairo_win32_sources =
 if CAIRO_HAS_WIN32_SURFACE
 libcairo_win32_headers = cairo-win32.h
@@ -228,9 +228,9 @@ libcairo_la_SOURCES =				\
 	$(libcairo_test_sources)		\
 	$(libcairo_font_subset_sources)		\
 	$(libcairo_xlib_sources)		\
+	$(libcairo_xcb_sources)			\
 	$(libcairo_quartz_sources)		\
 	$(libcairo_nquartz_sources)		\
-	$(libcairo_xcb_sources)			\
 	$(libcairo_glitz_sources)		\
 	$(libcairo_win32_sources)		\
 	$(libcairo_os2_sources)			\