[Initng-svn] r1925 - in initng: . plugins plugins/splashy

[svn at initng.thinktux.net]

Author: trigger
Date: Fri Nov  4 15:39:25 2005
New Revision: 1925

Removed:
   initng/plugins/splashy/
Modified:
   initng/configure.in
   initng/plugins/Makefile.am
Log:
Remove the splashy plugin - it has been merged with the splash plugin

Modified: initng/configure.in
==============================================================================
--- initng/configure.in	(original)
+++ initng/configure.in	Fri Nov  4 15:39:25 2005
@@ -247,13 +247,9 @@
     [with_simple_launcher=$withval], [with_simple_launcher=yes])
 
 AC_ARG_WITH(splash, 
-    AC_HELP_STRING([--with-splash],[Build with splashy plugin]),
+    AC_HELP_STRING([--with-splash],[Build with splash plugin]),
     [with_splash=$withval], [with_splash=no])
 
-AC_ARG_WITH(splashy, 
-    AC_HELP_STRING([--with-splashy],[Build with splashy plugin]),
-    [with_splashy=$withval], [with_splashy=no])
-
 AC_ARG_WITH(stcmd, 
     AC_HELP_STRING([--with-stcmd],[Build with stcmd plugin]),
     [with_stcmd=$withval], [with_stcmd=yes])
@@ -309,7 +305,6 @@
 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")
-AM_CONDITIONAL(BUILD_SPLASHY, test "$with_splashy" = "yes")
 AM_CONDITIONAL(BUILD_STDCMD, test "$with_stdcmd" = "yes")
 AM_CONDITIONAL(BUILD_STDOUT, test "$with_stdout" = "yes")
 AM_CONDITIONAL(BUILD_SUID, test "$with_suid" = "yes")
@@ -321,7 +316,6 @@
 	  src/Makefile \
 	  plugins/Makefile \
 	  plugins/splash/Makefile \
-	  plugins/splashy/Makefile \
 	  plugins/cpout/Makefile \
 	  plugins/ngc2/Makefile \
 	  plugins/critical/Makefile \
@@ -404,7 +398,6 @@
 echo Build rlparser plugin.................. : $with_rlparser
 echo Build simple_launcher plugin........... : $with_simple_launcher
 echo Build splash plugin.................... : $with_splash
-echo Build splashy plugin................... : $with_splashy
 echo Build stcmd plugin..................... : $with_stcmd
 echo Build stdout plugin.................... : $with_stdout
 echo Build suid plugin...................... : $with_suid

Modified: initng/plugins/Makefile.am
==============================================================================
--- initng/plugins/Makefile.am	(original)
+++ initng/plugins/Makefile.am	Fri Nov  4 15:39:25 2005
@@ -114,10 +114,6 @@
     SPLASH=splash
 endif
 
-if BUILD_SPLASHY
-    SPLASHY=splashy
-endif
-
 if BUILD_STDCMD
     STDCMD=stdcmd
 endif
@@ -173,7 +169,6 @@
 	$(RLPARSER) \
 	$(SIMPLE_LAUNCHER) \
 	$(SPLASH) \
-	$(SPLASHY)
 	$(STDCMD) \
 	$(STDOUT) \
 	$(SUID) \