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

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/04/08 20:30:28

Modified files:
        .              : ChangeLog configure.ac 
        macros         : boost.m4 

Log message:
        configure.ac: suggest "apt-get install swftools"
        macros/boost.m4: don't -I/usr/include

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6220&r2=1.6221
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.508&r2=1.509
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.76&r2=1.77

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6220
retrieving revision 1.6221
diff -u -b -r1.6220 -r1.6221
--- ChangeLog   8 Apr 2008 20:23:33 -0000       1.6220
+++ ChangeLog   8 Apr 2008 20:30:27 -0000       1.6221
@@ -1,3 +1,8 @@
+2008-04-08 Russ Nelson <address@hidden>
+
+       * configure.ac: suggest "apt-get install swftools"
+       * macros/boost.m4: don't -I/usr/include
+
 2008-04-08 Sandro Santilli <address@hidden>
 
        * server/edit_text_character.cpp (attachTextFieldInterface):

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -b -r1.508 -r1.509
--- configure.ac        8 Apr 2008 02:56:28 -0000       1.508
+++ configure.ac        8 Apr 2008 20:30:28 -0000       1.509
@@ -2738,6 +2738,7 @@
     echo "        WARNING: You need to have 'swfc' from SWFTools installed"
     echo "                 to run some of the tests in Gnash testsuite."
     echo "                 You can install it from http://www.swftools.org/";
+    echo "                 or .deb users: apt-get install swftools"
   fi
 
   if test x"$PYTHON" != x; then

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- macros/boost.m4     5 Mar 2008 03:55:55 -0000       1.76
+++ macros/boost.m4     8 Apr 2008 20:30:28 -0000       1.77
@@ -75,7 +75,7 @@
   AC_MSG_CHECKING([for boost header])
   for i in $newlist; do
     dirs="`ls -dr $i/boost* 2>/dev/null`"
-    if test -n "${dirs}"; then
+    if test -n "${dirs}" -a x"${dirs}" != x"/usr/include/boost"; then
       gnash_boost_topdir="`(cd ${dirs}; pwd)`"
       gnash_boost_subdir="`dirname ${gnash_boost_topdir}`"
       gnash_boost_version="`echo ${gnash_boost_topdir} | sed -e 's:boost-::'`"