From 39eb471f98b01af9115b5ab5ff9aec43ef65db85 Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Mon, 1 Jul 2002 20:37:39 +0000
Subject: [PATCH] set CXXFLAGS also during test

---
 src/libFLAC++/libFLAC++.m4 | 2 ++
 src/libFLAC/libFLAC.m4     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/libFLAC++/libFLAC++.m4 b/src/libFLAC++/libFLAC++.m4
index 433154f9..7620606d 100644
--- a/src/libFLAC++/libFLAC++.m4
+++ b/src/libFLAC++/libFLAC++.m4
@@ -40,8 +40,10 @@ AC_ARG_ENABLE(libFLACPPtest, [  --disable-libFLACPPtest       Do not try to comp
 
   if test "x$enable_libFLACPPtest" = "xyes" ; then
     ac_save_CFLAGS="$CFLAGS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
     ac_save_LIBS="$LIBS"
     CFLAGS="$CFLAGS $LIBFLACPP_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $LIBFLACPP_CFLAGS"
     LIBS="$LIBS $LIBFLACPP_LIBS"
 dnl
 dnl Now check if the installed libFLAC++ is sufficiently new.
diff --git a/src/libFLAC/libFLAC.m4 b/src/libFLAC/libFLAC.m4
index 1abeed6f..88d8e84c 100644
--- a/src/libFLAC/libFLAC.m4
+++ b/src/libFLAC/libFLAC.m4
@@ -37,8 +37,10 @@ AC_ARG_ENABLE(libFLACtest, [  --disable-libFLACtest       Do not try to compile
 
   if test "x$enable_libFLACtest" = "xyes" ; then
     ac_save_CFLAGS="$CFLAGS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
     ac_save_LIBS="$LIBS"
     CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS"
     LIBS="$LIBS $LIBFLAC_LIBS"
 dnl
 dnl Now check if the installed libFLAC is sufficiently new.