From cc76731e7da26a48c306336a1d142d44186c2a26 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 29 May 2012 15:20:44 +0200 Subject: [PATCH] build-sys: add --enable-vipw Signed-off-by: Karel Zak --- configure.ac | 13 ++++++------- login-utils/Makefile.am | 15 ++++----------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index c586481fba..b06c5bb1b8 100644 --- a/configure.ac +++ b/configure.ac @@ -635,7 +635,7 @@ if test "x$enable_most_builds" = xyes; then enable_line=yes enable_mesg=yes enable_reset=yes - enable_login_utils=yes + enable_vipw=yes enable_chfn_chsh=yes enable_newgrp=yes enable_write=yes @@ -1020,13 +1020,12 @@ UL_BUILD_INIT([reset]) AM_CONDITIONAL(BUILD_RESET, test "x$build_reset" = xyes) -AC_ARG_ENABLE([login-utils], - AS_HELP_STRING([--enable-login-utils], [build vipw]), - [], enable_login_utils=no +AC_ARG_ENABLE([vipw], + AS_HELP_STRING([--enable-vipw], [build vipw]), + [], enable_vipw=no ) -UL_BUILD_INIT([login_utils]) -UL_REQUIRES_HAVE([login_utils], [security_pam_misc_h], [PAM header file]) -AM_CONDITIONAL(BUILD_LOGIN_UTILS, test "x$build_login_utils" = xyes) +UL_BUILD_INIT([vipw]) +AM_CONDITIONAL(BUILD_VIPW, test "x$build_vipw" = xyes) AC_ARG_ENABLE([newgrp], diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am index 624ddc3933..baa79490d0 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -100,28 +100,21 @@ endif endif # BUILD_NEWGRP -if BUILD_LOGIN_UTILS -usrsbin_exec_PROGRAMS += \ - vipw -dist_man_MANS += \ - vigr.8 \ - vipw.8 - +if BUILD_VIPW +usrsbin_exec_PROGRAMS += vipw +dist_man_MANS += vigr.8 vipw.8 vipw_SOURCES = \ vipw.c \ setpwnam.h \ $(top_srcdir)/lib/fileutils.c - vipw_LDADD = - if HAVE_SELINUX vipw_LDADD += -lselinux endif - install-exec-hook:: cd $(DESTDIR)$(usrsbin_execdir) && ln -sf vipw vigr +endif # BUILD_VIPW -endif noinst_PROGRAMS = test_islocal test_logindefs test_islocal_SOURCES = islocal.c -- 2.47.2