diff --git a/configure b/configure
index 1d8e22f4..b790a474 100755
--- a/configure
+++ b/configure
@@ -1060,7 +1060,7 @@ Optional Features:
   --enable-old-jpeg       enable support for Old JPEG compresson (read
                           contrib/ojpeg/README first! Compilation fails with
                           unpatched IJG JPEG library)
-  --enable-c++            enable C++ stream API building (requires C++
+  --enable-cxx            enable C++ stream API building (requires C++
                           compiler)
   --disable-strip-chopping
                           disable support for strip chopping (whether or not
@@ -23715,9 +23715,9 @@ else
 fi
 
 
-# Check whether --enable-c++ or --disable-c++ was given.
-if test "${enable_c+++set}" = set; then
-  enableval="$enable_c++"
+# Check whether --enable-cxx or --disable-cxx was given.
+if test "${enable_cxx+set}" = set; then
+  enableval="$enable_cxx"
   HAVE_CXX=$enableval
 else
   HAVE_CXX=yes
diff --git a/configure.ac b/configure.ac
index 59b51370..5583a143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,8 +356,8 @@ dnl ---------------------------------------------------------------------------
 dnl Check for C++.
 dnl ---------------------------------------------------------------------------
 
-AC_ARG_ENABLE(c++,
-	      AS_HELP_STRING([--enable-c++],
+AC_ARG_ENABLE(cxx,
+	      AS_HELP_STRING([--enable-cxx],
 			     [enable C++ stream API building (requires C++ compiler)]),
 	      [HAVE_CXX=$enableval], [HAVE_CXX=yes])