From 47c9a640a773d57235bd27ab271c113630fa8816 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sun, 13 Apr 2008 19:01:51 +0200 Subject: [PATCH] Using the new ID_BOOST macro. --- configure.ac | 13 +------------ src/Makefile.am | 6 +++--- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index b5a28c9..182ba79 100644 --- a/configure.ac +++ b/configure.ac @@ -47,18 +47,7 @@ CPPFLAGS="$YAZPPINC $CPPFLAGS" # check for Boost C++ development libs and headers -AX_BOOST([1.33]) -if test "$ax_cv_boost_base" = "no"; then - AC_MSG_ERROR([install libboost-dev or similar]) -fi -if test "$ax_cv_boost_thread" = "no"; then - AC_MSG_ERROR([install libboost-thread-dev or similar]) -fi -if test "$ax_cv_boost_unit_test_framework" = "no"; then - AC_MSG_ERROR([install libboost-test-dev or similar]) -fi - - +ID_BOOST([thread test], [1.33]) # Checks for header files. ##AC_HEADER_STDC diff --git a/src/Makefile.am b/src/Makefile.am index f3bfb0a..7be7fdc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in config.in config.hpp AM_CXXFLAGS = $(BOOST_CPPFLAGS) -AM_LDFLAGS = $(BOOST_LDFLAGS) +AM_LDFLAGS = EXTRA_DIST=Jamfile.in @@ -51,7 +51,7 @@ libmetaproxy_la_SOURCES = \ LDADD = libmetaproxy.la \ $(YAZPPLALIB) \ - $(BOOST_DATE_TIME_LIB) \ + $(BOOST_LIB) \ $(BOOST_THREAD_LIB) bin_PROGRAMS = metaproxy @@ -118,7 +118,7 @@ test_filter_virt_db_SOURCES = test_filter_virt_db.cpp test_ses_map_SOURCES = test_ses_map.cpp test_router_flexml_SOURCES = test_router_flexml.cpp -TESTLDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) +TESTLDADD = $(LDADD) $(BOOST_TEST_LIB) test_package1_LDADD = $(TESTLDADD) test_pipe_LDADD = $(TESTLDADD) -- 1.7.10.4