GH-132983: Remove zstd version check in the header file (#133502)

AA-Turner · web-flow · commit f8691901d734 · 2025-05-06T15:04:50.000+03:00
diff --git a/Modules/_zstd/_zstdmodule.h b/Modules/_zstd/_zstdmodule.h
@@ -12,14 +12,6 @@ Python module.
 #include "zdict.h"
 
 
-// if you update the minimum version, you should update the compile
-// check in configure.ac
-#define PYTHON_MINIMUM_SUPPORTED_ZSTD_VERSION 10405
-
-#if ZSTD_VERSION_NUMBER < PYTHON_MINIMUM_SUPPORTED_ZSTD_VERSION
-    #error "_zstd module requires zstd v1.4.5+"
-#endif
-
 /* Forward declaration of module state */
 typedef struct _zstd_state _zstd_state;
 
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -5386,21 +5386,8 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
   ])
 ])
 
-dnl zstd 1.4.5 added ZDICT_finalizeDictionary
-PKG_CHECK_MODULES([LIBZSTD], [libzstd >= 1.4.5], [have_libzstd=yes], [
-  WITH_SAVE_ENV([
-    CPPFLAGS="$CPPFLAGS $LIBZSTD_CFLAGS"
-    LIBS="$LIBS $LIBZSTD_LIBS"
-    AC_CHECK_HEADERS([zstd.h zdict.h], [
-      PY_CHECK_LIB([zstd], [ZDICT_finalizeDictionary],
-                   [have_libzstd=yes], [have_libzstd=no])
-    ], [have_libzstd=no])
-    AS_VAR_IF([have_libzstd], [yes], [
-      LIBZSTD_CFLAGS=${LIBZSTD_CFLAGS-""}
-      LIBZSTD_LIBS=${LIBZSTD_LIBS-"-lzstd"}
-    ])
-  ])
-])
+dnl zstd 1.4.5 stabilised ZDICT_finalizeDictionary
+PKG_CHECK_MODULES([LIBZSTD], [libzstd >= 1.4.5], [have_libzstd=yes], [have_libzstd=no])
 
 dnl PY_CHECK_NETDB_FUNC(FUNCTION)
 AC_DEFUN([PY_CHECK_NETDB_FUNC], [PY_CHECK_FUNC([$1], [@%:@include <netdb.h>])])
diff --git a/pyconfig.h.in b/pyconfig.h.in
@@ -1630,18 +1630,12 @@
 /* Define to 1 if you have the 'writev' function. */
 #undef HAVE_WRITEV
 
-/* Define to 1 if you have the <zdict.h> header file. */
-#undef HAVE_ZDICT_H
-
 /* Define if the zlib library has inflateCopy */
 #undef HAVE_ZLIB_COPY
 
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
-/* Define to 1 if you have the <zstd.h> header file. */
-#undef HAVE_ZSTD_H
-
 /* Define to 1 if you have the '_getpty' function. */
 #undef HAVE__GETPTY
 
