[cairo-commit] configure.ac

[Chris Wilson]

 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 74a19c527c1fa07ade2042a8d2acecbb5f6ccab1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 29 10:31:05 2013 +0000

    configure: Include X11.h before testing for usability of Xrender.h
    
    On Solaris at least, the Xrender.h header is not standalone and requires
    X11/X.h to be included first to define the essential types.
    
    Reported-by: Andreas F. Borchert <bugzilla at andreas-borchert.de>
    Bugzilla; https://bugs.freedesktop.org/show_bug.cgi?id=58199
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 31123c7..928a169 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,8 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib_xrender, Xlib Xrender, auto, [
 		       CPPFLAGS="$CPPFLAGS $xlib_CFLAGS $xlib_NONPKGCONFIG_CFLAGS"
 		       AC_CHECK_HEADER(X11/extensions/Xrender.h,
 				       [xlib_xrender_NONPKGCONFIG_LIBS="-lXrender"],
-				       [use_xlib_xrender="no (requires $xlib_xrender_REQUIRES http://freedesktop.org/Software/xlibs)"])
+				       [use_xlib_xrender="no (requires $xlib_xrender_REQUIRES http://freedesktop.org/Software/xlibs)"],
+				       [#include <X11/X.h>])
 		       CPPFLAGS=$old_CPPFLAGS
 		      ])