ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build-sys: disable chkdupexe by default, mark as deprecated 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-04-04 12:18:32 +02:00
parent 9554f7abd8
commit 4581bd9c67
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/deprecated.txt
View File

@ -2,6 +2,12 @@ The following is a list of commands or features that are deprecated. All
deprecated utils are in maintenance mode and we keep them in source tree for deprecated utils are in maintenance mode and we keep them in source tree for
backward compatibility only. backward compatibility only.
What: chkdupexe
Why: unnecessary, in Perl, not used in distributions, possible to replace
by a simple shell script.
--------------------------
What: 'udev' and 'list' blkid(8) output formats What: 'udev' and 'list' blkid(8) output formats
Why: udevd links libblkid directly; the 'list' is unnecessary, use lsblk(8) Why: udevd links libblkid directly; the 'list' is unnecessary, use lsblk(8)

17
configure.ac
View File

@ -114,9 +114,6 @@ UL_SET_ARCH(M68K, m68*)
UL_SET_ARCH(MIPS, mips*) UL_SET_ARCH(MIPS, mips*)
UL_SET_ARCH(HPPA, hppa*) UL_SET_ARCH(HPPA, hppa*)
dnl script chkdupexe requires perl
AC_PATH_PROG(PERL, perl)
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT_VERSION([0.14.1])
@ -1082,6 +1079,19 @@ UL_BUILD_INIT([write])
AM_CONDITIONAL(BUILD_WRITE, test "x$build_write" = xyes) AM_CONDITIONAL(BUILD_WRITE, test "x$build_write" = xyes)
AC_ARG_ENABLE([chkdupexe],
AS_HELP_STRING([--enable-chkdupexe], [build deprecated chkdupexe]),
[], enable_chkdupexe=no
)
UL_BUILD_INIT([chkdupexe])
AM_CONDITIONAL(BUILD_CHKDUPEXE, test "x$build_chkdupexe" = xyes)
if test "x$build_chkdupexe" = xyes; then
AC_PATH_PROG(PERL, perl)
AC_CONFIG_FILES([misc-utils/chkdupexe:misc-utils/chkdupexe.pl])
fi
AC_ARG_ENABLE([chsh-only-listed], AC_ARG_ENABLE([chsh-only-listed],
AS_HELP_STRING([--disable-chsh-only-listed], [chsh: allow shells not in /etc/shells]), AS_HELP_STRING([--disable-chsh-only-listed], [chsh: allow shells not in /etc/shells]),
[], enable_chsh_only_listed=yes [], enable_chsh_only_listed=yes
@ -1224,7 +1234,6 @@ libuuid/uuid.pc
login-utils/Makefile login-utils/Makefile
man/ru/Makefile man/ru/Makefile
misc-utils/Makefile misc-utils/Makefile
misc-utils/chkdupexe:misc-utils/chkdupexe.pl
mount/Makefile mount/Makefile
partx/Makefile partx/Makefile
po/Makefile.in po/Makefile.in

12
misc-utils/Makefile.am
View File

@ -17,13 +17,11 @@ usrbin_exec_PROGRAMS = \
logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c
mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c
usrbin_exec_SCRIPTS = chkdupexe usrbin_exec_SCRIPTS =
CLEANFILES =
CLEANFILES = chkdupexe
dist_man_MANS = \ dist_man_MANS = \
cal.1 \ cal.1 \
chkdupexe.1 \
logger.1 \ logger.1 \
look.1 \ look.1 \
mcookie.1 \ mcookie.1 \
@ -32,6 +30,12 @@ dist_man_MANS = \
namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c
if BUILD_CHKDUPEXE
usrbin_exec_SCRIPTS += chkdupexe
CLEANFILES += chkdupexe
dist_man_MANS += chkdupexe.1
endif
if BUILD_DDATE if BUILD_DDATE
usrbin_exec_PROGRAMS += ddate usrbin_exec_PROGRAMS += ddate
dist_man_MANS += ddate.1 dist_man_MANS += ddate.1