[Gnash-commit] gnash/macros boost.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/14 00:23:55

Modified files:
        macros         : boost.m4 

Log message:
        Naming confusion fixed: $libdir -> $j.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- boost.m4    13 Oct 2006 23:13:15 -0000      1.17
+++ boost.m4    14 Oct 2006 00:23:54 -0000      1.18
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: boost.m4,v 1.17 2006/10/13 23:13:15 nihilus Exp $
+dnl $Id: boost.m4,v 1.18 2006/10/14 00:23:54 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -64,21 +64,17 @@
        $PKG_CONFIG --exists boost && gnash_boost_version=`$PKG_CONFIG 
--modversion boost | cut -d "." -f 1 | awk '{print $1".0"}'`
   fi
 
-  pathlist="/usr/local/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /opt/local/include 
/opt/local/include /usr/include /usr/pkg/include .. ../.."
+  pathlist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /opt/local/include 
/opt/local/include /usr/include /usr/pkg/include .. ../.."
   gnash_boost_topdir=""
   gnash_boost_version=""
   for i in $pathlist; do
-    for libdir in `ls -dr $i/boost* 2>/dev/null`; do
+    for j in `ls -dr $i/boost* 2>/dev/null`; do
       if test -f ${libdir}/boost/detail/lightweight_mutex.hpp; then
-       ac_cv_path_boost_incl="-I${libdir}"
-        gnash_boost_topdir=`echo ${libdir} | sed -e 's:/include/.*::'`
-        gnash_boost_version=`basename ${libdir} | sed -e 's:boost-::'`
+        gnash_boost_topdir=`basename $j`
+        gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 's:boost-::'`
         break
       fi
     done
-    if test x"${gnash_boost_topdir}" != x ; then
-      break;
-    fi
   done
 
   if test x"${gnash_boost_version}" = x; then