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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/31 15:38:41

Modified files:
        .              : ChangeLog 
        macros         : boost.m4 

Log message:
                * macros/boost.m4: don't trash user-defined CXXFLAGS, and don't
                  provide one if not user-specified initially.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4173&r2=1.4174
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4173
retrieving revision 1.4174
diff -u -b -r1.4173 -r1.4174
--- ChangeLog   31 Aug 2007 15:23:28 -0000      1.4173
+++ ChangeLog   31 Aug 2007 15:38:40 -0000      1.4174
@@ -1,5 +1,7 @@
 2007-08-31 Sandro Santilli <address@hidden>
 
+       * macros/boost.m4: don't trash user-defined CXXFLAGS, and don't
+         provide one if not user-specified initially.
        * testsuite/misc-swfc.all/check.sc: ops, last totals() define
          was buggy, this one is good.
 

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- macros/boost.m4     29 Aug 2007 23:29:54 -0000      1.49
+++ macros/boost.m4     31 Aug 2007 15:38:41 -0000      1.50
@@ -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.49 2007/08/29 23:29:54 nihilus Exp $
+dnl $Id: boost.m4,v 1.50 2007/08/31 15:38:41 strk Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -142,8 +142,16 @@
 
   if test x${cross_compiling} = xno; then
     AC_LANG_PUSH(C++)  
-    CXXFLAGS="$CFLAGS $BOOST_CFLAGS"
+    dnl # Save value of current CXXFLAGS
+    save_CXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CFLAGS $BOOST_CFLAGS" dnl # SHOULDN'T WE INCLUDE $CXXFLAGS TOO 
THEN ?
     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
     AC_LANG_POP(C++)  
   fi # if not cross-compiling