Changes for HP-UX

Makefile.in

@@ -35,33 +35,33 @@ SRC_INIT=@src_init@
 
 
 default:
-	@echo
-	@echo Please enter 'make [option]' where [option] is one of:
-	@echo
-	@echo "     all              builds nrpe and check_nrpe"
-	@echo "     nrpe             builds nrpe only"
-	@echo "     check_nrpe       builds check_nrpe only"
-	@echo "     install          install nrpe and check_nrpe"
-	@echo "     install-plugin   install the check_nrpe plugin"
-	@echo "     install-daemon   install the nrpe daemon"
-	@echo "     install-config   install the nrpe configuration file"
-	@echo "     install-inetd    install the startup files for inetd, launchd, etc."
-	@echo "     install-init     install the startup files for init, systemd, etc."
-	@echo "     solaris-package  create the solaris package"
-	@echo
+	echo;\
+	echo Please enter 'make [option]' where [option] is one of:;\
+	echo;\
+	echo "     all              builds nrpe and check_nrpe";\
+	echo "     nrpe             builds nrpe only";\
+	echo "     check_nrpe       builds check_nrpe only";\
+	echo "     install          install nrpe and check_nrpe";\
+	echo "     install-plugin   install the check_nrpe plugin";\
+	echo "     install-daemon   install the nrpe daemon";\
+	echo "     install-config   install the nrpe configuration file";\
+	echo "     install-inetd    install the startup files for inetd, launchd, etc.";\
+	echo "     install-init     install the startup files for init, systemd, etc.";\
+	echo "     solaris-package  create the solaris package";\
+	echo
 
 all:
 	cd $(SRC_BASE); $(MAKE)
 
 	@echo ""
-	@echo "*** Compile finished ***"
-	@echo ""
-	@echo "If the NRPE daemon and client compiled without any errors, you"
-	@echo "can continue with the installation or upgrade process."
-	@echo ""
-	@echo "Read the PDF documentation (NRPE.pdf) for information on the next"
-	@echo "steps you should take to complete the installation or upgrade."
-	@echo ""
+	echo "*** Compile finished ***";\
+	echo "";\
+	echo "If the NRPE daemon and client compiled without any errors, you";\
+	echo "can continue with the installation or upgrade process.";\
+	echo "";\
+	echo "Read the PDF documentation (NRPE.pdf) for information on the next";\
+	echo "steps you should take to complete the installation or upgrade.";\
+	echo ""
 
 nrpe:
 	cd $(SRC_BASE); $(MAKE)

configure.ac

@@ -395,7 +395,7 @@ if test x$check_for_ssl = xyes; then
 			if test "`uname -s`" = "Darwin" ; then
 				soext="dylib"
 			elif test "`uname -s`" = "HP-UX" ; then
-				if test x$arch = "ia64"; then
+				if test x$arch = "xia64"; then
 					soext="so"
 				else
 					soext="sl"
@@ -540,8 +540,8 @@ echo ""
 echo ""
 AC_MSG_RESULT([*** Configuration summary for $PKG_NAME $PKG_VERSION $PKG_REL_DATE ***:])
 
-echo ""
-echo " General Options:"
+echo "";\
+echo " General Options:";\
 echo " -------------------------"
 
 AC_MSG_RESULT([ NRPE port:    $nrpe_port])
@@ -551,8 +551,9 @@ AC_MSG_RESULT([ Nagios user:  $nagios_user])
 AC_MSG_RESULT([ Nagios group: $nagios_group])
 
 
-echo ""
-echo ""
-echo "Review the options above for accuracy.  If they look okay,"
-echo "type 'make all' to compile the NRPE daemon and client."
+echo "";\
+echo "";\
+echo "Review the options above for accuracy.  If they look okay,";\
+echo "type 'make all' to compile the NRPE daemon and client";\
+echo "or type 'make' to get a list of make options.";\
 echo ""

src/nrpe.c

@@ -457,8 +457,8 @@ void usage(int result)
 		printf(" <mode>           = One of the following operating modes:\n");
 		printf("   -i             =    Run as a service under inetd or xinetd\n");
 		printf("   -d             =    Run as a standalone daemon\n");
-		/* Updates help section to indicate how to start under SRC on AIX */
 		printf("   -d -s          =    Run as a subsystem under AIX\n");
+		printf("   -f             =    Don't fork() for systemd, launchd, etc.\n");
 		printf("\n");
 		printf("Notes:\n");
 		printf("This program is designed to process requests from the check_nrpe\n");