1*4882a593SmuzhiyunFrom 1524a625e693b956ce0b5091c9f89f24fb7e8614 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: "Issam E. Maghni" <issam.e.maghni@mailbox.org> 3*4882a593SmuzhiyunDate: Fri, 23 Apr 2021 15:58:36 -0400 4*4882a593SmuzhiyunSubject: [PATCH] configure: Add --disable-w 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun[Retrieved (and backported) from: 7*4882a593Smuzhiyunhttps://gitlab.com/procps-ng/procps/-/commit/1524a625e693b956ce0b5091c9f89f24fb7e8614] 8*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun Makefile.am | 21 +++++++++++++++------ 11*4882a593Smuzhiyun configure.ac | 6 ++++++ 12*4882a593Smuzhiyun 2 files changed, 21 insertions(+), 6 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 15*4882a593Smuzhiyunindex de15e137..d2356872 100644 16*4882a593Smuzhiyun--- a/Makefile.am 17*4882a593Smuzhiyun+++ b/Makefile.am 18*4882a593Smuzhiyun@@ -47,8 +47,7 @@ bin_PROGRAMS = \ 19*4882a593Smuzhiyun pwdx \ 20*4882a593Smuzhiyun tload \ 21*4882a593Smuzhiyun uptime \ 22*4882a593Smuzhiyun- vmstat \ 23*4882a593Smuzhiyun- w 24*4882a593Smuzhiyun+ vmstat 25*4882a593Smuzhiyun if BUILD_PWAIT 26*4882a593Smuzhiyun bin_PROGRAMS += pwait 27*4882a593Smuzhiyun endif 28*4882a593Smuzhiyun@@ -60,8 +59,7 @@ usrbin_exec_PROGRAMS += \ 29*4882a593Smuzhiyun pkill \ 30*4882a593Smuzhiyun pmap \ 31*4882a593Smuzhiyun uptime \ 32*4882a593Smuzhiyun- vmstat \ 33*4882a593Smuzhiyun- w 34*4882a593Smuzhiyun+ vmstat 35*4882a593Smuzhiyun endif 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun lib_LTLIBRARIES = \ 38*4882a593Smuzhiyun@@ -74,7 +72,6 @@ dist_man_MANS = \ 39*4882a593Smuzhiyun pmap.1 \ 40*4882a593Smuzhiyun uptime.1 \ 41*4882a593Smuzhiyun vmstat.8 \ 42*4882a593Smuzhiyun- w.1 \ 43*4882a593Smuzhiyun ps/procps.1 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun if !CYGWIN 46*4882a593Smuzhiyun@@ -137,6 +134,19 @@ else 47*4882a593Smuzhiyun EXTRA_DIST += kill.1 48*4882a593Smuzhiyun endif 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun+if BUILD_W 51*4882a593Smuzhiyun+if CYGWIN 52*4882a593Smuzhiyun+usrbin_exec_PROGRAMS += w 53*4882a593Smuzhiyun+else 54*4882a593Smuzhiyun+bin_PROGRAMS += w 55*4882a593Smuzhiyun+endif 56*4882a593Smuzhiyun+ 57*4882a593Smuzhiyun+dist_man_MANS += w.1 58*4882a593Smuzhiyun+w_SOURCES = w.c lib/fileutils.c 59*4882a593Smuzhiyun+else 60*4882a593Smuzhiyun+ EXTRA_DIST += w.1 61*4882a593Smuzhiyun+endif 62*4882a593Smuzhiyun+ 63*4882a593Smuzhiyun if WITH_NCURSES 64*4882a593Smuzhiyun if !CYGWIN 65*4882a593Smuzhiyun bin_PROGRAMS += \ 66*4882a593Smuzhiyun@@ -213,7 +223,6 @@ endif 67*4882a593Smuzhiyun tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c 68*4882a593Smuzhiyun uptime_SOURCES = uptime.c lib/fileutils.c 69*4882a593Smuzhiyun vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c 70*4882a593Smuzhiyun-w_SOURCES = w.c lib/fileutils.c 71*4882a593Smuzhiyun 72*4882a593Smuzhiyun # proc/libprocps.la 73*4882a593Smuzhiyun 74*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 75*4882a593Smuzhiyunindex 750c0fbb..3e83fb88 100644 76*4882a593Smuzhiyun--- a/configure.ac 77*4882a593Smuzhiyun+++ b/configure.ac 78*4882a593Smuzhiyun@@ -234,6 +234,12 @@ AC_ARG_ENABLE([kill], 79*4882a593Smuzhiyun [], [enable_kill=yes] 80*4882a593Smuzhiyun ) 81*4882a593Smuzhiyun AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes) 82*4882a593Smuzhiyun+AC_ARG_ENABLE([w], 83*4882a593Smuzhiyun+ AS_HELP_STRING([--disable-w], [do not build w]), 84*4882a593Smuzhiyun+ [], [enable_w=yes] 85*4882a593Smuzhiyun+) 86*4882a593Smuzhiyun+AM_CONDITIONAL(BUILD_W, test "x$enable_w" = xyes) 87*4882a593Smuzhiyun+ 88*4882a593Smuzhiyun AM_CONDITIONAL(LINUX, test "x$host_os" = xlinux-gnu) 89*4882a593Smuzhiyun AM_CONDITIONAL(CYGWIN, test "x$host_os" = xcygwin) 90*4882a593Smuzhiyun 91*4882a593Smuzhiyun-- 92*4882a593SmuzhiyunGitLab 93*4882a593Smuzhiyun 94