[Libreoffice-commits] .: config_host.mk.in configure.in

[Caolán McNamara]

 config_host.mk.in |    1 +
 configure.in      |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit 013076d6a858712151766131d8a2cccdf39e7f18
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 13 12:32:11 2012 +0000

    add check for xmllint

diff --git a/config_host.mk.in b/config_host.mk.in
index 23c758e..8d38959 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -514,3 +514,4 @@ export XRANDR_CFLAGS=@XRANDR_CFLAGS@
 export XRANDR_DLOPEN=@XRANDR_DLOPEN@
 export XRANDR_LIBS=@XRANDR_LIBS@
 export XSLTPROC=@XSLTPROC@
+export XMLLINT=@XMLLINT@
diff --git a/configure.in b/configure.in
index b7c8d1d..0f5ba8a 100644
--- a/configure.in
+++ b/configure.in
@@ -5828,6 +5828,13 @@ if test "$with_system_libxml" = "yes"; then
     else
         PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
     fi
+
+    dnl Check for xmllint
+    AC_PATH_PROG(XMLLINT, xmllint, no)
+    if test "$XMLLINT" = "no"; then
+        AC_MSG_ERROR([xmllint is required])
+    fi
+
     MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll"
 else
     AC_MSG_RESULT([internal])
@@ -5837,6 +5844,7 @@ fi
 AC_SUBST(SYSTEM_LIBXML)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
+AC_SUBST(XMLLINT)
 
 dnl ===================================================================
 dnl Checks for Python