From da26e27de19e8599f6b163aabcfd2eaf67350829 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Date: Thu, 2 Jul 2009 11:09:24 +0200
Subject: [PATCH] Extend the previous change to C++ builds.

---
 src/configure    | 2 ++
 src/configure.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/configure b/src/configure
index 399331564..65d0f66dc 100755
--- a/src/configure
+++ b/src/configure
@@ -4820,6 +4820,7 @@ if test "$with_debug_cflags" = "yes"; then
 fi
 if test "$with_debug_cflags" != "no"; then
   CFLAGS="$with_debug_cflags $CFLAGS"
+  CXXFLAGS="$with_debug_cflags $CXXFLAGS"
   LDFLAGS="$with_debug_cflags $LDFLAGS"
 fi
 if test "$with_profile_cflags" = "yes"; then
@@ -4827,6 +4828,7 @@ if test "$with_profile_cflags" = "yes"; then
 fi
 if test "$with_profile_cflags" != "no"; then
   CFLAGS="$with_profile_cflags $CFLAGS"
+  CXXFLAGS="$with_profile_cflags $CFLAGS"
   LDFLAGS="$with_profile_cflags $LDFLAGS"
 fi
 
diff --git a/src/configure.in b/src/configure.in
index b9e436d79..b80fb1309 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -329,6 +329,7 @@ if test "$with_debug_cflags" = "yes"; then
 fi
 if test "$with_debug_cflags" != "no"; then
   CFLAGS="$with_debug_cflags $CFLAGS"
+  CXXFLAGS="$with_debug_cflags $CXXFLAGS"
   LDFLAGS="$with_debug_cflags $LDFLAGS"
 fi
 if test "$with_profile_cflags" = "yes"; then
@@ -336,6 +337,7 @@ if test "$with_profile_cflags" = "yes"; then
 fi
 if test "$with_profile_cflags" != "no"; then
   CFLAGS="$with_profile_cflags $CFLAGS"
+  CXXFLAGS="$with_profile_cflags $CFLAGS"
   LDFLAGS="$with_profile_cflags $LDFLAGS"
 fi