diff options
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | misc-utils/Makemodule.am | 28 |
2 files changed, 33 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 14e20d075..35f80b80a 100644 --- a/configure.ac +++ b/configure.ac @@ -887,6 +887,23 @@ UL_BUILD_INIT([uuidgen], [check]) UL_REQUIRES_BUILD([uuidgen], [libuuid]) AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes]) +UL_BUILD_INIT([blkid], [check]) +UL_REQUIRES_BUILD([blkid], [libblkid]) +AM_CONDITIONAL([BUILD_BLKID], [test "x$build_blkid" = xyes]) + +UL_BUILD_INIT([findfs], [check]) +UL_REQUIRES_BUILD([findfs], [libblkid]) +AM_CONDITIONAL([BUILD_FINDFS], [test "x$build_findfs" = xyes]) + +UL_BUILD_INIT([wipefs], [check]) +UL_REQUIRES_BUILD([wipefs], [libblkid]) +AM_CONDITIONAL([BUILD_WIPEFS], [test "x$build_wipefs" = xyes]) + +UL_BUILD_INIT([findmnt], [check]) +UL_REQUIRES_BUILD([findmnt], [libmount]) +UL_REQUIRES_BUILD([findmnt], [libsmartcols]) +AM_CONDITIONAL([BUILD_FINDMNT], [test "x$build_findmnt" = xyes]) + AC_ARG_ENABLE([mountpoint], AS_HELP_STRING([--disable-mountpoint], [do not build mountpoint]), diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index e1bce1fde..9e643bfa1 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -104,36 +104,40 @@ PATHFILES += \ misc-utils/uuidd.service \ misc-utils/uuidd.socket -if BUILD_LIBBLKID +if BUILD_BLKID sbin_PROGRAMS += blkid dist_man_MANS += misc-utils/blkid.8 blkid_SOURCES = misc-utils/blkid.c blkid_LDADD = $(LDADD) libblkid.la libcommon.la blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +if HAVE_STATIC_BLKID +sbin_PROGRAMS += blkid.static +blkid_static_SOURCES = $(blkid_SOURCES) +blkid_static_LDFLAGS = -all-static +blkid_static_LDADD = $(LDADD) libblkid.la +blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +endif +endif # BUILD_BLKID + + +if BUILD_FINDFS sbin_PROGRAMS += findfs dist_man_MANS += misc-utils/findfs.8 findfs_LDADD = $(LDADD) libblkid.la findfs_SOURCES = misc-utils/findfs.c findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +endif +if BUILD_WIPEFS sbin_PROGRAMS += wipefs dist_man_MANS += misc-utils/wipefs.8 wipefs_SOURCES = misc-utils/wipefs.c wipefs_LDADD = $(LDADD) libblkid.la libcommon.la wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) - -if HAVE_STATIC_BLKID -sbin_PROGRAMS += blkid.static -blkid_static_SOURCES = $(blkid_SOURCES) -blkid_static_LDFLAGS = -all-static -blkid_static_LDADD = $(LDADD) libblkid.la -blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) endif -endif # BUILD_LIBBLKID - -if BUILD_LIBMOUNT +if BUILD_FINDMNT bin_PROGRAMS += findmnt dist_man_MANS += misc-utils/findmnt.8 findmnt_LDADD = $(LDADD) libmount.la libcommon.la libsmartcols.la @@ -142,7 +146,7 @@ findmnt_SOURCES = misc-utils/findmnt.c if HAVE_UDEV findmnt_LDADD += -ludev endif -endif # BUILD_LIBMOUNT +endif # BUILD_FINDMNT if BUILD_KILL |