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

Improved detection of Boost for 64bit systems that put Boost into /usr/lib64 instead of /usr/lib.

Browse Source
This commit is contained in:
Moritz Bunkus 2008-09-07 11:33:51 +00:00
parent 83c1a2eb93
commit bfb758ed61
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ac/ax_boost_base.m4
View File

@ -84,12 +84,20 @@ if test "x$want_boost" = "xyes"; then
dnl this location ist chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM
if test "$ac_boost_path" != ""; then
BOOST_LDFLAGS="-L$ac_boost_path/lib"
if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path/lib64" ; then
BOOST_LDFLAGS="-L$ac_boost_path/lib64"
else
BOOST_LDFLAGS="-L$ac_boost_path/lib"
fi
BOOST_CPPFLAGS="-I$ac_boost_path/include"
else
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path_tmp/lib64" ; then
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64"
else
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
fi
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
break;
fi
@ -163,7 +171,11 @@ if test "x$want_boost" = "xyes"; then
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
if test "$ac_boost_lib_path" = ""
then
BOOST_LDFLAGS="-L$best_path/lib"
if test "`uname -m`" = "x86_64" && test -d "$best_path/lib64" ; then
BOOST_LDFLAGS="-L$best_path/lib64"
else
BOOST_LDFLAGS="-L$best_path/lib"
fi
fi
if test "x$BOOST_ROOT" != "x"; then