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 712fb1a..35a5d01 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,8 @@ 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],
@@ -33,20 +33,19 @@ fi
 
 # 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
-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
@@ -64,12 +63,6 @@ if test "$ax_cv_boost_unit_test_framework" = "no"; then
 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
@@ -123,6 +116,10 @@ echo \
   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}