Updated Solaris package build to support command arguments.

package/solaris/Makefile.in

@@ -9,7 +9,7 @@ TARGET_VER=@TARGET_VER@
 TARGET_ARCH=@TARGET_ARCH@
 TARGET_PLATFORM=@TARGET_PLATFORM@
 
-SOLARIS_CONFIG_OPTS=--prefix=/opt/nagios --sysconfdir=/etc/nagios
+SOLARIS_CONFIG_OPTS=--prefix=/opt/nagios --sysconfdir=/etc/nagios --enable-command-args
 
 PKG_NAME=NGOSnrpe
 PKG_VERSION=@PKG_VERSION@

src/Makefile.in

@@ -8,9 +8,10 @@ srcdir=@srcdir@
 
 # Source code directories
 SRC_INCLUDE=@srcdir@/../include
+CFG_INCLUDE=../include
 
 CC=@CC@
-CFLAGS=@CFLAGS@ @DEFS@
+CFLAGS=@CFLAGS@ @DEFS@ -I $(CFG_INCLUDE) -I $(SRC_INCLUDE)
 LDFLAGS=@LDFLAGS@ @LIBS@
 SOCKETLIBS=@SOCKETLIBS@
 LIBWRAPLIBS=@LIBWRAPLIBS@
@@ -34,10 +35,10 @@ SNPRINTF_O=@SNPRINTF_O@
 
 all: nrpe check_nrpe
 
-nrpe: $(srcdir)/nrpe.c $(srcdir)/utils.c $(srcdir)/acl.c $(SRC_INCLUDE)/nrpe.h $(SRC_INCLUDE)/utils.h $(SRC_INCLUDE)/common.h $(SRC_INCLUDE)/config.h $(SRC_INCLUDE)/acl.h $(SNPRINTF_O)
+nrpe: $(srcdir)/nrpe.c $(srcdir)/utils.c $(srcdir)/acl.c $(SRC_INCLUDE)/nrpe.h $(SRC_INCLUDE)/utils.h $(SRC_INCLUDE)/common.h $(CFG_INCLUDE)/config.h $(SRC_INCLUDE)/acl.h $(SNPRINTF_O)
 	$(CC) $(CFLAGS) -o $@ $(srcdir)/nrpe.c $(srcdir)/utils.c $(srcdir)/acl.c $(LDFLAGS) $(SOCKETLIBS) $(LIBWRAPLIBS) $(SNPRINTF_O) $(OTHERLIBS)
 
-check_nrpe: $(srcdir)/check_nrpe.c $(srcdir)/utils.c $(SRC_INCLUDE)/utils.h $(SRC_INCLUDE)/common.h $(SRC_INCLUDE)/config.h
+check_nrpe: $(srcdir)/check_nrpe.c $(srcdir)/utils.c $(SRC_INCLUDE)/utils.h $(SRC_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
 	$(CC) $(CFLAGS) -o $@ $(srcdir)/check_nrpe.c $(srcdir)/utils.c $(LDFLAGS) $(SOCKETLIBS) $(OTHERLIBS)
 
 install:

src/check_nrpe.c

@@ -17,9 +17,9 @@
  *
  ********************************************************************************************/
 
-#include "../include/common.h"
-#include "../include/config.h"
-#include "../include/utils.h"
+#include "config.h"
+#include "common.h"
+#include "utils.h"
 
 
 #define DEFAULT_NRPE_COMMAND	"_NRPE_CHECK"  /* check version of NRPE daemon */

src/nrpe.c

@@ -24,11 +24,11 @@
  * now allowed_hosts is parsed by parse_allowed_hosts() from acl.c.
  */ 
 
-#include "../include/common.h"
-#include "../include/config.h"
-#include "../include/nrpe.h"
-#include "../include/utils.h"
-#include "../include/acl.h"
+#include "config.h"
+#include "common.h"
+#include "nrpe.h"
+#include "utils.h"
+#include "acl.h"
 
 #ifdef HAVE_SSL
 #include "../include/dh.h"