projects
/
m4-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix boost not found on debian-testing MP-628
[m4-moved-to-github.git]
/
boost.m4
diff --git
a/boost.m4
b/boost.m4
index
38060ca
..
b0519da
100644
(file)
--- a/
boost.m4
+++ b/
boost.m4
@@
-54,9
+54,9
@@
AC_DEFUN([ID_BOOST],
AC_LANG_CONFTEST(
[AC_LANG_SOURCE([[
#include <boost/version.hpp>
AC_LANG_CONFTEST(
[AC_LANG_SOURCE([[
#include <boost/version.hpp>
-version_is:BOOST_VERSION
+BOOST_VERSION
]])])
]])])
- BOOST_GOT_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP version_is 2>/dev/null | cut -d ":" -f2`
+ BOOST_GOT_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | grep -v '#' | grep -v '^$' 2>/dev/null`
if test -z "$BOOST_GOT_VERSION" -o \
"$BOOST_GOT_VERSION" = "BOOST_VERSION"; then
AC_MSG_RESULT([no])
if test -z "$BOOST_GOT_VERSION" -o \
"$BOOST_GOT_VERSION" = "BOOST_VERSION"; then
AC_MSG_RESULT([no])
@@
-74,7
+74,7
@@
version_is:BOOST_VERSION
if test "$BOOST_GOT_VERSION" -ge 104100; then
AC_MSG_CHECKING([Boost system])
saveLIBS="${LIBS}"
if test "$BOOST_GOT_VERSION" -ge 104100; then
AC_MSG_CHECKING([Boost system])
saveLIBS="${LIBS}"
- for l in "${BOOST_TOOLSET}-mt" "${BOOST_TOOLSET}"; do
+ for l in "${BOOST_TOOLSET}" "${BOOST_TOOLSET}-mt"; do
trylib="-lboost_system${l}"
LIBS="${saveLIBS} ${trylib}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
trylib="-lboost_system${l}"
LIBS="${saveLIBS} ${trylib}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@
-99,7
+99,7
@@
int x = BOOST_VERSION;
AC_SUBST([BOOST_THREAD_LIB])
saveLIBS="${LIBS}"
BOOST_THREAD_LIB=""
AC_SUBST([BOOST_THREAD_LIB])
saveLIBS="${LIBS}"
BOOST_THREAD_LIB=""
- for l in "${BOOST_TOOLSET}-mt" "${BOOST_TOOLSET}"; do
+ for l in "${BOOST_TOOLSET}" "${BOOST_TOOLSET}-mt"; do
trylib="-lboost_thread${l}"
LIBS="${saveLIBS} ${trylib}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
trylib="-lboost_thread${l}"
LIBS="${saveLIBS} ${trylib}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@
-123,7
+123,7
@@
int x = BOOST_VERSION;
saveLIBS="${LIBS}"
AC_SUBST([BOOST_TEST_LIB])
BOOST_TEST_LIB=""
saveLIBS="${LIBS}"
AC_SUBST([BOOST_TEST_LIB])
BOOST_TEST_LIB=""
- for l in boost_unit_test_framework${BOOST_TOOLSET}-mt boost_unit_test_framework${BOOST_TOOLSET}; do
+ for l in boost_unit_test_framework${BOOST_TOOLSET} boost_unit_test_framework${BOOST_TOOLSET}-mt; do
LIBS="${saveLIBS} -l${l}"
AC_LINK_IFELSE([AC_LANG_SOURCE([[
#define BOOST_TEST_DYN_LINK
LIBS="${saveLIBS} -l${l}"
AC_LINK_IFELSE([AC_LANG_SOURCE([[
#define BOOST_TEST_DYN_LINK
@@
-151,7
+151,7
@@
BOOST_AUTO_TEST_CASE( t )
AC_SUBST([BOOST_REGEX_LIB])
saveLIBS="${LIBS}"
BOOST_REGEX_LIB=""
AC_SUBST([BOOST_REGEX_LIB])
saveLIBS="${LIBS}"
BOOST_REGEX_LIB=""
- for l in boost_regex${BOOST_TOOLSET}-mt boost_regex${BOOST_TOOLSET}; do
+ for l in boost_regex${BOOST_TOOLSET} boost_regex${BOOST_TOOLSET}-mt; do
LIBS="${saveLIBS} -l${l}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <boost/version.hpp>
LIBS="${saveLIBS} -l${l}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <boost/version.hpp>