python
diff --git a/‎configure
Lines changed: 23 additions & 25 deletions b/‎configure
Lines changed: 23 additions & 25 deletions
diff --git a/‎configure.ac
Lines changed: 17 additions & 11 deletions b/‎configure.ac
Lines changed: 17 additions & 11 deletions
@@ -2492,24 +2492,30 @@ AC_DEFUN([PY_CHECK_CC_WARNING], [
   AS_VAR_POPDEF([py_var])
 ])
 
+dnl PY_CHECK_CC_CFLAG(ENABLE, CFLAG, [MSG])
+AC_DEFUN([PY_CHECK_CC_CFLAG], [
+  AS_VAR_PUSHDEF([py_var], [ac_cv_$1_]m4_normalize($2)[_flag])
+  AC_CACHE_CHECK([m4_ifblank([$3], [if we can $1 $CC $2 flag], [$3])], [py_var], [
+    AS_VAR_COPY([py_cflags], [CFLAGS])
+    AS_VAR_APPEND([CFLAGS], [" -f$2 -Werror"])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                      [AS_VAR_SET([py_var], [yes])],
+                      [AS_VAR_SET([py_var], [no])])
+    AS_VAR_COPY([CFLAGS], [py_cflags])
+  ])
+  AS_VAR_POPDEF([py_var])
+])
+
 # tweak BASECFLAGS based on compiler and platform
 AS_VAR_IF([with_strict_overflow], [yes],
           [BASECFLAGS="$BASECFLAGS $STRICT_OVERFLOW_CFLAGS"],
           [BASECFLAGS="$BASECFLAGS $NO_STRICT_OVERFLOW_CFLAGS"])
 
 # Enable flags that warn and protect for potential security vulnerabilities.
 # These flags should be enabled by default for all builds.
-case $ac_sys_system/$CC in
-   AIX*/gcc*)
-   # In AIX with GCC, the compile check passes with -fstack-protector-strong
-   # even though it is not supported and is exposed only by a run/link check.
-   # So disable it.
-     AC_MSG_WARN([-fstack-protector-strong not supported in AIX with gcc])
-   ;;
-   *)
-   AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [BASECFLAGS="$BASECFLAGS -fstack-protector-strong"], [AC_MSG_WARN([-fstack-protector-strong not supported])], [-Werror])
-   ;;
-esac
+PY_CHECK_CC_CFLAG([enable], [stack-protector-strong], [if we can add -fstack-protector-strong])
+AS_VAR_IF([ac_cv_enable_stack_protector_strong_flag], [yes],
+          [BASECFLAGS="$BASECFLAGS -fstack-protector-strong"], AC_MSG_WARN([-fstack-protector-strong not supported]))
 AX_CHECK_COMPILE_FLAG([-Wtrampolines], [BASECFLAGS="$BASECFLAGS -Wtrampolines"], [AC_MSG_WARN([-Wtrampolines not supported])], [-Werror])
 AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=3], [BASECFLAGS="$BASECFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"], [AC_MSG_WARN([-D_FORTIFY_SOURCE=3 not supported])])