From 1b15cbd1499d6f37b94f51345972ae88a1a6b956 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 21 May 2014 13:09:17 +0200 Subject: [PATCH] build-sys: add BUILD_{UUIDGEN,CAL,LOGGER,LOOP,MCOOKIE,NAMEI,WHEREIS} Signed-off-by: Karel Zak --- configure.ac | 23 +++++++++++++++++++++++ misc-utils/Makemodule.am | 18 +++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8d537de32f..14e20d075d 100644 --- a/configure.ac +++ b/configure.ac @@ -883,6 +883,11 @@ AS_IF([test "x$build_uuidd" = xyes], [ AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes]) +UL_BUILD_INIT([uuidgen], [check]) +UL_REQUIRES_BUILD([uuidgen], [libuuid]) +AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes]) + + AC_ARG_ENABLE([mountpoint], AS_HELP_STRING([--disable-mountpoint], [do not build mountpoint]), [], [enable_mountpoint=check] @@ -1096,6 +1101,24 @@ AM_CONDITIONAL([BUILD_SWAPLABEL], [test "x$build_swaplabel" = xyes]) UL_BUILD_INIT([mkswap], [yes]) AM_CONDITIONAL([BUILD_MKSWAP], [test "x$build_mkswap" = xyes]) +UL_BUILD_INIT([cal], [yes]) +AM_CONDITIONAL([BUILD_CAL], [test "x$build_cal" = xyes]) + +UL_BUILD_INIT([logger], [yes]) +AM_CONDITIONAL([BUILD_LOGGER], [test "x$build_logger" = xyes]) + +UL_BUILD_INIT([loop], [yes]) +AM_CONDITIONAL([BUILD_LOOK], [test "x$build_look" = xyes]) + +UL_BUILD_INIT([mcookie], [yes]) +AM_CONDITIONAL([BUILD_MCOOKIE], [test "x$build_mcookie" = xyes]) + +UL_BUILD_INIT([namei], [yes]) +AM_CONDITIONAL([BUILD_NAMEI], [test "x$build_namei" = xyes]) + +UL_BUILD_INIT([whereis], [yes]) +AM_CONDITIONAL([BUILD_WHEREIS], [test "x$build_whereis" = xyes]) + UL_BUILD_INIT([blockdev], [check]) UL_REQUIRES_LINUX([blockdev]) diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 1ff2e540c9..e1bce1fdeb 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -1,4 +1,4 @@ - +if BUILD_CAL usrbin_exec_PROGRAMS += cal dist_man_MANS += misc-utils/cal.1 cal_SOURCES = \ @@ -15,8 +15,10 @@ cal_LDADD = $(LDADD) libcommon.la $(NCURSES_LIBS) $(TINFO_LIBS) if HAVE_TERMCAP cal_LDADD += -ltermcap endif +endif # BUILD_CAL +if BUILD_LOGGER usrbin_exec_PROGRAMS += logger dist_man_MANS += misc-utils/logger.1 logger_SOURCES = misc-utils/logger.c lib/strutils.c @@ -24,24 +26,34 @@ if HAVE_SYSTEMD logger_LDADD = $(SYSTEMD_LIBS) $(SYSTEMD_JOURNAL_LIBS) logger_CFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) endif +endif # BUILD_LOGGER + +if BUILD_LOOK usrbin_exec_PROGRAMS += look dist_man_MANS += misc-utils/look.1 look_SOURCES = misc-utils/look.c +endif +if BUILD_MCOOKIE usrbin_exec_PROGRAMS += mcookie dist_man_MANS += misc-utils/mcookie.1 mcookie_SOURCES = misc-utils/mcookie.c lib/md5.c mcookie_LDADD = $(LDADD) libcommon.la +endif +if BUILD_NAMEI usrbin_exec_PROGRAMS += namei dist_man_MANS += misc-utils/namei.1 namei_SOURCES = misc-utils/namei.c lib/strutils.c +endif +if BUILD_WHEREIS usrbin_exec_PROGRAMS += whereis dist_man_MANS += misc-utils/whereis.1 whereis_SOURCES = misc-utils/whereis.c whereis_LDADD = $(LDADD) libcommon.la +endif if BUILD_LSLOCKS usrbin_exec_PROGRAMS += lslocks @@ -60,9 +72,9 @@ lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir) -I$( if HAVE_UDEV lsblk_LDADD += -ludev endif -endif +endif # BUILD_LSBLK -if BUILD_LIBUUID +if BUILD_UUIDGEN usrbin_exec_PROGRAMS += uuidgen dist_man_MANS += misc-utils/uuidgen.1 uuidgen_SOURCES = misc-utils/uuidgen.c -- 2.39.5