Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-13 13:41:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not rely on "uname -m" for Boost location detection but use configure's "$target" variable instead. Patch by Dominik Mierzejewski. Fix for bug 311.

Browse Source
This commit is contained in:
Moritz Bunkus 2008-12-04 09:25:43 +00:00
parent 9cd422f0fe
commit 06e1fe43aa
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ac/ax_boost_base.m4
View File

@ -84,20 +84,18 @@ if test "x$want_boost" = "xyes"; then
dnl this location ist chosen if boost libraries are installed with the --layout=system option dnl this location ist chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM dnl or if you install boost with RPM
if test "$ac_boost_path" != ""; then if test "$ac_boost_path" != ""; then
if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path/lib64" ; then case $target in
BOOST_LDFLAGS="-L$ac_boost_path/lib64" ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
else *) BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
BOOST_LDFLAGS="-L$ac_boost_path/lib" esac
fi
BOOST_CPPFLAGS="-I$ac_boost_path/include" BOOST_CPPFLAGS="-I$ac_boost_path/include"
else else
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do 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 if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path_tmp/lib64" ; then case $target in
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
else *) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" esac
fi
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
break; break;
fi fi
@ -171,11 +169,10 @@ if test "x$want_boost" = "xyes"; then
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
if test "$ac_boost_lib_path" = "" if test "$ac_boost_lib_path" = ""
then then
if test "`uname -m`" = "x86_64" && test -d "$best_path/lib64" ; then case $target in
BOOST_LDFLAGS="-L$best_path/lib64" ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
else *) BOOST_LDFLAGS="-L$best_path/lib" ;;
BOOST_LDFLAGS="-L$best_path/lib" esac
fi
fi fi
if test "x$BOOST_ROOT" != "x"; then if test "x$BOOST_ROOT" != "x"; then

1
ac/initialization.m4
View File

@ -1,3 +1,4 @@
AC_CANONICAL_TARGET
SAVED_CFLAGS="$CFLAGS" SAVED_CFLAGS="$CFLAGS"
AC_PROG_CC AC_PROG_CC
CFLAGS="$SAVED_CFLAGS" CFLAGS="$SAVED_CFLAGS"

5
autogen.sh
View File

@ -68,7 +68,10 @@ rm -f config.h config.h.in stamp-h1 &> /dev/null
echo " autoheader" && autoheader echo " autoheader" && autoheader
#echo " libtoolize --automake" && libtoolize --automake #echo " libtoolize --automake" && libtoolize --automake
echo " autoconf" && autoconf echo " autoconf" && autoconf
#echo " automake --add-missing --copy" && automake --add-missing --copy # Ignore automake errors. We need config.sub and config.guess
# which are copied by automake, but we don't use automake for
# managing Makefiles.
echo " automake --add-missing --copy" && automake --add-missing --copy 2> /dev/null
echo echo
echo "You can run './configure' now. If you need dependencies then" echo "You can run './configure' now. If you need dependencies then"