X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=753551247eabe3c65e0d37af0b7737b18104da61;hb=94e341af1ed1bcb064089db64836015844c3dcd7;hp=ec5ba0b9ecde7c21ac312d810006a65fc0891e38;hpb=c1d3ce6a5a98ec66d6d9870cb27ea785ca2126a9;p=metaproxy-moved-to-github.git diff --git a/configure.ac b/configure.ac index ec5ba0b..7535512 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # Autoconf and automake setup AC_PREREQ(2.59) -AC_INIT([metaproxy],[1.0.1], [adam@indexdata.dk]) +AC_INIT([metaproxy],[1.0.10],[metaproxy-help@indexdata.dk]) AC_CONFIG_HEADERS(src/config.hpp) @@ -23,109 +23,58 @@ AC_PROG_MAKE_SET AC_PROG_RANLIB AM_PROG_LIBTOOL -# Use C++ compilers only for tests -AC_LANG(C++) +# Default language to use for tests (some tests may switch to C++) +AC_LANG(C) if test "$enable_shared" = "yes"; then - AC_DEFINE([HAVE_DL_SUPPORT],[1], - [Define to 1 if you have shared module support]) + AC_DEFINE([HAVE_DL_SUPPORT],[1], + [Define to 1 if you have shared module support]) fi # Checks for libraries. AC_CHECK_LIB(dl,dlopen) - -AC_CHECK_LIB(boost_thread, main, [],[ - AC_MSG_NOTICE([boost thread library not found.]) - AC_MSG_ERROR([Install libboost-thread-dev (or similar)]) -]) - -AC_CHECK_LIB(boost_date_time, main, [],[ - AC_MSG_NOTICE([boost date_time library not found.]) - AC_MSG_ERROR([Install libboost-date-time-dev (or similar)]) -]) - -AC_CHECK_LIB(boost_program_options, main, [],[ - AC_MSG_NOTICE([boost program options library not found.]) - AC_MSG_ERROR([Install libboost-program-options-dev (or similar)]) -]) - -AC_CHECK_HEADER(boost/test/auto_unit_test.hpp,,[ - AC_MSG_NOTICE([boost test unit header not found.]) - AC_MSG_ERROR([Install libboost-test-dev (or similar)]) -]) - -AC_MSG_CHECKING([whether boost_unit_test_framework works]) -OLIBS=$LIBS -LIBS="$LIBS -lboost_unit_test_framework" -AC_TRY_LINK([ -#define BOOST_AUTO_TEST_MAIN -#include -BOOST_AUTO_UNIT_TEST( test ) -{ - BOOST_CHECK(true); -} -],[], -[ - AC_MSG_RESULT([yes]) - LIBS=$OLIBS -], -[ - AC_MSG_RESULT([no]) - AC_MSG_NOTICE([Boost unit test framework does not appear to work]) - AC_MSG_ERROR([Consult config.log for details]) -]) +AC_CHECK_LIB(m,main) ## YAZPP checks -YAZPP_INIT(threads,1.0) +YAZPP_INIT([threads],[1.0.3]) if test -z "$YAZPPLIB"; then - AC_MSG_ERROR([YAZ++ development libraries missing]) + AC_MSG_ERROR([YAZ++ development libraries missing]) fi YAZ_DOC +CPPFLAGS="$YAZPPINC $CPPFLAGS" -## libxslt checks -AC_SUBST(XSLT_LIBS) -AC_SUBST(XSLT_CFLAGS) -xsltdir=default -AC_ARG_WITH(xslt,[[ --with-xslt[=PREFIX] use libxslt in PREFIX]],xsltdir=$withval) -if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then - for d in /usr /usr/local; do - if test -x $d/bin/xslt-config; then - xsltdir=$d - fi - done +# check for Boost C++ development libs and headers + +AX_BOOST([1.32]) +if test "$ax_cv_boost_base" = "no"; then + AC_MSG_ERROR([install libboost-dev or similar]) +fi +if test "$ax_cv_boost_date_time" = "no"; then + AC_MSG_ERROR([install libboost-date-time-dev or similar]) fi -if test "$xsltdir" != "no"; then - AC_MSG_CHECKING(for libXSLT) - if test -x $xsltdir/bin/xslt-config; then - XSLT_LIBS=`$xsltdir/bin/xslt-config --libs` - XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags` - XSLT_VER=`$xsltdir/bin/xslt-config --version` - AC_MSG_RESULT($XSLT_VER) - AC_DEFINE([HAVE_XSLT],[1], - [Define to 1 if you have libxslt installed]) - else - AC_MSG_RESULT(Not found) - AC_MSG_ERROR([libxslt required.]) - fi +if test "$ax_cv_boost_program_options" = "no"; then + AC_MSG_ERROR([install libboost-program-options-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 + # Checks for header files. ##AC_HEADER_STDC ##AC_HEADER_SYS_WAIT ##AC_HEADER_TIME -AC_CHECK_HEADERS(sys/select.h sys/socket.h iostream list vector stdexcept) -AC_CHECK_HEADERS(boost/thread/mutex.hpp \ - boost/date_time/posix_time/posix_time.hpp \ - boost/regex.hpp \ - boost/test/auto_unit_test.hpp) +AC_CHECK_HEADERS(sys/select.h sys/socket.h) # Checks for typedefs, structures, and compiler characteristics. ##AC_TYPE_SIZE_T ##AC_CHECK_SIZEOF(int) ##AC_CHECK_SIZEOF(long int) - # Checks for library functions. AC_CONFIG_FILES([ @@ -133,13 +82,13 @@ AC_CONFIG_FILES([ Makefile src/Makefile src/Jamfile + xml/Makefile + xml/schema/Makefile + xml/xslt/Makefile doc/Makefile - doc/main.xml + doc/local.ent doc/common/Makefile - doc/common/html.dsl - doc/common/html.xsl - doc/common/print.dsl - doc/common/tkl.xsl + doc/common/print.dsl etc/Makefile ]) @@ -148,11 +97,14 @@ AC_OUTPUT # postamble + echo \ "------------------------------------------------------------------------ -Configuration: + Package: ${PACKAGE} + Version: ${VERSION} Source code location: ${srcdir} + CPP Preprocessor: ${CPP} CPP Preprocessor flags: ${CPPFLAGS} CXX Compiler: ${CXX} CXX Compiler flags: ${CXXFLAGS} @@ -161,5 +113,21 @@ Configuration: Host System Type: ${host} Install path: ${prefix} 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} + YAZPP Lib: ${YAZPPLIB} + Bugreport: ${PACKAGE_BUGREPORT} ------------------------------------------------------------------------" +dnl Local Variables: +dnl mode:shell-script +dnl sh-indentation: 2 +dnl sh-basic-offset: 4 +dnl End: