summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-05-24 15:00:14 +0300
committerTor Lillqvist <tml@iki.fi>2013-05-24 15:03:45 +0300
commit3aeecc525c76797801e9e2b24c2ebff6ac81adac (patch)
tree9149a2f91b918f77083fdee21e42e9bc0c80c85d /Library_merged.mk
parent58b9060b5f325f611dd7d5748dfa41b897aa09eb (diff)
Rename Boost libraries when built internally to match conventions
The standard Boost convention is for them to be called libboost_date_time and libboost_system (with apropriate suffix then depending on type). Did not touch the libboostthread library we build for Windows. Add the ax_boost_thread.m4 file for completeness and possible use. Document where the ax_boost*.m4 files come from. Change-Id: Ib49bee71398d62c9760a1f8fd5c46be9f3400430
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 6e404df50a97..64262ca8478b 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
))
$(eval $(call gb_Library_use_externals,merged,\
- boostdatetime \
+ boost_date_time \
$(call gb_Helper_optional,DESKTOP,clucene) \
cups \
curl \