[Initng-svn] r2979 - in initng: . plugins

[svn at initng.thinktux.net]

Author: jimmy
Date: Fri Feb 10 11:50:34 2006
New Revision: 2979

Modified:
   initng/configure.in
   initng/plugins/Makefile.am
Log:
Cleanup to buildsystem.


Modified: initng/configure.in
==============================================================================
--- initng/configure.in	(original)
+++ initng/configure.in	Fri Feb 10 11:50:34 2006
@@ -269,10 +269,6 @@
     AC_HELP_STRING([--with-pause],[Build with pause plugin @<:@default=yes@:>@]),
     [with_pause=$withval], [with_pause=yes])
 
-AC_ARG_WITH(pidfile, 
-    AC_HELP_STRING([--with-pidfile],[Build with pidfile plugin @<:@default=yes@:>@]),
-    [with_pidfile=$withval], [with_pidfile=yes])
-
 AC_ARG_WITH(pidfile-test, 
     AC_HELP_STRING([--with-pidfile-test],[Build pidfile plugin test program @<:@default=no@:>@]),
     [with_pidfile_test=$withval], [with_pidfile_test=no])
@@ -285,10 +281,6 @@
     AC_HELP_STRING([--with-renice],[Build with renice plugin @<:@default=yes@:>@]),
     [with_renice=$withval], [with_renice=yes])
 
-AC_ARG_WITH(respawn, 
-    AC_HELP_STRING([--with-respawn],[Build with respawn plugin @<:@default=yes@:>@]),
-    [with_respawn=$withval], [with_respawn=yes])
-
 AC_ARG_WITH(rlparser, 
     AC_HELP_STRING([--with-rlparser],[Build with rlparser plugin @<:@default=yes@:>@]),
     [with_rlparser=$withval], [with_rlparser=yes])
@@ -364,11 +356,9 @@
 AM_CONDITIONAL(BUILD_NGC2, test "$with_ngc2" = "yes")
 AM_CONDITIONAL(BUILD_NGCS, test "$with_ngcs" = "yes")
 AM_CONDITIONAL(BUILD_PAUSE, test "$with_pause" = "yes")
-AM_CONDITIONAL(BUILD_PIDFILE, test "$with_pidfile" = "yes")
 AM_CONDITIONAL(BUILD_PIDFILETEST, test "$with_pidfile_test" = "yes")
 AM_CONDITIONAL(BUILD_RELOAD, test "$with_reload" = "yes")
 AM_CONDITIONAL(BUILD_RENICE, test "$with_renice" = "yes")
-AM_CONDITIONAL(BUILD_RESPAWN, test "$with_respawn" = "yes")
 AM_CONDITIONAL(BUILD_RLPARSER, test "$with_rlparser" = "yes")
 AM_CONDITIONAL(BUILD_SIMPLE_LAUNCHER, test "$with_simple_launcher" = "yes")
 AM_CONDITIONAL(BUILD_SPLASH, test "$with_splash" = "yes")
@@ -391,6 +381,8 @@
 	  plugins/ngc2/Makefile \
 	  plugins/ngcs/Makefile \
 	  plugins/critical/Makefile \
+	  plugins/daemon/Makefile \
+	  plugins/daemon/test/Makefile \
 	  plugins/daemon_clean/Makefile \
 	  plugins/suid/Makefile \
 	  plugins/stcmd/Makefile \
@@ -402,8 +394,6 @@
 	  plugins/simple_launcher/Makefile \
 	  plugins/renice/Makefile \
 	  plugins/stdout/Makefile \
-	  plugins/pidfile/Makefile \
-	  plugins/pidfile/test/Makefile \
 	  plugins/initctl/Makefile \
 	  plugins/iparser/Makefile \
 	  plugins/ezxmlparser/Makefile \
@@ -413,13 +403,11 @@
 	  plugins/find/Makefile \
 	  plugins/interactive/Makefile \
 	  plugins/syncron/Makefile \
-	  plugins/daemon/Makefile \
 	  plugins/dllaunch/Makefile \
 	  plugins/reload/Makefile \
 	  plugins/history/Makefile \
 	  plugins/syslog/Makefile \
 	  plugins/service/Makefile \
-	  plugins/respawn/Makefile \
 	  plugins/unneeded/Makefile \
 	  plugins/last/Makefile \
 	  plugins/limit/Makefile \
@@ -460,9 +448,9 @@
 echo Build critical plugin.................. : $with_critical
 echo Build daemon_clean plugin.............. : $with_daemon_clean
 echo Build dllaunch plugin.................. : $with_dllaunch
-echo Build dparser plugin................... : $with_dparser
+#echo Build dparser plugin................... : $with_dparser
 echo Build envparser plugin................. : $with_envparser
-echo Build ezxmlparser plugin............... : $with_ezxmlparser
+#echo Build ezxmlparser plugin............... : $with_ezxmlparser
 echo Build find plugin...................... : $with_find
 echo Build fstat plugin..................... : $with_fstat
 echo Build history plugin................... : $with_history
@@ -477,10 +465,8 @@
 echo Build ngc2 plugin...................... : $with_ngc2
 echo Build ngcs plugin...................... : $with_ngcs
 echo Build pause plugin..................... : $with_pause
-echo Build pidfile plugin................... : $with_pidfile
 echo Build reload plugin.................... : $with_reload
 echo Build renice plugin.................... : $with_renice
-echo Build respawn plugin................... : $with_respawn
 echo Build rlparser plugin.................. : $with_rlparser
 echo Build simple_launcher plugin........... : $with_simple_launcher
 echo Build splash plugin.................... : $with_splash

Modified: initng/plugins/Makefile.am
==============================================================================
--- initng/plugins/Makefile.am	(original)
+++ initng/plugins/Makefile.am	Fri Feb 10 11:50:34 2006
@@ -1,5 +1,5 @@
 
-SUBDIRS=service
+SUBDIRS=service daemon
 
 if BUILD_ALSO
     SUBDIRS+=also