From 2a72f8a49cf6601db7c987c7c4d6a72a29a59a1e Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Fri, 10 Feb 2023 19:19:31 +0100
Subject: configure.ac: better blkid test

Previous commit e67ebc5c40948bcbea536fd407535009a76ede00 used incorrect check
for blkid version.
Fix it by always checking for at least version 2.24,
as we can't use older version anyway.
Added BLKID_SUBLKS_FSINFO is present in newer version.
---
 configure.ac | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 7f9b3e664..49b06145d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1113,12 +1113,11 @@ AC_ARG_ENABLE(blkid_wiping,
 #       so lvresize can check detected flag here
 #
 DEFAULT_USE_BLKID_WIPING=0
-AS_IF([test "$BLKID_WIPING" != "no"], [blkdir_version=">= 2.24"], [blkid_version=""])
 
-PKG_CHECK_MODULES([BLKID], [blkid $blkid_version ], [
+PKG_CHECK_MODULES([BLKID], [blkid >= 2.24], [
 	HAVE_BLKID=1
 
-	AC_CACHE_CHECK([for blkdid.h supports SUBLKS_FSINFO.],
+	AC_CACHE_CHECK([for blkdid.h defines BLKID_SUBLKS_FSINFO.],
 		[ac_cv_have_blkid_sublks_fsinfo],
 		[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <blkid/blkid.h>
 #ifndef BLKID_SUBLKS_FSINFO
-- 
cgit v1.2.1