[cairo-commit] 2 commits - configure.in

[Behdad Esfahbod]

 configure.in |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

New commits:
diff-tree 0e78e7144353703cbd28aae6a67cd9ca261f1d68 (from 0c6c0a9e0b3e8cd1caa25a2ee65b8384840295b3)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 18 17:17:28 2006 -0400

    [configure] Check for x11 pkg-config module before using AC_PATH_XTRA
    Fixes bug 7491.

diff --git a/configure.in b/configure.in
index ca0a096..a691bcc 100644
--- a/configure.in
+++ b/configure.in
@@ -94,7 +94,7 @@ dnl cairo_cache_version should be increa
 dnl detection stuff changes in a way that removing the config.cache file may be
 dnl needed for correct operation.
 dnl
-m4_define(cairo_cache_version, 2)
+m4_define(cairo_cache_version, 3)
 
 dnl ===========================================================================
 dnl
@@ -220,13 +220,16 @@ CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
 dnl ===========================================================================
 
 CAIRO_BACKEND_ENABLE(xlib, Xlib, xlib, XLIB_SURFACE, auto, [
-  AC_PATH_XTRA
-  if test "x$no_x" = xyes; then
-    use_xlib="no (requires Xlib)"
-  else
-    xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-    xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
-  fi
+  xlib_REQUIRES="x11"
+  PKG_CHECK_MODULES(xlib, $xlib_REQUIRES, ,
+		    [xlib_REQUIRES=""
+		     AC_PATH_XTRA
+		     if test "x$no_x" = xyes; then
+		       use_xlib="no (requires X development libraries)"
+		     else
+		       xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+		       xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
+		     fi])
 ])
 
 if test "x$use_xlib" = xyes; then
diff-tree 0c6c0a9e0b3e8cd1caa25a2ee65b8384840295b3 (from 84a9ca1835998a11b78f5989ce927166c2baa00f)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 18 17:02:24 2006 -0400

    [configure] Use _NONPKGCONFIG_LIBS if no xrender pkg-config modele is found

diff --git a/configure.in b/configure.in
index f9cba5d..ca0a096 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
 ])