e2fsprogs: disable build of e4defrag unless explicitly enabled

The e2fsprogs configure script enables the build of the e4defrag
utility by default. Disable it unless BR2_PACKAGE_E2FSPROGS_E4DEFRAG
is selected.

Also the --disable-blkid option is not recognized by the configure
script. Use --disable-libblkid instead.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 912deab6c65e84fe999c1a92d8c2b3f74c86f4b6..f3d44f6fa8a05dfa9bb41f1d63114c8c5ce606f9 100644 (file)
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -12,9 +12,10 @@ E2FSPROGS_CONF_OPT = \
        --enable-elf-shlibs \
        $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
        $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
+       $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \
        $(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
        --disable-uuidd \
-       --disable-blkid \
+       --disable-libblkid \
        --disable-libuuid \
        --enable-fsck \
        --disable-e2initrd-helper \