emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

build-sys: add --disable-kill build option

Browse Source 
The kill from procps-ng is not always wanted. For example RedHat
seems to prefer kill from util-linux package.

Reported-by: Jaromir Capik <jcapik@redhat.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-10-04 20:16:46 +02:00
parent b9a408372e
commit c8b820d04f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -9,9 +9,6 @@ AM_LDFLAGS = ./proc/libproc-ng.la
sbin_PROGRAMS = \ sbin_PROGRAMS = \
sysctl sysctl
bin_PROGRAMS = \
kill
usrbin_exec_PROGRAMS = \ usrbin_exec_PROGRAMS = \
free \ free \
pgrep \ pgrep \
@ -27,7 +24,6 @@ usrbin_exec_PROGRAMS = \
dist_man_MANS = \ dist_man_MANS = \
free.1 \ free.1 \
kill.1 \
pgrep.1 \ pgrep.1 \
pkill.1 \ pkill.1 \
pmap.1 \ pmap.1 \
@ -41,6 +37,11 @@ dist_man_MANS = \
vmstat.8 \ vmstat.8 \
w.1 w.1
if BUILD_KILL
bin_PROGRAMS = kill
dist_man_MANS += kill.1
endif
if HAVE_NCURSES if HAVE_NCURSES
usrbin_exec_PROGRAMS += \ usrbin_exec_PROGRAMS += \
slabtop \ slabtop \

6
configure.ac
View File

@ -142,6 +142,12 @@ if test "x$with_ncurses" != xno; then
fi fi
AC_SUBST([NCURSES_LIBS]) 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], AC_ARG_ENABLE([oomem],
AS_HELP_STRING([--enable-oomem], [add out-of-memory fields to the library and top]), AS_HELP_STRING([--enable-oomem], [add out-of-memory fields to the library and top]),
[], enable_oomem=no [], enable_oomem=no