first round of adding autoconf-macros into core for 4.4.0. testing wo…

…uld appreciated by anyone who receives these messages :) -bh

Changelog

@@ -12,6 +12,7 @@ ENHANCEMENTS
 * New Macro(s) to generate URL for host / service object to be used in notifications (John Frickson)
 * enable_page_tour interface option (Bryan Heden)
 * Code cleanups in important sections (Workers, Handling Results) (Bryan Heden)
+* Automatic mail program detection (with same /bin/mail failback) (Bryan Heden)
 
 FIXES
 * Command line macro detection skips potential macros with no ending dollar sign (Bryan Heden, Jake Omann)

Makefile.in

@@ -39,10 +39,15 @@ INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
 HTTPD_CONF=@HTTPD_CONF@
 LN_HTTPD_SITES_ENABLED=@LN_HTTPD_SITES_ENABLED@
-INIT_DIR=@init_dir@
+INIT_DIR=@initdir@
 INIT_OPTS=@INIT_OPTS@
 CGICFGDIR=$(CGIDIR)
 
+
+SRC_INIT=@src_init@
+INIT_FILE=@initname@
+#INIT_TYPE=@init_type@
+
 USE_EVENTBROKER=@USE_EVENTBROKER@
 USE_LIBTAP=@USE_LIBTAP@
 
@@ -341,8 +346,8 @@ install-classicui:
 install-init: install-daemoninit
 
 install-daemoninit:
-	$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
-	$(INSTALL) -m 755 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
+	$(INSTALL) -m 755 $(INIT_OPTS) startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE)
+
 
 	@echo ""
 	@echo "*** Init script installed ***"

autoconf-macros/ax_nagios_get_paths

@@ -292,7 +292,7 @@ if test ! -d "$tmpfilesd"; then
 else
 	tmpfilesd="$tmpfilesd/$INIT_PROG.conf"
 fi
-subsyslockdir=${subsyslockdir="/var/lock/subsys"}
+subsyslockdir=${subsyslockdir="/run"}
 if test ! -d "$subsyslockdir"; then
 	subsyslockdir="N/A"
 	subsyslockfile="N/A"