diff --git a/configure b/configure
index 45672306eeb..409fdc1ed69 100755
--- a/configure
+++ b/configure
@@ -5056,6 +5056,7 @@ fi
 
 
 unset CFLAGS
+unset CXXFLAGS
 
 #
 # Read the template
diff --git a/configure.in b/configure.in
index 2093bb468f0..1ed94dbf7de 100644
--- a/configure.in
+++ b/configure.in
@@ -389,6 +389,7 @@ fi
 
 
 unset CFLAGS
+unset CXXFLAGS
 
 #
 # Read the template