From: Martin Mares <mj@ucw.cz>
Date: Wed, 18 Jul 2012 10:18:44 +0000 (+0200)
Subject: Daemon: The old daemon-helper has been declared obsolete
X-Git-Tag: v5.99~141
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=0c8e90d599f1f0521f432759a526aade0feb7d1d;p=libucw.git

Daemon: The old daemon-helper has been declared obsolete
---

diff --git a/debug/default.cfg b/debug/default.cfg
index f6593577..15bbeca7 100644
--- a/debug/default.cfg
+++ b/debug/default.cfg
@@ -7,6 +7,7 @@ UnSet("CONFIG_SHARED");
 Set("CONFIG_DEBUG");
 Set("CONFIG_UCW_DEBUG_TOOLS");
 Set("CONFIG_EXACT_CPU");
+Set("CONFIG_UCW_OBSOLETE_DAEMON_HELPER");
 
 Set("CONFIG_IMAGES");
 Set("CONFIG_CHARSET");
diff --git a/ucw/default.cfg b/ucw/default.cfg
index a85b7768..09d3658f 100644
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -43,6 +43,9 @@ Set("CONFIG_UCW_SHELL_UTILS" => 1);
 # Include utilities
 Set("CONFIG_UCW_UTILS" => 1);
 
+# Include obsolete daemon-helper utility
+Set("CONFIG_UCW_OBSOLETE_DAEMON_HELPER" => 1);
+
 # Default configuration file
 UnSet("CONFIG_UCW_DEFAULT_CONFIG");
 
diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 20de4727..b0068726 100644
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,9 +1,13 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
-UCW_UTILS=$(addprefix $(o)/ucw/utils/,basecode daemon-helper daemon-control rotate-log urltool)
+UCW_UTILS=$(addprefix $(o)/ucw/utils/,basecode daemon-control rotate-log urltool)
 PROGS+=$(UCW_UTILS)
 DIRS+=ucw/utils
 
+ifdef CONFIG_UCW_OBSOLETE_DAEMON_HELPER
+PROGS+=$(o)/ucw/utils/daemon-helper
+endif
+
 $(o)/ucw/utils/basecode: $(o)/ucw/utils/basecode.o $(LIBUCW)
 $(o)/ucw/utils/daemon-helper: $(o)/ucw/utils/daemon-helper.o $(LIBUCW)
 $(o)/ucw/utils/daemon-control: $(o)/ucw/utils/daemon-control.o $(LIBUCW)
diff --git a/ucw/utils/daemon-helper.c b/ucw/utils/daemon-helper.c
index 9996e81f..2e7e682c 100644
--- a/ucw/utils/daemon-helper.c
+++ b/ucw/utils/daemon-helper.c
@@ -11,6 +11,9 @@
  *	Return codes:
  *	101	already running
  *	102	not running
+ *
+ *	NOTE: This utility is obsolete and has been replaced by daemon-control.
+ *	You need to enable CONFIG_UCW_OBSOLETE_DAEMON_HELPER to compile it.
  */
 
 #include <ucw/lib.h>