X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=configure.ac;h=3b86c1a141e9250451cf349aea20fd8e6e32539b;hb=c554f5558cb37cf640048d693be81bf3b9dff150;hp=fe1cad11a39d6dbb8cb6f5e25a2b581c075bd5bf;hpb=e500f69c2b4219148f7a7fa61160ccc13756179f;p=thirdparty%2Fe2fsprogs.git

diff --git a/configure.ac b/configure.ac
index fe1cad11a..3b86c1a14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1114,11 +1114,16 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
 	[#include <sys/types.h>
 	 #include <sys/socket.h>])
 dnl
-dnl This will add -lblkid to the AC_CHECK_FUNCS search if we are using
-dnl the system-provided blkid library
+dnl If we are using the system-provided blkid library, check for
+dnl the functions added after migrating that library to util-linux
 dnl
 if test -n "$BLKID_CMT"; then
-  AC_SEARCH_LIBS([blkid_probe_all], [blkid])
+  AC_CHECK_LIB(blkid, blkid_probe_get_topology,
+		      AC_DEFINE(HAVE_BLKID_PROBE_GET_TOPOLOGY, 1,
+				[Define to 1 if blkid has blkid_probe_get_topology]))
+  AC_CHECK_LIB(blkid, blkid_probe_enable_partitions,
+		      AC_DEFINE(HAVE_BLKID_PROBE_ENABLE_PARTITIONS, 1,
+				[Define to 1 if blkid has blkid_probe_enable_partitions]))
 fi
 dnl
 if test -n "$DLOPEN_LIB" ; then
@@ -1128,8 +1133,6 @@ AC_CHECK_FUNCS(m4_flatten([
 	__secure_getenv
 	add_key
 	backtrace
-	blkid_probe_get_topology
-	blkid_probe_enable_partitions
 	chflags
 	dlopen
 	fadvise64