[libreoffice] 02/02: cppunit-optional.diff also disable testtools

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 89d360a0baf1495b59b1261fb005d7e4d03b9ffb
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jun 6 23:28:09 2017 +0200

    cppunit-optional.diff also disable testtools
---
 patches/cppunit-optional.diff | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/patches/cppunit-optional.diff b/patches/cppunit-optional.diff
index e94d417..7a3eb6d 100644
--- a/patches/cppunit-optional.diff
+++ b/patches/cppunit-optional.diff
@@ -178,3 +178,23 @@ index 0b862086f5a9..4bbfacf564f8 100644
 +endif
  
  # vim: set noet sw=4 ts=4:
+diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
+index a1b84e175b30..08e4aad24c11 100644
+--- a/testtools/Module_testtools.mk
++++ b/testtools/Module_testtools.mk
+@@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,testtools))
+ 
+ ifeq ($(CROSS_COMPILING),)
+ 
++ifeq ($(ENABLE_CPPUNIT),TRUE)
++
+ $(eval $(call gb_Module_add_targets,testtools,\
+ 	CustomTarget_bridgetest \
+ 	InternalUnoApi_bridgetest \
+@@ -41,4 +43,6 @@ $(eval $(call gb_Module_add_check_targets,testtools,\
+ 
+ endif
+ 
++endif
++
+ # vim:set noet sw=4 ts=4:

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