From 8a4f7082207cf11b26818c3290097856737b0385 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 2 Sep 2024 12:52:21 +0200
Subject: [PATCH] [3.13] gh-122571: Remove duplicate definition of
 PY_BUILTIN_HASHLIB_HASHES in configure.ac (GH-122572) (#122763)

gh-122571: Remove duplicate definition of PY_BUILTIN_HASHLIB_HASHES in configure.ac (GH-122572)

The redefinition in confdefs.h can cause issues with the
AX_CHECK_COMPILE_FLAG macro.
(cherry picked from commit b5e142ba7c2063efe9bb8065c3b0bad33e2a9afa)

Co-authored-by: Jonathan Protzenko <protz@microsoft.com>
---
 configure    | 4 +---
 configure.ac | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 09df9b1691f..26bb63feacf 100755
--- a/configure
+++ b/configure
@@ -28430,9 +28430,6 @@ fi
 
 # builtin hash modules
 default_hashlib_hashes="md5,sha1,sha2,sha3,blake2"
-
-printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES /**/" >>confdefs.h
-
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5
 printf %s "checking for --with-builtin-hashlib-hashes... " >&6; }
 
@@ -28457,6 +28454,7 @@ fi
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_builtin_hashlib_hashes" >&5
 printf "%s\n" "$with_builtin_hashlib_hashes" >&6; }
+
 printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$with_builtin_hashlib_hashes\"" >>confdefs.h
 
 
diff --git a/configure.ac b/configure.ac
index 6aede6560f6..dc76c446aa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7318,8 +7318,6 @@ AC_DEFINE([PY_SSL_DEFAULT_CIPHERS], [1])
 
 # builtin hash modules
 default_hashlib_hashes="md5,sha1,sha2,sha3,blake2"
-AC_DEFINE([PY_BUILTIN_HASHLIB_HASHES], [], [enabled builtin hash modules]
-)
 AC_MSG_CHECKING([for --with-builtin-hashlib-hashes])
 AC_ARG_WITH(
   [builtin-hashlib-hashes],
@@ -7336,7 +7334,8 @@ AC_ARG_WITH(
 
 AC_MSG_RESULT([$with_builtin_hashlib_hashes])
 AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES],
-  ["$with_builtin_hashlib_hashes"])
+                   ["$with_builtin_hashlib_hashes"],
+                   [enabled builtin hash modules])
 
 as_save_IFS=$IFS
 IFS=,