[Libreoffice-commits] .: configure.in

[Norbert Thiebaud]

 configure.in |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 4b11901d69f85144165299e3bba69735227308ee
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Nov 14 16:29:24 2011 -0600

    disable xrender based-test for trget that do not test for xrender

diff --git a/configure.in b/configure.in
index 4926706..34400e7 100644
--- a/configure.in
+++ b/configure.in
@@ -8569,18 +8569,19 @@ if test "$with_system_cairo" = "yes"; then
 
     PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
 
-    if test "$with_system_xextensions_headers" != "no"; then
-        AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
-        AC_LANG_PUSH([C])
-
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],[[
+    if test "$test_xrender" = "yes"; then
+        if test "$with_system_xextensions_headers" != "no"; then
+            AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
+            AC_LANG_PUSH([C])
+            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],[[
 #ifdef PictStandardA8
 #else
       return fail;
 #endif
 ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no, X headers too old.])])
 
-        AC_LANG_POP([C])
+            AC_LANG_POP([C])
+        fi
     fi
     MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS libfontconfig-1.dll libfreetype-6.dll libpixman-1-0.dll libpng15-15.dll libcairo-2.dll"
 else