diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2006-08-18 17:02:24 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2006-08-18 17:02:24 -0400 |
| commit | 0c6c0a9e0b3e8cd1caa25a2ee65b8384840295b3 (patch) | |
| tree | 242347ea8512bea4a5077e1d2cc7a08be4ad5a9c | |
| parent | 84a9ca1835998a11b78f5989ce927166c2baa00f (diff) | |
[configure] Use _NONPKGCONFIG_LIBS if no xrender pkg-config modele is found
| -rw-r--r-- | configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index f9cba5def..ca0a096cd 100644 --- a/configure.in +++ b/configure.in @@ -234,15 +234,16 @@ if test "x$use_xlib" = xyes; then fi CAIRO_BACKEND_ENABLE(xlib_xrender, Xlib Xrender, xlib-xrender, XLIB_XRENDER_SURFACE, auto, [ - use_xlib_xrender=$use_xlib - if test "x$use_xlib_xrender" = xyes; then + if test "x$use_xlib" != "xyes"; then + use_xlib_xrender="no (requires --enable-xlib)" + else dnl Check for Xrender header files if the Xrender package is not installed: xlib_xrender_BASE=cairo-xlib xlib_xrender_REQUIRES="xrender >= 0.6" PKG_CHECK_MODULES(xlib_xrender, $xlib_xrender_REQUIRES, , [xlib_xrender_REQUIRES="" AC_CHECK_HEADER(X11/extensions/Xrender.h, - [xlib_xrender_LIBS="-lXrender"], + [xlib_xrender_NONPKGCONFIG_LIBS="-lXrender"], [use_xlib_xrender="no (requires Xrender http://freedesktop.org/Software/xlibs)"])]) fi ]) |