[libreoffice] 02/05: add explicit --without-system-libxml for a eventual internal-libxml2 case

[Rene Engelhard <rene@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 9ac0b6ae22a2b06e8512889a74cb97ba5b359abb
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Aug 27 11:19:35 2015 +0200

    add explicit --without-system-libxml for a eventual internal-libxml2 case
---
 changelog | 1 +
 rules     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/changelog b/changelog
index 117dec9..bd6c6a6 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ libreoffice (1:5.0.1~rc2-2) UNRELEASED; urgency=medium
 
   * debian/rules:
     - two more s/src/tarballs/ I forgot
+    - add explicit --without-system-libxml for a eventual internal-libxml2 case
 
  -- Rene Engelhard <rene@debian.org>  Mon, 24 Aug 2015 18:29:14 +0200
 
diff --git a/rules b/rules
index 04f1d06..23f4758 100755
--- a/rules
+++ b/rules
@@ -777,6 +777,8 @@ ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
        BUILD_DEPS += , libxml2-dev, libxml2-utils
        BUILD_DEPS += , libxslt1-dev
        DBG_DBG_SUGGESTS+= , libxslt1-dbg
+else
+       CONFIGURE_FLAGS += --without-system-libxml
 endif
 ifneq (,$(filter expat, $(SYSTEM_STUFF)))
        BUILD_DEPS += , libexpat1-dev

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git