mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Remove some pointless configure checks

Browse source
This commit is contained in:
Thomas Goyne 2014-04-29 07:23:02 -07:00
parent a7db164bd3
commit eca8991dd8
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
m4macros/ax_boost_base.m4
View file

@ -214,9 +214,9 @@ fi
if test "$succeeded" != "yes" ; then if test "$succeeded" != "yes" ; then
if test "$_version" = "0" ; then if test "$_version" = "0" ; then
AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]]) AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
else else
AC_MSG_NOTICE([Your boost libraries seems too old (version $_version).]) AC_MSG_ERROR([Your boost libraries seem too old (version $_version).])
fi fi
# execute ACTION-IF-NOT-FOUND (if present): # execute ACTION-IF-NOT-FOUND (if present):
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
@ -248,18 +248,9 @@ LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS export LDFLAGS
AS_IF([test x$enable_sanity_checks != xno], [ AS_IF([test x$enable_sanity_checks != xno],
AC_CACHE_CHECK( [AC_CHECK_LIB($ax_boost_lib, exit, [ax_boost_actual_lib="-l$ax_boost_lib"])],
[whether the boost.$1 library is available], [ax_boost_actual_lib="-l$ax_boost_lib"])
ax_cv_boost_$1,
[AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[@%:@include <boost/$3>]], [[$4;]])],
[eval ax_cv_boost_$1=yes],
AC_MSG_ERROR([Could not find boost.$1 headers!]))
AC_LANG_POP([C++])])
AC_CHECK_LIB($ax_boost_lib, exit, [ax_boost_actual_lib="-l$ax_boost_lib"])
], [ax_boost_actual_lib="-l$ax_boost_lib"])
if test "x$ax_boost_actual_lib" = "x"; then if test "x$ax_boost_actual_lib" = "x"; then
for lib in `ls -r $BOOSTLIBDIR/libboost_$1* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do for lib in `ls -r $BOOSTLIBDIR/libboost_$1* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do