build-sys: add --enable-vipw

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index c586481fba1fd628171685e3f5bec44dad6d6807..b06c5bb1b84777a0c4f12f92fbf22e6a476c00d8 100644 (file)
--- 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 624ddc39330e2e0a23caa089900605f5361e3769..baa79490d0d1835c0e1a7b81405fd1e0f0c815b9 100644 (file)
--- 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