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

build-aux/ax_nagios_get_init

@@ -16,7 +16,6 @@
 #        systemd (Linux SystemD)
 #        gentoo  (Older Gentoo)
 #        openrc  (Recent Gentoo and some others)
-#        upstart (Older Debian)
 #        sysv    (The rest)
 #
 # LICENSE
@@ -58,8 +57,7 @@ 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, upstart,
-		openrc, etc.)]),
+	 [specify init type (bsd, sysv, systemd, launchd, smf10, smf11, openrc, etc.)]),
 		[
 			#
 			# Run this if --with was specified
@@ -171,7 +169,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="upstart"
+						init_type="sysv"
 						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"}
@@ -601,9 +601,9 @@ AS_CASE([$inetd_type],
 		fi
 		inetdname=${inetdname="$PKG_NAME.xml"},
 
-	[upstart],
-		inetddir=${inetddir="/etc/init"}
-		inetdname=${inetdname="$PKG_NAME"},
+#	[upstart],
+#		inetddir=${inetddir="/etc/init"}
+#		inetdname=${inetdname="$PKG_NAME"},
 
 	[launchd],
 		inetddir=${inetddir="/System/Library/LaunchDaemons"}

configure

@@ -1396,7 +1396,7 @@ Optional Packages:
                           irix, cygwin, aix, hp-ux, etc.)
   --with-dist-type=type   specify distribution type (suse, rh, debian, etc.)
   --with-init-type=type   specify init type (bsd, sysv, systemd, launchd,
-                          smf10, smf11, upstart, openrc, etc.)
+                          smf10, smf11, openrc, etc.)
   --with-inetd-type=type  which super-server the system runs (inetd, xinetd,
                           systemd, launchd, smf10, smf11, etc.)
   --with-pkgsysconfdir=DIR
@@ -2947,7 +2947,7 @@ esac
 			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="upstart"
+						init_type="sysv"
 						init_type_wanted=no
 					elif test -f "/etc/rc"; then
 						init_type="newbsd"
@@ -3014,7 +3014,7 @@ fi
 			inetd_disabled=""
 
 			if test x"$init_type" = "xupstart"; then
-				inetd_type="upstart"
+				inetd_type="sysv"
 			elif test "$opsys" = "osx"; then
 				inetd_type="launchd"
 			fi
@@ -3608,12 +3608,13 @@ case $init_type in #(
 		initname=${initname="$PKG_NAME.xml"}
 		initconfdir=unknown
 		initconf=unknown ;; #(
-  upstart) :
-    initdir=${initdir="/etc/init"}
-		initname=${initname="$PKG_NAME.conf"}
-		initconfdir=${initconfdir="/etc/default"}
-		initconf=${initconf="$initconfdir/$PKG_NAME"} ;; #(
-  launchd) :
+  #	[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"}
 		initname=${initname="org.nagios.$PKG_NAME.plist"} ;; #(
   #		initconfdir=${initconfdir="/private/etc"}
@@ -3651,10 +3652,11 @@ case $inetd_type in #(
 			inetddir=${inetddir="/lib/svc/manifest/network"}
 		fi
 		inetdname=${inetdname="$PKG_NAME.xml"} ;; #(
-  upstart) :
-    inetddir=${inetddir="/etc/init"}
-		inetdname=${inetdname="$PKG_NAME"} ;; #(
-  launchd) :
+  #	[upstart],
+#		inetddir=${inetddir="/etc/init"}
+#		inetdname=${inetdname="$PKG_NAME"},
+
+	launchd) :
     inetddir=${inetddir="/System/Library/LaunchDaemons"}
 		inetdname=${inetdname="org.nagios.$PKG_NAME.plist"} ;; #(
   *) :
@@ -3696,9 +3698,10 @@ case $init_type in #(
   smf*) :
     src_init="solaris-PKG_NAME.xml"
 		src_inetd="solaris-PKG_NAME.xml" ;; #(
-  upstart) :
-    src_init=upstart-init ;; #(
-  launchd) :
+  #	[upstart],
+#		src_init=default-init,
+
+	launchd) :
     src_init="mac-org.nagios.PKG_NAME.plist"
 		src_inetd="mac-org.nagios.PKG_NAME.plist" ;; #(
   *) :