[Libreoffice-commits] .: configure.in

David Tardon dtardon at kemper.freedesktop.org
Fri Jun 1 01:59:39 PDT 2012


 configure.in |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit e27f66040bec04e6f139bac80c128a88cbf877dd
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 1 10:59:11 2012 +0200

    only check for ext. headers when building with X11
    
    Change-Id: Ia37e0cbda71fb10be269bd47657b512ae07ea796

diff --git a/configure.in b/configure.in
index 293f1c5..04df981 100644
--- a/configure.in
+++ b/configure.in
@@ -8060,16 +8060,20 @@ if test "$WANT_X11" = "yes"; then
     dnl ===================================================================
     AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])],
      [#include <X11/Intrinsic.h>])
-fi
 
-AC_MSG_CHECKING([whether to use internal X11 extensions headers])
-if test "$with_system_xextensions_headers" != "no"; then
-    AC_MSG_RESULT([no])
-    AC_CHECK_HEADERS(X11/extensions/shape.h,[],[AC_MSG_ERROR([libXext headers not found])],
-     [#include <X11/extensions/shape.h>])
-else
-    AC_MSG_RESULT([yes])
-    BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
+    dnl ===================================================================
+    dnl Check for extension headers
+    dnl ===================================================================
+    AC_MSG_CHECKING([whether to use internal X11 extensions headers])
+    if test "$with_system_xextensions_headers" != "no"; then
+        AC_MSG_RESULT([no])
+        AC_CHECK_HEADERS(X11/extensions/shape.h,[],[AC_MSG_ERROR([libXext headers not found])],
+        [#include <X11/extensions/shape.h>])
+    else
+        AC_MSG_RESULT([yes])
+        BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
+    fi
+
 fi
 
 dnl ===================================================================


More information about the Libreoffice-commits mailing list