From a0831a174adb8447db7282a77baf456ea65bb908 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 15 Sep 2011 21:27:13 +0100 Subject: desktop not building for me with internal berkeydb --- RepositoryExternal.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ace5ed3c1c6a..1cc9c753123c 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 -- cgit