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
New
[metaproxy-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
b4bf3b4
..
c4e5a79
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-3,7
+3,7
@@
# Autoconf and automake setup
AC_PREREQ(2.57)
# Autoconf and automake setup
AC_PREREQ(2.57)
-AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
+AC_INIT(yp2, 0.0.1, adam@indexdata.dk)
AC_CONFIG_HEADERS(src/config.hpp)
AC_CONFIG_HEADERS(src/config.hpp)
@@
-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