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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/21 00:02:37

Modified files:
        macros         : boost.m4 
        .              : ChangeLog 

Log message:
                * macros/boost.m4: Don't let the boost lib get added to LIBS, we
                want to handle it seperately.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1328&r2=1.1329

Patches:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/boost.m4     15 Oct 2006 14:26:05 -0000      1.20
+++ macros/boost.m4     21 Oct 2006 00:02:37 -0000      1.21
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: boost.m4,v 1.20 2006/10/15 14:26:05 bjacques Exp $
+dnl $Id: boost.m4,v 1.21 2006/10/21 00:02:37 rsavoye Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -114,6 +114,7 @@
   dnl a C function, as double colons screw up autoconf. We also force the 
probable 
   boostnames="boost_thread-gcc-mt boost_thread boost-thread boost_thread-mt 
boost-thread-gcc-mt"
   version_suffix=`echo ${gnash_boost_version} | tr '_' '.'`
+  save_LIBS="$LIBS"
   AC_LANG_PUSH(C++)
   if test x"${ac_cv_path_boost_lib}" = x; then
   AC_SEARCH_LIBS(cleanup_slots, ${boostnames}, 
[ac_cv_path_boost_lib="${LIBS}"],[
@@ -151,9 +152,10 @@
   fi
   AC_LANG_POP(C++)
   
+  dnl we don't want any boost libraries in LIBS, we prefer to kep it seperate.
+  LIBS="$save_LIBS"
   BOOST_LIBS="$ac_cv_path_boost_lib"
   
- 
   AC_SUBST(BOOST_LIBS)
 
   AM_CONDITIONAL(HAVE_BOOST, [test x${ac_cv_path_boost_incl} != x]) 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1328
retrieving revision 1.1329
diff -u -b -r1.1328 -r1.1329
--- ChangeLog   20 Oct 2006 19:52:25 -0000      1.1328
+++ ChangeLog   21 Oct 2006 00:02:37 -0000      1.1329
@@ -1,3 +1,8 @@
+2006-10-20  Rob Savoye  <address@hidden>
+
+       * macros/boost.m4: Don't let the boost lib get added to LIBS, we
+       want to handle it seperately.
+
 2006-10-20 Markus Gothe <address@hidden>
        
        * server/as_enviroment.cpp: Removed MIPSPRO #pragma. CC will fail