diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-15 21:27:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-15 21:27:13 +0100 |
| commit | a0831a174adb8447db7282a77baf456ea65bb908 (patch) | |
| tree | 2a41f8f6ab5a59db0042089803ef8241d8687a1f /RepositoryExternal.mk | |
| parent | a5745e9e730ad39b590781f38884479072ee6f9d (diff) | |
desktop not building for me with internal berkeydb
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 16 |
1 files changed, 14 insertions, 2 deletions
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 |