## This file is part of Metaproxy
## Copyright (C) 2005-2007, Index Data ApS
-## $Id: Makefile.am,v 1.21 2007-02-01 08:00:49 adam Exp $
+## $Id: Makefile.am,v 1.22 2007-02-26 11:40:03 marc Exp $
SUBDIRS = xml src etc doc
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = Doxyfile.in NEWS README LICENSE m4/yazpp.m4 m4/yaz.m4 buildconf.sh
+EXTRA_DIST = Doxyfile.in NEWS README LICENSE \
+ m4/yazpp.m4 m4/yaz.m4 m4/ax_boost.m4 \
+ buildconf.sh
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure
# check for Boost C++ development libs and headers
-AX_BOOST_BASE(1.32)
-AX_BOOST_DATE_TIME(1.32)
-AX_BOOST_PROGRAM_OPTIONS(1.32)
-AX_BOOST_THREAD(1.32)
-AX_BOOST_UNIT_TEST_FRAMEWORK(1.32)
-
-LD_FLAGS="$LD_FLAGS $BOOST_LDFLAGS"
-#AM_LDLFAGS="$AM_LDLFAGS\
-LIBS="$LIBS\
-$BOOST_DATE_TIME_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB";
+AX_BOOST([1.32])
if test "$ax_cv_boost_base" = "no"; then
AC_MSG_ERROR([install libboost-dev or similar])
fi
Automake: ${AUTOMAKE}
Archiver: ${AR}
Ranlib: ${RANLIB}
+ Boost Version: ${BOOST_VERSION}
+ Boost Include: ${BOOST_CPPFLAGS}
+ Boost linker flags: ${BOOST_LDFLAGS}
+ Boost Libs: ${BOOST_DATE_TIME_LIB} ${BOOST_PROGRAM_OPTIONS_LIB} ${BOOST_THREAD_LIB}
YAZPP Version: ${YAZPPVERSION}
YAZPP Include: ${YAZPPINC}
YAZPP La Lib: ${YAZPPLALIB}
-## $Id: Makefile.am,v 1.62 2007-01-12 10:16:21 adam Exp $
+## $Id: Makefile.am,v 1.63 2007-02-26 11:40:03 marc Exp $
MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
-AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
+AM_CXXFLAGS = $(YAZPPINC) $(BOOST_CPPFLAGS)
+
+AM_LDFLAGS = $(BOOST_LDFLAGS) \
+ $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_THREAD_LIB) \
+ $(YAZPPLALIB)
EXTRA_DIST=Jamfile.in
# Rules for programs..
-LDADD= libmetaproxy.la $(YAZPPLALIB) $(XSLT_LIBS)
+LDADD= libmetaproxy.la
bin_PROGRAMS = metaproxy
noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
test_ses_map_SOURCES = test_ses_map.cpp
test_router_flexml_SOURCES = test_router_flexml.cpp
-TESTLDADD = $(LDADD) -lboost_unit_test_framework
+TESTLDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
test_package1_LDADD = $(TESTLDADD)
test_pipe_LDADD = $(TESTLDADD)