summaryrefslogtreecommitdiff
path: root/liborcus
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 /liborcus
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 'liborcus')
-rw-r--r--liborcus/ExternalProject_liborcus.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index b6ae1eef8d6b..70283f75da83 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
$(eval $(call gb_ExternalProject_use_externals,liborcus, \
boost_headers \
- boostsystem \
+ boost_system \
zlib \
))
@@ -38,7 +38,7 @@ endif
ifeq ($(SYSTEM_BOOST),YES)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
else
-liborcus_LIBS+=$(SOLARLIB) -lboostsystem
+liborcus_LIBS+=$(SOLARLIB) -lboost_system
endif
ifeq ($(OS),ANDROID)
liborcus_LIBS+=-lgnustl_shared -lm