[Gnash-commit] gnash ChangeLog macros/boost.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/30 16:01:22

Modified files:
        .              : ChangeLog 
        macros         : boost.m4 

Log message:
        Applied patch from Bernhard Rosenkraenzer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1442&r2=1.1443
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1442
retrieving revision 1.1443
diff -u -b -r1.1442 -r1.1443
--- ChangeLog   30 Oct 2006 11:12:00 -0000      1.1442
+++ ChangeLog   30 Oct 2006 16:01:21 -0000      1.1443
@@ -3,6 +3,7 @@
         * AUTHORS: added Hannes.
        * configure.ac: Removed 0.7.1 from the version info, let's stick with
          cvs+BUILDDATE.
+       * macros/boost.m4: Applied patch from Bernhard Rosenkraenzer.
 
 2006-10-30 Hannes Mayr <address@hidden>
        * server/asobj/NetStream.cpp: added <unistd.h> include for sleep()

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/boost.m4     29 Oct 2006 18:34:10 -0000      1.23
+++ macros/boost.m4     30 Oct 2006 16:01:21 -0000      1.24
@@ -17,7 +17,7 @@
 dnl  
 dnl 
 
-dnl $Id: boost.m4,v 1.23 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: boost.m4,v 1.24 2006/10/30 16:01:21 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -51,7 +51,7 @@
   gnash_boost_version=""
   for i in $pathlist; do
     for j in `ls -dr $i/boost* 2>/dev/null`; do
-      if test -f ${libdir}/boost/detail/lightweight_mutex.hpp; then
+      if test -f ${j}/boost/detail/lightweight_mutex.hpp; then
         gnash_boost_topdir=`basename $j`
         gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 's:boost-::'`
         break
@@ -75,6 +75,12 @@
           ac_cv_path_boost_incl="-I$i"
           break
         fi
+        for j in `ls -dr $i/boost* 2>/dev/null`; do
+          if test -f $j/boost/detail/lightweight_mutex.hpp; then
+            ac_cv_path_boost_incl="-I$j"
+            break
+          fi
+        done
       done
    fi])
   fi