More upstart changes

build-aux/ax_nagios_get_files

@@ -78,8 +78,8 @@ AS_CASE([$init_type],
 		src_init="solaris-PKG_NAME.xml"
 		src_inetd="solaris-PKG_NAME.xml",
 
-#	[upstart],
-#		src_init=default-init,
+	[upstart],
+		src_init=default-init,
 
 	[launchd],
 		src_init="mac-org.nagios.PKG_NAME.plist"

build-aux/ax_nagios_get_inetd

@@ -13,6 +13,7 @@
 #        launchd (Mac OS X)
 #        smf10   (Solaris)
 #        smf11   (Solaris)
+#        upstart (Older Debian)
 #        xinetd  (Most Linux, BSD)
 #        inetd   (The rest)
 #
@@ -90,7 +91,7 @@ AC_DEFUN([AX_NAGIOS_GET_INETD],
 			inetd_disabled=""
 
 			if test x"$init_type" = "xupstart"; then
-				inetd_type="sysv"
+				inetd_type="upstart"
 			elif test "$opsys" = "osx"; then
 				inetd_type="launchd"
 			fi

build-aux/ax_nagios_get_init

@@ -16,6 +16,7 @@
 #        systemd (Linux SystemD)
 #        gentoo  (Older Gentoo)
 #        openrc  (Recent Gentoo and some others)
+#        upstart (Older Debian)
 #        sysv    (The rest)
 #
 # LICENSE
@@ -57,7 +58,8 @@ AC_DEFUN([AX_NAGIOS_GET_INIT],
 #
 	AC_MSG_CHECKING(what init system is being used )
 	AC_ARG_WITH(init_type,AC_HELP_STRING([--with-init-type=type],
-	 [specify init type (bsd, sysv, systemd, launchd, smf10, smf11, openrc, etc.)]),
+	 [specify init type (bsd, sysv, systemd, launchd, smf10, smf11, upstart,
+		openrc, etc.)]),
 		[
 			#
 			# Run this if --with was specified
@@ -169,7 +171,7 @@ AC_DEFUN([AX_NAGIOS_GET_INIT],
 			if test "$init_type_wanted" = yes; then
 				if test "$pid1" = "/sbin/init" -o "$pid1" = "/usr/sbin/init"; then
 					if `/sbin/init --version 2>/dev/null | grep "upstart" >/dev/null`; then
-						init_type="sysv"
+						init_type="upstart"
 						init_type_wanted=no
 					elif test -f "/etc/rc"; then
 						init_type="newbsd"

build-aux/ax_nagios_get_paths

@@ -556,11 +556,11 @@ AS_CASE([$init_type],
 		initconfdir=unknown
 		initconf=unknown,
 
-#	[upstart],
-#		initdir=${initdir="/etc/init.d"}
-#		initname=${initname="$PKG_NAME"}
-#		initconfdir=${initconfdir="/etc/default"}
-#		initconf=${initconf="$initconfdir/$PKG_NAME"},
+	[upstart],
+		initdir=${initdir="/etc/init.d"}
+		initname=${initname="$PKG_NAME"}
+		initconfdir=${initconfdir="/etc/default"}
+		initconf=${initconf="$initconfdir/$PKG_NAME"},
 
 	[launchd],
 		initdir=${initdir="/System/Library/LaunchDaemons"}
@@ -602,7 +602,7 @@ AS_CASE([$inetd_type],
 		inetdname=${inetdname="$PKG_NAME.xml"},
 
 #	[upstart],
-#		inetddir=${inetddir="/etc/init"}
+#		inetddir=${inetddir="/etc/init.d"}
 #		inetdname=${inetdname="$PKG_NAME"},
 
 	[launchd],