[Libreoffice-commits] .: RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit a0831a174adb8447db7282a77baf456ea65bb908
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 15 21:27:13 2011 +0100

    desktop not building for me with internal berkeydb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ace5ed3..1cc9c75 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -676,14 +676,26 @@ endef
 
 else # !SYSTEM_DB
 
+ifneq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	berkeleydb \
+	db-4.7 \
 ))
+else
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+	db47 \
+))
+endif
 
 define gb_LinkTarget__use_berkeleydb
+ifneq ($(OS),WNT)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	db \
+	db-4.7 \
 )
+else
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	db47 \
+)
+endif
 
 endef