[libreoffice] 09/12: only need system deps when using external
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-vivid-4.4
in repository libreoffice.
commit dc5d3fecf9f74b55837d9f4ac20cc0b76b260f6f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Nov 25 13:24:22 2014 +0100
only need system deps when using external
---
rules | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rules b/rules
index 15b47c8..bbdfecf 100755
--- a/rules
+++ b/rules
@@ -784,8 +784,10 @@ endif
ifneq ($(ENABLE_COINMP),y)
CONFIGURE_FLAGS += --disable-coinmp
else
+ifneq (,$(filter coinmp, $(SYSTEM_STUFF)))
BUILD_DEPS += , coinor-libcoinmp-dev, coinor-libcoinutils-dev
endif
+endif
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
BUILD_DEPS += , libssl-dev (>= 0.9.8)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: