From c8b820d04f6890a674712458cfafeb667e5a3625 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Tue, 4 Oct 2011 20:16:46 +0200 Subject: [PATCH] build-sys: add --disable-kill build option The kill from procps-ng is not always wanted. For example RedHat seems to prefer kill from util-linux package. Reported-by: Jaromir Capik Signed-off-by: Sami Kerola --- Makefile.am | 9 +++++---- configure.ac | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 890f71bc..82ac8e6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,6 @@ AM_LDFLAGS = ./proc/libproc-ng.la sbin_PROGRAMS = \ sysctl -bin_PROGRAMS = \ - kill - usrbin_exec_PROGRAMS = \ free \ pgrep \ @@ -27,7 +24,6 @@ usrbin_exec_PROGRAMS = \ dist_man_MANS = \ free.1 \ - kill.1 \ pgrep.1 \ pkill.1 \ pmap.1 \ @@ -41,6 +37,11 @@ dist_man_MANS = \ vmstat.8 \ w.1 +if BUILD_KILL +bin_PROGRAMS = kill +dist_man_MANS += kill.1 +endif + if HAVE_NCURSES usrbin_exec_PROGRAMS += \ slabtop \ diff --git a/configure.ac b/configure.ac index aa124050..bcc0264c 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,12 @@ if test "x$with_ncurses" != xno; then fi AC_SUBST([NCURSES_LIBS]) +AC_ARG_ENABLE([kill], + AS_HELP_STRING([--disable-kill], [do not build kill]), + [], enable_kill=yes +) +AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes) + AC_ARG_ENABLE([oomem], AS_HELP_STRING([--enable-oomem], [add out-of-memory fields to the library and top]), [], enable_oomem=no