Separate boost system check
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 8 May 2013 10:20:30 +0000 (12:20 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 8 May 2013 10:20:30 +0000 (12:20 +0200)
configure.ac
m4
metaproxy-config.in
src/Makefile.am

index 75858ed..6f870a0 100644 (file)
@@ -59,7 +59,7 @@ AC_COMPILE_IFELSE(
 )
 YAZ_DOC
 
-ID_BOOST([thread test regex],[1.33])
+ID_BOOST([system thread test regex],[1.33])
 if test -z "${BOOST_THREAD_LIB}"; then
     AC_MSG_ERROR([Boost thread development libraries required])
 fi
diff --git a/m4 b/m4
index 12f3277..f273128 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 12f3277de6a4c46c27835d45890ab1732e3dab81
+Subproject commit f273128ffbdf6e641b6af4901bbf4e62fde251cf
index 7d90136..dc56b44 100644 (file)
@@ -12,7 +12,7 @@ echo_lalibs=no
 src_root=@abs_top_srcdir@
 build_root=@abs_top_builddir@
 
-libs="@BOOST_LIB@ @BOOST_REGEX_LIB@ @BOOST_THREAD_LIB@ @YAZPPLIB@ @LIBS@"
+libs="@BOOST_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_REGEX_LIB@ @BOOST_THREAD_LIB@ @YAZPPLIB@ @LIBS@"
 lalibs="@YAZPPLALIB@ @LIBS@"
 VERSION=@VERSION@
 
index 2fd7878..5fde070 100644 (file)
@@ -61,11 +61,14 @@ libmetaproxy_la_SOURCES = \
        xmlutil.cpp 
 
 
-libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) $(BOOST_REGEX_LIB)
+libmetaproxy_la_LIBADD = $(YAZPPLALIB) \
+       $(BOOST_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) \
+       $(BOOST_REGEX_LIB)
 
 # Rules for lib
 
-LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) \
+LDADD = libmetaproxy.la $(YAZPPLALIB) \
+       $(BOOST_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) \
        $(BOOST_REGEX_LIB) $(USEMARCONLALIB)
 
 bin_PROGRAMS = metaproxy