projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generate progref.xml from metaproxy.xml
[metaproxy-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
b4bf3b4
..
0a62c88
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,17
+2,17
@@
## Process this file with autoconf to produce a configure script.
# Autoconf and automake setup
## Process this file with autoconf to produce a configure script.
# Autoconf and automake setup
-AC_PREREQ(2.57)
-AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
+AC_PREREQ(2.59)
+AC_INIT([metaproxy],[0.9], [adam@indexdata.dk])
AC_CONFIG_HEADERS(src/config.hpp)
AC_CONFIG_HEADERS(src/config.hpp)
-AC_CONFIG_SRCDIR(configure.ac)
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_SYSTEM
##AC_PREFIX_DEFAULT(`pwd`/install)
AC_CANONICAL_SYSTEM
##AC_PREFIX_DEFAULT(`pwd`/install)
-AM_INIT_AUTOMAKE(1.8)
+AM_INIT_AUTOMAKE([1.8])
# Checks for programs.
AC_PROG_CXX
# Checks for programs.
AC_PROG_CXX
@@
-26,7
+26,14
@@
AM_PROG_LIBTOOL
# Use C++ compilers only for tests
AC_LANG(C++)
# Use C++ compilers only for tests
AC_LANG(C++)
+if test "$enable_shared" = "yes"; then
+ AC_DEFINE([HAVE_DL_SUPPORT],[1],
+ [Define to 1 if you have shared module support])
+fi
+
# Checks for libraries.
# 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_thread, main, [],[
AC_MSG_NOTICE([boost thread library not found.])
AC_MSG_ERROR([Install libboost-thread-dev (or similar)])
@@
-42,13
+49,18
@@
AC_CHECK_LIB(boost_program_options, main, [],[
AC_MSG_ERROR([Install libboost-program-options-dev (or similar)])
])
AC_MSG_ERROR([Install libboost-program-options-dev (or similar)])
])
-AC_MSG_CHECKING([for boost_unit_test_framework presence])
+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/test/auto_unit_test.hpp>
OLIBS=$LIBS
LIBS="$LIBS -lboost_unit_test_framework"
AC_TRY_LINK([
#define BOOST_AUTO_TEST_MAIN
#include <boost/test/auto_unit_test.hpp>
-BOOST_AUTO_TEST_CASE( test )
+BOOST_AUTO_UNIT_TEST( test )
{
BOOST_CHECK(true);
}
{
BOOST_CHECK(true);
}
@@
-59,7
+71,8
@@
BOOST_AUTO_TEST_CASE( test )
],
[
AC_MSG_RESULT([no])
],
[
AC_MSG_RESULT([no])
- AC_MSG_ERROR([Install libboost-test-dev (or similar)])
+ AC_MSG_NOTICE([Boost unit test framework does not appear to work])
+ AC_MSG_ERROR([Consult config.log for details])
])
## YAZPP checks
])
## YAZPP checks
@@
-67,7
+80,7
@@
YAZPP_INIT(threads,1.0)
if test -z "$YAZPPLIB"; then
AC_MSG_ERROR([YAZ++ development libraries missing])
fi
if test -z "$YAZPPLIB"; then
AC_MSG_ERROR([YAZ++ development libraries missing])
fi
-##YAZ_DOC
+YAZ_DOC
## libxslt checks
AC_SUBST(XSLT_LIBS)
## libxslt checks
AC_SUBST(XSLT_LIBS)
@@
-92,10
+105,7
@@
if test "$xsltdir" != "no"; then
[Define to 1 if you have libxslt installed])
else
AC_MSG_RESULT(Not found)
[Define to 1 if you have libxslt installed])
else
AC_MSG_RESULT(Not found)
- if test "$xsltdir" = "default"; then
- AC_MSG_WARN([Libxslt development libraries not found.])
- else
- AC_MSG_ERROR([libxslt development libraries not found.]) fi
+ AC_MSG_ERROR([libxslt required.])
fi
fi
fi
fi
@@
-107,6
+117,7
@@
fi
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 \
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)
# Checks for typedefs, structures, and compiler characteristics.
boost/test/auto_unit_test.hpp)
# Checks for typedefs, structures, and compiler characteristics.
@@
-122,6
+133,11
@@
AC_CONFIG_FILES([
Makefile
src/Makefile
src/Jamfile
Makefile
src/Makefile
src/Jamfile
+ doc/Makefile
+ doc/main.xml
+ doc/print.dsl
+ doc/html.dsl
+ doc/tkl.xsl
])
AC_OUTPUT
])
AC_OUTPUT