projects
/
m4-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5276fb
)
Do not use AC_CHECK_LIB anyway. Use AC_LINK_IFELSE instead.
author
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 21 Apr 2008 08:41:15 +0000
(10:41 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 21 Apr 2008 08:41:15 +0000
(10:41 +0200)
boost.m4
patch
|
blob
|
history
diff --git
a/boost.m4
b/boost.m4
index
f3dd675
..
cdf6c64
100644
(file)
--- a/
boost.m4
+++ b/
boost.m4
@@
-53,45
+53,35
@@
version_is:BOOST_VERSION
for c in $1; do
case $c in
thread)
for c in $1; do
case $c in
thread)
+ AC_MSG_CHECKING([Boost threads])
AC_SUBST([BOOST_THREAD_LIB])
AC_SUBST([BOOST_THREAD_LIB])
+ saveLIBS="${LIBS}"
BOOST_THREAD_LIB=""
for l in boost_thread-mt boost_thread; do
BOOST_THREAD_LIB=""
for l in boost_thread-mt boost_thread; do
- AC_CHECK_LIB([${l}],[main],[
- BOOST_THREAD_LIB="-l${l}"
- break
- ],[])
- done
- if test -z "${BOOST_THREAD_LIB}"; then
- AC_MSG_ERROR([Boost thread libs not found])
- fi
- LIBS="${LIBS} ${BOOST_THREAD_LIB}"
- AC_MSG_CHECKING([Boost threads])
+ LIBS="${saveLIBS} -l${l}"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <boost/version.hpp>
#include <boost/thread/thread.hpp>
]],[[
int x = BOOST_VERSION;
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <boost/version.hpp>
#include <boost/thread/thread.hpp>
]],[[
int x = BOOST_VERSION;
-]])],[AC_MSG_RESULT([yes])],[
-AC_MSG_RESULT([no])
-AC_MSG_ERROR([Boost thread libraries required])
- ])
+]])],[
+ BOOST_THREAD_LIB="-l${l}"
+ break],[])
+ done
+ if test "${BOOST_THREAD_LIB}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
;;
test)
;;
test)
+ AC_MSG_CHECKING([Boost unit test framework])
+ saveLIBS="${LIBS}"
AC_SUBST([BOOST_TEST_LIB])
BOOST_TEST_LIB=""
for l in boost_unit_test_framework-mt boost_unit_test_framework; do
AC_SUBST([BOOST_TEST_LIB])
BOOST_TEST_LIB=""
for l in boost_unit_test_framework-mt boost_unit_test_framework; do
- AC_CHECK_LIB([${l}],[main],[
- BOOST_TEST_LIB="-l${l}"
- break
- ],[])
- done
- if test -z "${BOOST_TEST_LIB}"; then
- AC_MSG_ERROR([Boost unit test libs not found])
- fi
- saveLIBS="${LIBS}"
- LIBS="${LIBS} ${BOOST_TEST_LIB}"
- AC_MSG_CHECKING([Boost unit test framework])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ LIBS="${saveLIBS} -l${l}"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#define BOOST_TEST_DYN_LINK
#include <boost/test/auto_unit_test.hpp>
BOOST_AUTO_TEST_CASE( t )
#define BOOST_TEST_DYN_LINK
#include <boost/test/auto_unit_test.hpp>
BOOST_AUTO_TEST_CASE( t )
@@
-99,8
+89,16
@@
BOOST_AUTO_TEST_CASE( t )
BOOST_CHECK(1);
}
]],[[
BOOST_CHECK(1);
}
]],[[
-]])],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([no])
-AC_MSG_ERROR([Boost unit test framework libraries required])])
+]])],[
+ BOOST_TEST_LIB="-l${l}"
+ break
+],[])
+ done
+ if test "${BOOST_TEST_LIB}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
LIBS="${saveLIBS}"
;;
esac
LIBS="${saveLIBS}"
;;
esac