diff options
| author | Karel Zak <kzak@redhat.com> | 2012-04-04 12:18:32 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2012-04-04 12:18:32 +0200 |
| commit | 4581bd9c6797ea3b753c1d2019a37a84975d749a (patch) | |
| tree | 29b80350ee9d64f924ed9340ce3d6741bf817177 | |
| parent | 9554f7abd889cf65918182666ab40e05f73da791 (diff) | |
| download | util-linux-4581bd9c6797ea3b753c1d2019a37a84975d749a.tar.gz | |
build-sys: disable chkdupexe by default, mark as deprecated
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | Documentation/deprecated.txt | 6 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | misc-utils/Makefile.am | 12 |
3 files changed, 27 insertions, 8 deletions
diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt index 0d41feb904..842d642ee7 100644 --- a/Documentation/deprecated.txt +++ b/Documentation/deprecated.txt @@ -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 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 Why: udevd links libblkid directly; the 'list' is unnecessary, use lsblk(8) diff --git a/configure.ac b/configure.ac index 00d15b7f85..3085965def 100644 --- a/configure.ac +++ b/configure.ac @@ -114,9 +114,6 @@ UL_SET_ARCH(M68K, m68*) UL_SET_ARCH(MIPS, mips*) UL_SET_ARCH(HPPA, hppa*) -dnl script chkdupexe requires perl -AC_PATH_PROG(PERL, perl) - AC_SYS_LARGEFILE AM_GNU_GETTEXT_VERSION([0.14.1]) @@ -1082,6 +1079,19 @@ UL_BUILD_INIT([write]) 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], AS_HELP_STRING([--disable-chsh-only-listed], [chsh: allow shells not in /etc/shells]), [], enable_chsh_only_listed=yes @@ -1224,7 +1234,6 @@ libuuid/uuid.pc login-utils/Makefile man/ru/Makefile misc-utils/Makefile -misc-utils/chkdupexe:misc-utils/chkdupexe.pl mount/Makefile partx/Makefile po/Makefile.in diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 6e11582fc8..80975cbf6b 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -17,13 +17,11 @@ usrbin_exec_PROGRAMS = \ logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c -usrbin_exec_SCRIPTS = chkdupexe - -CLEANFILES = chkdupexe +usrbin_exec_SCRIPTS = +CLEANFILES = dist_man_MANS = \ cal.1 \ - chkdupexe.1 \ logger.1 \ look.1 \ mcookie.1 \ @@ -32,6 +30,12 @@ dist_man_MANS = \ 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 usrbin_exec_PROGRAMS += ddate dist_man_MANS += ddate.1 |