[patch] Patch to remove boost version mangling

_gnash-master-boost-m4.diff (text/plain), 1.43 KB, created by David E. Narváez on 2012-11-07 11:57:32 UTC

diff --git a/macros/boost.m4 b/macros/boost.m4
index 845aaae..584450b 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -75,7 +75,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
 
   AC_MSG_CHECKING([for boost header])
   for i in $newlist; do
-    dirs="`ls -dr $i/boost* 2>/dev/null | xargs`"
+    dirs="`ls -dr $i/boost 2>/dev/null | xargs`"
     for u in ${dirs}; do
     	if test -n "$u" -a -d "$u" -a x"$u" != x"/usr/include/boost"; then
       	gnash_boost_topdir="`(cd $u; pwd)`"
@@ -130,7 +130,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
         missing_libs=""
       fi
       for j in ${boost_libs}; do
-        dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a 2>/dev/null`"
+        dirs="`ls -dr $i/libboost_${j}.${shlibext} $i/libboost_${j}.a 2>/dev/null`"
         if test -n "${dirs}"; then
           libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
           if test x$dirname = x; then
@@ -146,7 +146,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
       done
     done
     for j in ${cygnal_boost_libs}; do
-      dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} ${dirname}/libboost_${j}*.a 2>/dev/null`"
+      dirs="`ls -dr ${dirname}/libboost_${j}.${shlibext} ${dirname}/libboost_${j}.a 2>/dev/null`"
       if test -n "${dirs}"; then
           libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
         ac_cv_path_boost_cygnal_lib="${ac_cv_path_boost_cygnal_lib} -l${libname}"