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
Move YAZ tests before Boost thread tests so we set some options
[metaproxy-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
2167645
..
35a5d01
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-23,8
+23,8
@@
AC_PROG_MAKE_SET
AC_PROG_RANLIB
AM_PROG_LIBTOOL
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],
if test "$enable_shared" = "yes"; then
AC_DEFINE([HAVE_DL_SUPPORT],[1],
@@
-33,43
+33,36
@@
fi
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB(m,main)
+## YAZPP checks
+YAZPP_INIT(threads,1.0.2)
+if test -z "$YAZPPLIB"; then
+ AC_MSG_ERROR([YAZ++ development libraries missing])
+fi
+YAZ_DOC
+CPPFLAGS="$YAZPPINC $CPPFLAGS"
# check for Boost C++ development libs and headers
# check for Boost C++ development libs and headers
-AX_BOOST_BASE(1.33)
-AX_BOOST_DATE_TIME(1.33)
-AX_BOOST_PROGRAM_OPTIONS(1.33)
-AX_BOOST_THREAD(1.33)
-AX_BOOST_UNIT_TEST_FRAMEWORK(1.33)
+
+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])
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])
-else
- LIBS="$LIBS -lboost_date_time";
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_program_options" = "no"; then
AC_MSG_ERROR([install libboost-program-options-dev or similar])
-else
- LIBS="$LIBS -lboost_program_options";
fi
if test "$ax_cv_boost_thread" = "no"; then
AC_MSG_ERROR([install libboost-thread-dev or similar])
fi
if test "$ax_cv_boost_thread" = "no"; then
AC_MSG_ERROR([install libboost-thread-dev or similar])
-else
- LIBS="$LIBS -lboost_thread";
fi
if test "$ax_cv_boost_unit_test_framework" = "no"; then
AC_MSG_ERROR([install libboost-test-dev or similar])
fi
fi
if test "$ax_cv_boost_unit_test_framework" = "no"; then
AC_MSG_ERROR([install libboost-test-dev or similar])
fi
-## YAZPP checks
-YAZPP_INIT(threads,1.0.2)
-if test -z "$YAZPPLIB"; then
- AC_MSG_ERROR([YAZ++ development libraries missing])
-fi
-YAZ_DOC
# Checks for header files.
##AC_HEADER_STDC
# Checks for header files.
##AC_HEADER_STDC
@@
-123,6
+116,10
@@
echo \
Automake: ${AUTOMAKE}
Archiver: ${AR}
Ranlib: ${RANLIB}
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 Version: ${YAZPPVERSION}
YAZPP Include: ${YAZPPINC}
YAZPP La Lib: ${YAZPPLALIB}