e2p: encoding: fix default flags lookup

[thirdparty/e2fsprogs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9028a2ffcaefaf01e4ce4ebe7dd2ce5dc9425600..3b86c1a141e9250451cf349aea20fd8e6e32539b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -569,10 +569,12 @@ dnl
 dnl handle --enable-subset
 dnl
 ALL_CMT=
+SUBSET_CMT=
 AC_ARG_ENABLE([subset],
 [  --enable-subset       enable subset-only build],
 if test "$enableval" = "no"
 then
+       SUBSET_CMT=#
        AC_MSG_RESULT([Disabling subset-only build])
 else
        ALL_CMT=#
@@ -580,6 +582,7 @@ else
 fi
 ,)
 AC_SUBST(ALL_CMT)
+AC_SUBST(SUBSET_CMT)
 dnl
 dnl handle --disable-backtrace
 dnl
@@ -1111,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
@@ -1125,8 +1133,6 @@ AC_CHECK_FUNCS(m4_flatten([
        __secure_getenv
        add_key
        backtrace
-       blkid_probe_get_topology
-       blkid_probe_enable_partitions
        chflags
        dlopen
        fadvise64
@@ -1312,6 +1318,10 @@ linux*)
        ;;
 esac
 dnl
+dnl Check the available mount options
+dnl
+AX_CHECK_MOUNT_OPT(nosuid)
+AX_CHECK_MOUNT_OPT(nodev)
 dnl Enable LTO for all packages
 dnl
 AC_ARG_ENABLE([lto],