From 18565392cfecb5be6f3261ae0f82827c9ecfa08b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 9 Oct 2016 16:17:50 +0200 Subject: configure.ac: add option to disable building programs In some cases (e.g. trimmed-down chroot or containers), libudev is the only thing needed, with udevd and assorted programs totally useless (e.g. because /dev is bind-mounted from the real one and managed out-side the chroot/container). Add an option to ./configure to enable/disable building the programs; this option defaults to "enable", so that it is backward compatible with existing build procedure, and because it by default makes sense to have udevd et al. Signed-off-by: "Yann E. MORIN" Signed-off-by: Anthony G. Basile --- Makefile.am | 6 +++++- configure.ac | 6 ++++++ src/Makefile.am | 12 +++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0c6429df60..0d463798ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,13 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ - src \ + src + +if ENABLE_PROGRAMS +SUBDIRS += \ rules \ test +endif if ENABLE_MANPAGES SUBDIRS += \ diff --git a/configure.ac b/configure.ac index 52865a8157..aec2aaaa45 100644 --- a/configure.ac +++ b/configure.ac @@ -196,6 +196,12 @@ AC_SUBST([rootrundir],[${with_rootrundir}]) GOBJECT_INTROSPECTION_CHECK([1.31.1]) AM_CONDITIONAL([HAVE_INTROSPECTION], [test "$enable_introspection" = "yes"]) +# ------------------------------------------------------------------------------ +AC_ARG_ENABLE([programs], + AS_HELP_STRING([--disable-programs], [disable programs (udevd, udevadm and helpers)]), + [], [enable_programs="yes"]) +AM_CONDITIONAL([ENABLE_PROGRAMS], [test "x$enable_programs" = "xyes"]) + # ------------------------------------------------------------------------------ have_blkid=no AC_ARG_ENABLE(blkid, AS_HELP_STRING([--disable-blkid], [Disable optional blkid support])) diff --git a/src/Makefile.am b/src/Makefile.am index fc052a83e0..d8a75f88c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,11 +2,13 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ shared \ - libudev \ + libudev + +PROGRAMS_SUBDIRS = \ udev # Helper programs -SUBDIRS += \ +PROGRAMS_SUBDIRS += \ ata_id \ cdrom_id \ collect \ @@ -14,6 +16,10 @@ SUBDIRS += \ v4l_id if ENABLE_MTD_PROBE -SUBDIRS += \ +PROGRAMS_SUBDIRS += \ mtd_probe endif + +if ENABLE_PROGRAMS +SUBDIRS += $(PROGRAMS_SUBDIRS) +endif -- cgit v1.2.3