rpms/mkvtoolnix/F-9 mkvtoolnix-boost-lib64.patch,NONE,1.1

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29855

Added Files:
	mkvtoolnix-boost-lib64.patch 
Log Message:
- forgotten patch

mkvtoolnix-boost-lib64.patch:

--- NEW FILE mkvtoolnix-boost-lib64.patch ---
diff -up mkvtoolnix-2.4.0/ac/ax_boost_base.m4.ppc64 mkvtoolnix-2.4.0/ac/ax_boost_base.m4
--- mkvtoolnix-2.4.0/ac/ax_boost_base.m4.ppc64	2008-09-25 15:21:31.000000000 +0200
+++ mkvtoolnix-2.4.0/ac/ax_boost_base.m4	2008-12-01 20:40:44.000000000 +0100
@@ -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 or if you install boost with RPM
     if test "$ac_boost_path" != ""; then
-        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
+        case $target in
+             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+             *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
+        esac
         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
-                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
+                case $target in
+                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
+                esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
                 break;
             fi
@@ -171,11 +169,10 @@ if test "x$want_boost" = "xyes"; then
             BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
             if test "$ac_boost_lib_path" = ""
             then
-                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
+                case $target in
+                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
+                esac
             fi
 
                 if test "x$BOOST_ROOT" != "x"; then
diff -up mkvtoolnix-2.4.0/configure.ppc64 mkvtoolnix-2.4.0/configure
--- mkvtoolnix-2.4.0/configure.ppc64	2008-11-30 22:06:00.000000000 +0100
+++ mkvtoolnix-2.4.0/configure	2008-12-01 20:57:26.000000000 +0100
@@ -9947,20 +9947,18 @@ echo $ECHO_N "checking for boostlib >= $
     succeeded=no
 
                 if test "$ac_boost_path" != ""; then
-        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
+                   case $target in
+                        ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+                        *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
+                   esac
         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
-                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
+                case $target in
+                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
+                esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
                 break;
             fi
@@ -10081,11 +10079,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
             if test "$ac_boost_lib_path" = ""
             then
-                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
+                case $target in
+                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
+                esac
             fi
 
                 if test "x$BOOST_ROOT" != "x"; then