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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/09/01 23:44:23

Modified files:
        .              : ChangeLog 
        macros         : boost.m4 libslist 

Log message:
        push/pop flags

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4184&r2=1.4185
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4184
retrieving revision 1.4185
diff -u -b -r1.4184 -r1.4185
--- ChangeLog   1 Sep 2007 10:32:43 -0000       1.4184
+++ ChangeLog   1 Sep 2007 23:44:22 -0000       1.4185
@@ -1,3 +1,7 @@
+2007-09-01 Markus Gothe <address@hidden> 
+
+       * macros/boost.m4: push/pop CXXFLAGS/CPPFLAGS.
+
 2007-09-01 Sandro Santilli <address@hidden>
 
        * server/asobj/Object.cpp (attachObjectInterface): remove

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- macros/boost.m4     31 Aug 2007 15:38:41 -0000      1.50
+++ macros/boost.m4     1 Sep 2007 23:44:23 -0000       1.51
@@ -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.50 2007/08/31 15:38:41 strk Exp $
+dnl $Id: boost.m4,v 1.51 2007/09/01 23:44:23 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -142,16 +142,13 @@
 
   if test x${cross_compiling} = xno; then
     AC_LANG_PUSH(C++)  
-    dnl # Save value of current CXXFLAGS
     save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CFLAGS $BOOST_CFLAGS" dnl # SHOULDN'T WE INCLUDE $CXXFLAGS TOO 
THEN ?
+    save_CPPFLAGS="$CPPFLAGS"
+    CXXFLAGS="$CFLAGS $BOOST_CFLAGS"
+    CPPFLAGS="$CXXFLAGS"
     AC_CHECK_HEADERS([boost/thread.hpp], [], [boost_thread=no]) 
-    dnl # Do not force setting CXXFLAGS if it wasn't set before
-    if test x"$ac_env_CXXFLAGS_set" = "xset"; then
       CXXFLAGS="$save_CXXFLAGS"
-    else
-      unset CXXFLAGS; 
-    fi
+    CPPFLAGS="$save_CPPFLAGS"
     AC_LANG_POP(C++)  
   fi # if not cross-compiling
 

Index: macros/libslist
===================================================================
RCS file: /sources/gnash/gnash/macros/libslist,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- macros/libslist     28 Apr 2007 00:04:26 -0000      1.8
+++ macros/libslist     1 Sep 2007 23:44:23 -0000       1.9
@@ -1 +1 @@
-${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 
${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 
/usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib 
/pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib 
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib 
/usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 .. ../..
+${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib32 
${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib32 /usr/lib32 
/usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib 
/pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib 
/usr/lib/opengl/xorg-x11/lib /usr/lib32/opengl/xorg-x11/lib 
/usr/lib32/opengl/xorg-x11/lib32  /opt/mesa/lib /opt/mesa/lib32 .. ../..