python
diff --git a/‎configure‎
Lines changed: 58 additions & 17 deletions b/‎configure‎
Lines changed: 58 additions & 17 deletions
diff --git a/‎configure.ac‎
Lines changed: 19 additions & 12 deletions b/‎configure.ac‎
Lines changed: 19 additions & 12 deletions
@@ -5415,22 +5415,29 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
   ])
 ])
 
-PKG_CHECK_MODULES([LIBZSTD], [libzstd], [have_libzstd=yes], [
+define([TEST_ZSTD_VERSION],[
+  AC_MSG_CHECKING([if libzstd is new enough])
+
+  dnl TODO(emmatyping): check if we can set a C define for the minimum version
+  dnl to re-use here and in the header compile check
+
+  dnl This is checked when both a package is found and we do fallback searches
+  dnl If you update the minimum version here, you should update the compile
+  dnl check in Modules/_zstd/_zstdmodule.h
+  AC_RUN_IFELSE([AC_LANG_PROGRAM([@%:@include "zstd.h"], [
+      #if ZSTD_VERSION_NUMBER < 10405
+          exit(1);
+      #endif
+    ])], [have_libzstd=yes], [have_libzstd=no])
+])
+
+PKG_CHECK_MODULES([LIBZSTD], [libzstd], [TEST_ZSTD_VERSION()], [
   WITH_SAVE_ENV([
     CPPFLAGS="$CPPFLAGS $LIBZSTD_CFLAGS"
     LIBS="$LIBS $LIBZSTD_LIBS"
     AC_CHECK_HEADERS([zstd.h zdict.h], [
-      AC_CHECK_LIB([zstd], [ZDICT_finalizeDictionary], [
-        AC_RUN_IFELSE([AC_LANG_PROGRAM([
-          #include "zstd.h"
-        ], [
-          // if you update the minimum version, you should update the compile
-          // check in Modules/_zstd/_zstdmodule.h
-          #if ZSTD_VERSION_NUMBER < 10405
-              exit(1);
-          #endif
-        ])], [have_libzstd=yes], [have_libzstd=no])
-      ], [have_libzstd=no])
+      AC_CHECK_LIB([zstd], [ZDICT_finalizeDictionary],
+       [TEST_ZSTD_VERSION()], [have_libzstd=no])
     ], [have_libzstd=no])
     AS_VAR_IF([have_libzstd], [yes], [
       LIBZSTD_CFLAGS=${LIBZSTD_CFLAGS-""}