]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: disable chkdupexe by default, mark as deprecated
authorKarel Zak <kzak@redhat.com>
Wed, 4 Apr 2012 10:18:32 +0000 (12:18 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 4 Apr 2012 10:18:32 +0000 (12:18 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
Documentation/deprecated.txt
configure.ac
misc-utils/Makefile.am

index 0d41feb904b59be4f86aaa7a47533ee5c7d08f0e..842d642ee701c00fd4f2179b271d5dcc30f45649 100644 (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
 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)
 
index 00d15b7f859869f4c742ddd0463bade5bba3c338..3085965def33901c6e62197f97129c347c4144b7 100644 (file)
@@ -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
index 6e11582fc8428ba4d64e2c86c4feb85d038b854d..80975cbf6bbae0aa3f5358e19cdea54fdbe77b79 100644 (file)
@@ -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