Commit a1e74d41 authored by Thomas Markwalder's avatar Thomas Markwalder

[5337] Don't use libtool for boost lib test

configure.ac
    Added logic block to look for glib static libs fi enable-static = yes

m4macros/ax_boost_for_kea.m4
    Changed to not use libtool for boost lib test.
parent 31967b5d
......@@ -440,7 +440,19 @@ if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
KEA_CXXFLAGS="$KEA_CXXFLAGS -fPIC"
fi
# Look for glib static libs if they're trying to do static builds
if test $enable_static = yes; then
CXX_SAVED=$CXX
CXX="$CXX -static"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <math.h>],[sqrt(-1.0);])],
[AC_MSG_RESULT([checking for static glib libraries... yes])],
[AC_MSG_RESULT([checking for static glib libraries... no])
/bin/bash: :1: command not found
CXX=$CXX_SAVED
fi
AC_SUBST(KEA_CXXFLAGS)
......
......@@ -200,23 +200,14 @@ if test "x${BOOST_LIBS}" != "x"; then
LIBS="-static $LIBS"
fi
# Wrap the compilation in libtool as we do in our Makefiles
# when linking. That way if we're static linking we should
# get the same result our Makefiles would. We don't provide
# a path to our libtool as it may not exist yet.
CXX_SAVED="$CXX"
CXX="libtool --tag=CXX --mode=link $CXX"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <boost/system/error_code.hpp>],
[boost::system::error_code ec;])],
[AC_MSG_RESULT([checking for Boost system library... yes])],
[AC_MSG_RESULT([checking for Boost system library... no])
AC_MSG_ERROR([Linking with ${BOOST_LIBS} is not enough: please make sure libboost_system is installed;
Check config.log for details, you may be missing other libraries.])])
AC_MSG_ERROR([Linking with ${BOOST_LIBS} is not enough: please make sure libboost_system is installed; Check config.log for details, you may be missing other libraries.])])
CXX="$CXX_SAVED"
LIBS="$LIBS_SAVED"
LIBS="$LIBS_SAVED"
fi
CXXFLAGS="$CXXFLAGS_SAVED"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment