diff --git a/configure b/configure
index f1f7bdf..5ff9d0e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 45264 .
+# From configure.in Revision: 45278 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -3792,18 +3792,21 @@
 then
     case $GCC in
     yes)
+        if test "$CC" != 'g++' ; then
+	    STRICT_PROTO="-Wstrict-prototypes"
+	fi
 	case $ac_cv_prog_cc_g in
 	yes)
 	    if test "$Py_DEBUG" = 'true' ; then
 		# Optimization messes up debuggers, so turn it off for
 		# debug builds.
-		OPT="-g -Wall -Wstrict-prototypes"
+		OPT="-g -Wall $STRICT_PROTO"
 	    else
-		OPT="-g -O3 -Wall -Wstrict-prototypes"
+		OPT="-g -O3 -Wall $STRICT_PROTO"
 	    fi
 	    ;;
 	*)
-	    OPT="-O3 -Wall -Wstrict-prototypes"
+	    OPT="-O3 -Wall $STRICT_PROTO"
 	    ;;
 	esac
 	case $ac_sys_system in
diff --git a/configure.in b/configure.in
index 027dc50..db3b33a 100644
--- a/configure.in
+++ b/configure.in
@@ -685,18 +685,21 @@
 then
     case $GCC in
     yes)
+        if test "$CC" != 'g++' ; then
+	    STRICT_PROTO="-Wstrict-prototypes"
+	fi
 	case $ac_cv_prog_cc_g in
 	yes)
 	    if test "$Py_DEBUG" = 'true' ; then
 		# Optimization messes up debuggers, so turn it off for
 		# debug builds.
-		OPT="-g -Wall -Wstrict-prototypes"
+		OPT="-g -Wall $STRICT_PROTO"
 	    else
-		OPT="-g -O3 -Wall -Wstrict-prototypes"
+		OPT="-g -O3 -Wall $STRICT_PROTO"
 	    fi
 	    ;;
 	*)
-	    OPT="-O3 -Wall -Wstrict-prototypes"
+	    OPT="-O3 -Wall $STRICT_PROTO"
 	    ;;
 	esac
 	case $ac_sys_system in