diff --git a/config/cxx-compiler.m4 b/config/cxx-compiler.m4
index 4715259a49d8581c46f3d3891b17b9be38879cdb..a0b961907699935eb7f59fd26aa9c39d9e43d8e3 100644
--- a/config/cxx-compiler.m4
+++ b/config/cxx-compiler.m4
@@ -6,13 +6,13 @@ AC_DEFUN([PGAC_PROG_CXX_CXXFLAGS_OPT],
 [AC_MSG_CHECKING([if $CXX supports $1])
 pgac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$pgac_save_CXXFLAGS $1"
-ac_save_c_werror_flag=$ac_c_werror_flag
-ac_c_werror_flag=yes
+ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ac_cxx_werror_flag=yes
 AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
                    AC_MSG_RESULT(yes),
                    [CXXFLAGS="$pgac_save_CXXFLAGS"
                     AC_MSG_RESULT(no)])
 AC_LANG_POP([C++])
-ac_c_werror_flag=$ac_save_c_werror_flag
+ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 ])# PGAC_PROG_CXX_CXXFLAGS_OPT
diff --git a/configure b/configure
index e9bb937c86468982d17312305658054e0f7e2064..e22b747e7e9fa4a6a052478deb1b5f706e0d7b63 100755
--- a/configure
+++ b/configure
@@ -4990,8 +4990,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 $as_echo_n "checking if $CXX supports -fno-aggressive-loop-optimizations... " >&6; }
 pgac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$pgac_save_CXXFLAGS -fno-aggressive-loop-optimizations"
-ac_save_c_werror_flag=$ac_c_werror_flag
-ac_c_werror_flag=yes
+ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ac_cxx_werror_flag=yes
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5024,7 +5024,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_c_werror_flag=$ac_save_c_werror_flag
+ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 
 
   # Silence compiler warnings that you get with modern versions of GCC.