[Initng-svn] r1941 - in initng: . plugins tools
svn at initng.thinktux.net
svn at initng.thinktux.net
Sun Nov 6 12:58:56 CET 2005
Author: jimmy
Date: Sun Nov 6 12:58:55 2005
New Revision: 1941
Modified:
initng/configure.in
initng/plugins/Makefile.am
initng/tools/Makefile.am
Log:
Clean up the build system, and gor rid of all warnings.
Modified: initng/configure.in
==============================================================================
--- initng/configure.in (original)
+++ initng/configure.in Sun Nov 6 12:58:55 2005
@@ -113,12 +113,11 @@
AC_SUBST(LIBDIR)
AC_SUBST(DOCDIR)
-AC_ARG_ENABLE(install-init, [ --enable-install-init Initng will\
- install itself as new init system (default=disabled)],
+AC_ARG_ENABLE(install-init, [ --enable-install-init Initng will install itself as new init system (default=disabled)],
install_init=$enableval,
install_init=no)
-AC_ARG_ENABLE(debug, [ --disable-debug debug mode (default=enabled)],
+AC_ARG_ENABLE(debug, [ --disable-debug debug mode @<:@default=enabled@:>@],
with_debug=$enableval,
with_debug=yes)
@@ -134,144 +133,144 @@
AC_ARG_WITH(also,
- AC_HELP_STRING([--with-also],[Build with also plugin]),
+ AC_HELP_STRING([--with-also],[Build with also plugin @<:@default=yes@:>@]),
[with_also=$withval], [with_also=yes])
AC_ARG_WITH(bash_launcher,
- AC_HELP_STRING([--with-bash_launcher],[Build with bash_launcher plugin]),
+ AC_HELP_STRING([--with-bash_launcher],[Build with bash_launcher plugin @<:@default=yes@:>@]),
[with_bash_launcher=$withval], [with_bash_launcher=yes])
AC_ARG_WITH(chdir,
- AC_HELP_STRING([--with-chdir],[Build with chdir plugin]),
+ AC_HELP_STRING([--with-chdir],[Build with chdir plugin @<:@default=yes@:>@]),
[with_chdir=$withval], [with_chdir=yes])
AC_ARG_WITH(chroot,
- AC_HELP_STRING([--with-chroot],[Build with chroot plugin]),
+ AC_HELP_STRING([--with-chroot],[Build with chroot plugin @<:@default=yes@:>@]),
[with_chroot=$withval], [with_chroot=yes])
AC_ARG_WITH(cpout,
- AC_HELP_STRING([--with-cpout],[Build with cpout plugin]),
+ AC_HELP_STRING([--with-cpout],[Build with cpout plugin @<:@default=yes@:>@]),
[with_cpout=$withval], [with_cpout=yes])
AC_ARG_WITH(critical,
- AC_HELP_STRING([--with-critical],[Build withcritical plugin]),
+ AC_HELP_STRING([--with-critical],[Build with critical plugin @<:@default=yes@:>@]),
[with_critical=$withval], [with_critical=yes])
AC_ARG_WITH(depend,
- AC_HELP_STRING([--with-depend],[Build with depend plugin]),
+ AC_HELP_STRING([--with-depend],[Build with depend plugin @<:@default=yes@:>@]),
[with_depend=$withval], [with_depend=yes])
AC_ARG_WITH(dllaunch,
- AC_HELP_STRING([--with-dllaunch],[Build with dllaunch plugin]),
+ AC_HELP_STRING([--with-dllaunch],[Build with dllaunch plugin @<:@default=no@:>@]),
[with_dllaunch=$withval], [with_dllaunch=no])
AC_ARG_WITH(dparser,
- AC_HELP_STRING([--with-dparser],[Build with dparser plugin]),
+ AC_HELP_STRING([--with-dparser],[Build with dparser plugin @<:@default=yes@:>@]),
[with_dparser=$withval], [with_dparser=yes])
AC_ARG_WITH(envparser,
- AC_HELP_STRING([--with-envparser],[Build with envparser plugin]),
+ AC_HELP_STRING([--with-envparser],[Build with envparser plugin @<:@default=yes@:>@]),
[with_envparser=$withval], [with_envparser=yes])
AC_ARG_WITH(find,
- AC_HELP_STRING([--with-find],[Build with find plugin]),
+ AC_HELP_STRING([--with-find],[Build with find plugin @<:@default=yes@:>@]),
[with_find=$withval], [with_find=yes])
AC_ARG_WITH(fstat,
- AC_HELP_STRING([--with-fstat],[Build with fstat plugin]),
+ AC_HELP_STRING([--with-fstat],[Build with fstat plugin @<:@default=yes@:>@]),
[with_fstat=$withval], [with_fstat=yes])
AC_ARG_WITH(history,
- AC_HELP_STRING([--with-history],[Build with history plugin]),
+ AC_HELP_STRING([--with-history],[Build with history plugin @<:@default=yes@:>@]),
[with_history=$withval], [with_history=yes])
AC_ARG_WITH(initctl,
- AC_HELP_STRING([--with-initctl],[Build with initctl plugin]),
+ AC_HELP_STRING([--with-initctl],[Build with initctl plugin @<:@default=yes@:>@]),
[with_initctl=$withval], [with_initctl=yes])
AC_ARG_WITH(interactive,
- AC_HELP_STRING([--with-interactive],[Build with interactive plugin]),
+ AC_HELP_STRING([--with-interactive],[Build with interactive plugin @<:@default=yes@:>@]),
[with_interactive=$withval], [with_interactive=yes])
AC_ARG_WITH(iparser,
- AC_HELP_STRING([--with-iparser],[Build with iparser plugin]),
+ AC_HELP_STRING([--with-iparser],[Build with iparser plugin @<:@default=yes@:>@]),
[with_iparser=$withval], [with_iparser=yes])
AC_ARG_WITH(last,
- AC_HELP_STRING([--with-last],[Build with last plugin]),
+ AC_HELP_STRING([--with-last],[Build with last plugin @<:@default=yes@:>@]),
[with_last=$withval], [with_last=yes])
AC_ARG_WITH(logfile,
- AC_HELP_STRING([--with-logfile],[Build with logfile plugin]),
+ AC_HELP_STRING([--with-logfile],[Build with logfile plugin @<:@default=no@:>@]),
[with_logfile=$withval], [with_logfile=no])
AC_ARG_WITH(netprobe,
- AC_HELP_STRING([--with-netprobe],[Build with netprobe plugin]),
+ AC_HELP_STRING([--with-netprobe],[Build with netprobe plugin @<:@default=yes@:>@]),
[with_netprobe=$withval], [with_netprobe=yes])
AC_ARG_WITH(ngc2,
- AC_HELP_STRING([--with-ngc2],[Build with ngc2 plugin]),
+ AC_HELP_STRING([--with-ngc2],[Build with ngc2 plugin @<:@default=yes@:>@]),
[with_ngc2=$withval], [with_ngc2=yes])
AC_ARG_WITH(pause,
- AC_HELP_STRING([--with-pause],[Build with pause plugin]),
+ 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]),
+ AC_HELP_STRING([--with-pidfile],[Build with pidfile plugin @<:@default=yes@:>@]),
[with_pidfile=$withval], [with_pidfile=yes])
AC_ARG_WITH(provide,
- AC_HELP_STRING([--with-provide],[Build with provide plugin]),
+ AC_HELP_STRING([--with-provide],[Build with provide plugin @<:@default=yes@:>@]),
[with_provide=$withval], [with_provide=no])
AC_ARG_WITH(reload,
- AC_HELP_STRING([--with-reload],[Build with reload plugin]),
+ AC_HELP_STRING([--with-reload],[Build with reload plugin @<:@default=yes@:>@]),
[with_reload=$withval], [with_reload=yes])
AC_ARG_WITH(renice,
- AC_HELP_STRING([--with-renice],[Build with renice plugin]),
+ 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]),
+ 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]),
+ AC_HELP_STRING([--with-rlparser],[Build with rlparser plugin @<:@default=yes@:>@]),
[with_rlparser=$withval], [with_rlparser=yes])
AC_ARG_WITH(simple_launcher,
- AC_HELP_STRING([--with-simple_launcher],[Build with simple_launcher plugin]),
+ AC_HELP_STRING([--with-simple_launcher],[Build with simple_launcher plugin @<:@default=yes@:>@]),
[with_simple_launcher=$withval], [with_simple_launcher=yes])
AC_ARG_WITH(splash,
- AC_HELP_STRING([--with-splash],[Build with splash plugin]),
+ AC_HELP_STRING([--with-splash],[Build with splash plugin @<:@default=no@:>@]),
[with_splash=$withval], [with_splash=no])
AC_ARG_WITH(stcmd,
- AC_HELP_STRING([--with-stcmd],[Build with stcmd plugin]),
+ AC_HELP_STRING([--with-stcmd],[Build with stcmd plugin @<:@default=yes@:>@]),
[with_stcmd=$withval], [with_stcmd=yes])
AC_ARG_WITH(stdout,
- AC_HELP_STRING([--with-stdout],[Build with stdout plugin]),
+ AC_HELP_STRING([--with-stdout],[Build with stdout plugin @<:@default=yes@:>@]),
[with_stdout=$withval], [with_stdout=yes])
AC_ARG_WITH(suid,
- AC_HELP_STRING([--with-suid],[Build with suid plugin]),
+ AC_HELP_STRING([--with-suid],[Build with suid plugin @<:@default=yes@:>@]),
[with_suid=$withval], [with_suid=yes])
AC_ARG_WITH(syncron,
- AC_HELP_STRING([--with-syncron],[Build with syncron plugin]),
+ AC_HELP_STRING([--with-syncron],[Build with syncron plugin @<:@default=yes@:>@]),
[with_syncron=$withval], [with_syncron=yes])
AC_ARG_WITH(syslog,
- AC_HELP_STRING([--with-syslog],[Build with syslog plugin]),
+ AC_HELP_STRING([--with-syslog],[Build with syslog plugin @<:@default=yes@:>@]),
[with_syslog=$withval], [with_syslog=yes])
AC_ARG_WITH(unneeded,
- AC_HELP_STRING([--with-unneeded],[Build with unneeded plugin]),
+ AC_HELP_STRING([--with-unneeded],[Build with unneeded plugin @<:@default=yes@:>@]),
[with_unneeded=$withval], [with_unneeded=yes])
@@ -305,7 +304,7 @@
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_stcmd, test "$with_stcmd" = "yes")
+AM_CONDITIONAL(BUILD_STCMD, test "$with_stcmd" = "yes")
AM_CONDITIONAL(BUILD_STDOUT, test "$with_stdout" = "yes")
AM_CONDITIONAL(BUILD_SUID, test "$with_suid" = "yes")
AM_CONDITIONAL(BUILD_SYNCRON, test "$with_syncron" = "yes")
Modified: initng/plugins/Makefile.am
==============================================================================
--- initng/plugins/Makefile.am (original)
+++ initng/plugins/Makefile.am Sun Nov 6 12:58:55 2005
@@ -1,177 +1,144 @@
+
+SUBDIRS=
+
if BUILD_ALSO
- ALSO=also
+ SUBDIRS+=also
endif
if BUILD_BASH_LAUNCHER
- BASH_LAUNCHER=bash_launcher
+ SUBDIRS+=bash_launcher
endif
if BUILD_CHDIR
- CHDIR=chdir
+ SUBDIRS+=chdir
endif
if BUILD_CHROOT
- CHROOT=chroot
+ SUBDIRS+=chroot
endif
if BUILD_CPOUT
- CPOUT=cpout
+ SUBDIRS+=cpout
endif
if BUILD_CRITICAL
- CRITICAL=critical
+ SUBDIRS+=critical
endif
if BUILD_DEPEND
- DEPEND=depend
+ SUBDIRS+=depend
endif
if BUILD_DLLAUNCH
- DLLAUNCH=dllaunch
+ SUBDIRS+=dllaunch
endif
if BUILD_DPARSER
- DPARSER=dparser
+ SUBDIRS+=dparser
endif
if BUILD_ENVPARSER
- ENVPARSER=envparser
+ SUBDIRS+=envparser
endif
if BUILD_FIND
- FIND=find
+ SUBDIRS+=find
endif
if BUILD_FSTAT
- FSTAT=fstat
+ SUBDIRS+=fstat
endif
if BUILD_HISTORY
- HISTORY=history
+ SUBDIRS+=history
endif
if BUILD_INITCTL
- INITCTL=initctl
+ SUBDIRS+=initctl
endif
if BUILD_INTERACTIVE
- INTERACTIVE=interactive
+ SUBDIRS+=interactive
endif
if BUILD_IPARSER
- IPARSER=iparser
+ SUBDIRS+=iparser
endif
if BUILD_LAST
- LAST=last
+ SUBDIRS+=last
endif
if BUILD_LOGFILE
- LOGFILE=logfile
+ SUBDIRS+=logfile
endif
if BUILD_NETPROBE
- NETPROBE=netprobe
+ SUBDIRS+=netprobe
endif
if BUILD_NGC2
- NGC2=ngc2
+ SUBDIRS+=ngc2
endif
if BUILD_PAUSE
- PAUSE=pause
+ SUBDIRS+=pause
endif
if BUILD_PIDFILE
- PIDFILE=pidfile
+ SUBDIRS+=pidfile
endif
if BUILD_PROVIDE
- PROVIDE=provide
+ SUBDIRS+=provide
endif
if BUILD_RELOAD
- RELOAD=reload
+ SUBDIRS+=reload
endif
if BUILD_RENICE
- RENICE=renice
+ SUBDIRS+=renice
endif
if BUILD_RESPAWN
- RESPAWN=respawn
+ SUBDIRS+=respawn
endif
if BUILD_RLPARSER
- RLPARSER=rlparser
+ SUBDIRS+=rlparser
endif
if BUILD_SIMPLE_LAUNCHER
- SIMPLE_LAUNCHER=simple_launcher
+ SUBDIRS+=simple_launcher
endif
if BUILD_SPLASH
- SPLASH=splash
+ SUBDIRS+=splash
endif
-if BUILD_stcmd
- stcmd=stcmd
+if BUILD_STCMD
+ SUBDIRS+=stcmd
endif
if BUILD_STDOUT
- STDOUT=stdout
+ SUBDIRS+=stdout
endif
if BUILD_SUID
- SUID=suid
+ SUBDIRS+=suid
endif
if BUILD_SYNCRON
- SYNCRON=synchron
+ SUBDIRS+=syncron
endif
if BUILD_SYSLOG
- SYSLOG=syslog
+ SUBDIRS+=syslog
endif
if BUILD_UNNEEDED
- UNNEDED=unneeded
+ SUBDIRS+=unneeded
endif
-SUBDIRS = \
- $(ALSO) \
- $(BASH_LAUNCHER) \
- $(CHDIR) \
- $(CHROOT) \
- $(CPOUT) \
- $(CRITICAL) \
- $(DEPEND) \
- $(DLLAUNCH) \
- $(DPARSER) \
- $(ENVPARSER) \
- $(FIND) \
- $(FSTAT) \
- $(HISTORY) \
- $(INITCTL) \
- $(INTERACTIVE) \
- $(IPARSER) \
- $(LAST) \
- $(LOGFILE) \
- $(NETPROBE) \
- $(NGC2) \
- $(PAUSE) \
- $(PIDFILE) \
- $(PROVIDE) \
- $(RELOAD) \
- $(RENICE) \
- $(RESPAWN) \
- $(RLPARSER) \
- $(SIMPLE_LAUNCHER) \
- $(SPLASH) \
- $(stcmd) \
- $(STDOUT) \
- $(SUID) \
- $(SYNCHRON) \
- $(SYSLOG) \
- $(UNNEEDED)
Modified: initng/tools/Makefile.am
==============================================================================
--- initng/tools/Makefile.am (original)
+++ initng/tools/Makefile.am Sun Nov 6 12:58:55 2005
@@ -1,17 +1,19 @@
include ../tools/Makefile.install_service
+sbin_PROGRAMS = system_off install_service
+
+
if INSTALL_AS_INIT
- KILLALL5=killall5
+ killall5_SOURCES = killall5.c
+ sbin_PROGRAMS +=killall5
endif
AUTOMAKE_OPTIONS = gnu
-sbin_PROGRAMS = system_off install_service $(KILLALL5)
sbin_SCRIPTS = ng-update shutdown_script initng-segfault
system_off_SOURCES = system_off.c
-killall5_SOURCES = killall5.c
#install_service_SOURCES = install_service.c
More information about the Initng-svn
mailing list