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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/08/29 23:29:54

Modified files:
        .              : ChangeLog 
        macros         : boost.m4 

Log message:
        Fixed an issue with using CFLAGS in a C++-context.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4156&r2=1.4157
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4156
retrieving revision 1.4157
diff -u -b -r1.4156 -r1.4157
--- ChangeLog   29 Aug 2007 22:34:38 -0000      1.4156
+++ ChangeLog   29 Aug 2007 23:29:53 -0000      1.4157
@@ -5,6 +5,7 @@
        checking.
        * configure.ac, macros/libexe.m4, macros/kde.m4: 
        keep bourne-sh, /bin/sh, happy.
+       * macros/boost.m4: Fixed issue with lib-checking.
 
 2007-08-29 Sandro Santilli <address@hidden>
 

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- macros/boost.m4     22 Aug 2007 10:52:52 -0000      1.48
+++ macros/boost.m4     29 Aug 2007 23:29:54 -0000      1.49
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.48 2007/08/22 10:52:52 strk Exp $
+dnl $Id: boost.m4,v 1.49 2007/08/29 23:29:54 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -90,7 +90,7 @@
   boost_thread="no"
   AC_MSG_CHECKING([for Boost libraries])
   for i in $libslist; do
-    if test x${boost_date_time} = xyes && test x${boost_thread} = xyes; then
+    if test x${boost_date_time} = xyes -a x${boost_thread} = xyes; then
       break;
     fi
     dirs=`ls -dr $i/libboost_date_time*.${shlibext} 
$i/libboost_date_time*.${shlibext}.* $i/libboost_date_time*.a 2>/dev/null`
@@ -120,7 +120,7 @@
         lfile=`basename ${libname} | eval sed -e 's:^lib::'  -e 's:.a$::' -e 
's:\.${shlibext}.*::'`
         ldir=`dirname ${libname}`
         if test -f ${ldir}/lib${lfile}-mt.${shlibext}; then
-          lfile=${lfile}-mt
+          lfile="${lfile}-mt"
         fi
         boost_thread=yes
         ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
@@ -142,10 +142,8 @@
 
   if test x${cross_compiling} = xno; then
     AC_LANG_PUSH(C++)  
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $BOOST_CFLAGS"
+    CXXFLAGS="$CFLAGS $BOOST_CFLAGS"
     AC_CHECK_HEADERS([boost/thread.hpp], [], [boost_thread=no]) 
-    CFLAGS="$save_CFLAGS"
     AC_LANG_POP(C++)  
   fi # if not cross-compiling