diff --git a/configure b/configure
index 9823e107..1e95fe90 100755
--- a/configure
+++ b/configure
@@ -14955,7 +14955,8 @@ fi
 if test "${enable_m32+set}" = set; then :
   enableval=$enable_m32; case "${enableval}" in
                  yes)
-		   CFLAGS=$(CFLAGS) -m32
+		   CFLAGS="${CFLAGS} -m32"
+		   CXXFLAGS="${CXXFLAGS} -m32"
                    usem32=true
                    ;;
                  no)
diff --git a/configure.ac b/configure.ac
index 2a3ed2c8..f85db345 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,8 @@ AC_ARG_ENABLE(m32,
                              [(default is no)]),
               [case "${enableval}" in
                  yes)
-		   CFLAGS=$(CFLAGS) -m32
+                   CFLAGS="${CFLAGS} -m32"
+                   CXXFLAGS="${CXXFLAGS} -m32"
                    usem32=true
                    ;;
                  no)