[Libreoffice-commits] core.git: basic/CppunitTest_basic_vba.mk

Stephan Bergmann sbergman at redhat.com
Thu Mar 14 07:44:56 PDT 2013


 basic/CppunitTest_basic_vba.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0bcadf62a631b6cce5a5188f8018f266e1b99ee
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 14 15:44:31 2013 +0100

    Windows oleautobridge depends on ATL
    
    Change-Id: I94b43b03f742da7c6c8cf2e6a60ed305c1395fa7

diff --git a/basic/CppunitTest_basic_vba.mk b/basic/CppunitTest_basic_vba.mk
index 8b8d7ad..25f41f3 100644
--- a/basic/CppunitTest_basic_vba.mk
+++ b/basic/CppunitTest_basic_vba.mk
@@ -60,8 +60,8 @@ $(eval $(call gb_CppunitTest_use_ure,basic_vba))
 $(eval $(call gb_CppunitTest_use_components,basic_vba,\
 	configmgr/source/configmgr \
 	i18npool/util/i18npool \
-	$(if $(filter $(OS),WNT), \
-		extensions/source/ole/oleautobridge) \
+	$(if $(DISABLE_ATL),,$(if $(filter $(OS),WNT), \
+		extensions/source/ole/oleautobridge)) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,basic_vba))


More information about the Libreoffice-commits mailing list