Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Explicitly link against Boost's system lib during the filesystem lib test

Browse Source
This commit is contained in:
Moritz Bunkus 2012-08-18 21:01:17 +02:00
parent 83907e90c4
commit 405fde3565
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ac/ax_boost_filesystem.m4
View File

@ -85,21 +85,21 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
[link_filesystem="no"])
[link_filesystem="no"],[$BOOST_SYSTEM_LIB])
done
if test "x$link_filesystem" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
[link_filesystem="no"])
[link_filesystem="no"],[$BOOST_SYSTEM_LIB])
done
fi
else
for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
AC_CHECK_LIB($ax_lib, exit,
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
[link_filesystem="no"])
[link_filesystem="no"],[$BOOST_SYSTEM_LIB])
done
fi

6
ac/boost.m4
View File

@ -1,6 +1,9 @@
# boost's headers must be present.
AX_BOOST_BASE([1.46.0])
# boost::system must be present.
AX_BOOST_SYSTEM()
# boost::filesystem must be present.
AX_BOOST_FILESYSTEM()
@ -15,9 +18,6 @@ if test x"$ax_cv_boost_regex" != "xyes"; then
AC_MSG_ERROR(The Boost Regex Library was not found.)
fi
# boost::system must be present.
AX_BOOST_SYSTEM()
if test x"$ax_cv_boost_system" != "xyes"; then
AC_MSG_ERROR(The Boost System Library was not found.)
fi