diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 32b4041a29f1..9029cd036c88 100644 --- a/configure.ac +++ b/configure.ac @@ -8678,8 +8678,12 @@ if test "$with_lxml" != no; then ;; *) if test "$cross_compiling" != yes -a "x$ac_cv_header_Python_h" = "xyes"; then - BUILD_TYPE="$BUILD_TYPE LXML" - AC_MSG_RESULT([no, using internal lxml]) + if test -n ${SYSTEM_LIBXSLT} -o -n ${SYSTEM_LIBXML}; then + AC_MSG_RESULT([no, and no system libxml/libxslt, gla11y will only report widget classes and ids]) + else + BUILD_TYPE="$BUILD_TYPE LXML" + AC_MSG_RESULT([no, using internal lxml]) + fi else AC_MSG_RESULT([no, and system does not provide python development headers, gla11y will only report widget classes and ids]) fi diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 5ae811ad81c7..ee453ed328a5 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -187,7 +187,7 @@ endef define gb_UIConfig__gla11y_command $(call gb_Helper_abbreviate_dirs,\ - $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \ + $(gb_UIConfig_LXML_PATH) $(if $(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \ $(call gb_ExternalExecutable_get_command,python) \ $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ $(UIFILES) ) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 02f7f44d5143..5b4a5ed53a6d 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -594,7 +594,7 @@ define gb_UIConfig__gla11y_command $(call gb_ExternalExecutale__check_registration,python) $(call gb_Helper_abbreviate_dirs,\ FILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \ - $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \ + $(gb_UIConfig_LXML_PATH) $(if $(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \ $(call gb_ExternalExecutable_get_command,python) \ $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L $$FILES ) |