[Libreoffice-commits] core.git: configure.ac solenv/gbuild

[Samuel Thibault]

 configure.ac              |    2 +-
 solenv/gbuild/UIConfig.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a9f851e54f416820c61baf8caa79e4d91c8c61f
Author: Samuel Thibault <sthibault at hypra.fr>
Date:   Wed Feb 21 10:45:02 2018 +0100

    gla11y: Use python interpreter decided by configure
    
    configure uses $PYTHON to determine lxml availability, so the make rule
    should use the same instead of letting gla11y find a python interpreter
    through "env", in case e.g. $PYTHON is python3, and lxml is available in
    python3 but not in python (actually python2).
    
    Along the way, rather use PYTHON_FOR_BUILD for coherency.
    
    Change-Id: Ied4c05aca462cc16685c61f36b56bb9e8612d90e
    Reviewed-on: https://gerrit.libreoffice.org/50087
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index 58451b4912c7..8b624c3ded46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8154,7 +8154,7 @@ system)
     SYSTEM_PYTHON=TRUE
 
     AC_MSG_CHECKING([for python lxml])
-    if $PYTHON -c "import lxml.etree as ET" ; then
+    if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" ; then
         PYTHON_LXML=TRUE
         AC_MSG_RESULT([yes])
     else
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index fb8762e8a09c..9665dcaf9d18 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -94,7 +94,7 @@ endef
 # * UIConfig/<name> containing all nontranslatable files
 
 gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg
-gb_UIConfig_a11yerrors_COMMAND = $(SRCDIR)/bin/gla11y
+gb_UIConfig_a11yerrors_COMMAND = $(PYTHON_FOR_BUILD) $(SRCDIR)/bin/gla11y
 
 $(dir $(call gb_UIConfig_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))