diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-16 17:33:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-16 17:41:59 +0200 |
| commit | c9cf219dc57393d6efbfa756834c8c97b7cd4dff (patch) | |
| tree | 7232b8578c33cb9b6fbb597a12eb5418c0bbfd76 | |
| parent | 97e1d52db4ffd49d6d8e9c4030e1e675c3517e18 (diff) | |
Fix $(call gb_ExternalExecutable_get_command,xmllint) in case of system libxml
Change-Id: If9b32b09fd8cbf8b194b75357494d99aaa3fe06e
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 1d4520cf78cf..f438432145e2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -544,6 +544,7 @@ export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ export SYSTEM_LIBXML=@SYSTEM_LIBXML@ +export SYSTEM_LIBXML_FOR_BUILD=@SYSTEM_LIBXML_FOR_BUILD@ export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@ export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@ diff --git a/configure.ac b/configure.ac index 20e2405f65fe..b5d7373700cb 100644 --- a/configure.ac +++ b/configure.ac @@ -7984,6 +7984,10 @@ else BUILD_TYPE="$BUILD_TYPE LIBXML2" fi AC_SUBST(SYSTEM_LIBXML) +if test -z "$SYSTEM_LIBXML_FOR_BUILD"; then + SYSTEM_LIBXML_FOR_BUILD="$SYSTEM_LIBXML" +fi +AC_SUBST(SYSTEM_LIBXML_FOR_BUILD) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) AC_SUBST(XMLLINT) |