From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 16 Dec 2012 10:43:56 +0000 (+0000)
Subject: tunelp: deprecation: remove command from default build
X-Git-Tag: v2.23-rc1~405
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1342ffcbeb0dbad6ec12026f1dad27a26d27248f;p=thirdparty%2Futil-linux.git

tunelp: deprecation: remove command from default build

It is difficult to think think tunelp command being in use a lot.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt
index 7d2dac1136..666ed63de6 100644
--- a/Documentation/deprecated.txt
+++ b/Documentation/deprecated.txt
@@ -41,6 +41,10 @@ What:   losetup output format without --list
 
 --------------------------
 
+What:	tunelp
+Why:	parallel port printers are probably almost extinct devices
+
+--------------------------
 
 What:	elvtune
 Why:	useless for kernel >= 2.6.9
diff --git a/configure.ac b/configure.ac
index c0783056c6..9c08fc0e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -671,6 +671,7 @@ AC_ARG_ENABLE([most-builds],
 if test "x$enable_most_builds" = xyes; then
   enable_arch=check
   enable_elvtune=check
+  enable_tunelp=yes
   enable_last=yes
   enable_line=yes
   enable_mesg=yes
@@ -989,6 +990,15 @@ UL_REQUIRES_LINUX([elvtune])
 AM_CONDITIONAL(BUILD_ELVTUNE, test "x$build_elvtune" = xyes)
 
 
+AC_ARG_ENABLE([tunelp],
+  AS_HELP_STRING([--enable-tunelp], [build tunelp]),
+  [], enable_tunelp=no
+)
+UL_BUILD_INIT([tunelp])
+UL_REQUIRES_LINUX([tunelp])
+AM_CONDITIONAL(BUILD_TUNELP, test "x$build_tunelp" = xyes)
+
+
 AC_ARG_ENABLE([kill],
   AS_HELP_STRING([--disable-kill], [do not build kill]),
   [], enable_kill=check
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index c7b1eb3614..33112fb68e 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -73,9 +73,11 @@ dist_man_MANS += sys-utils/ldattach.8
 ldattach_SOURCES = sys-utils/ldattach.c
 ldattach_LDADD = $(LDADD) libcommon.la
 
+if BUILD_TUNELP
 usrsbin_exec_PROGRAMS += tunelp
 dist_man_MANS += sys-utils/tunelp.8
 tunelp_SOURCES = sys-utils/tunelp.c sys-utils/lp.h
+endif
 
 usrsbin_exec_PROGRAMS += rtcwake
 dist_man_MANS += sys-utils/rtcwake.8