[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.23,1.24

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug
In directory usw-pr-cvs1:/tmp/cvs-serv3190

Modified Files:
	configure.in 
Log Message:
typo in AC_DEFINE of PS_FORMAT for solaris


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** configure.in	9 Nov 2002 03:43:12 -0000	1.23
--- configure.in	14 Nov 2002 04:00:34 -0000	1.24
***************
*** 160,165 ****
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
- dnl CPPFLAGS="-I/usr/include"
- 
  AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval])
  if test -n "$MYSQL"; then
--- 160,163 ----
***************
*** 185,189 ****
    if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
      EXTRAS="$EXTRAS check_mysql"
! 	CPPFLAGS="$_SAVEDCPPFLAGS -I$MYSQL/include"
      AC_SUBST(MYSQLLIBS)
      AC_SUBST(check_mysql_LDFLAGS)
--- 183,187 ----
    if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
      EXTRAS="$EXTRAS check_mysql"
!     AC_SUBST(MYSQLINCLUDE)
      AC_SUBST(MYSQLLIBS)
      AC_SUBST(check_mysql_LDFLAGS)
***************
*** 191,201 ****
      AC_MSG_WARN([Skipping mysql plugin])
      AC_MSG_WARN([install mysql client headers to compile this plugin (see Requirements).])
-     CPPFLAGS="$_SAVEDCPPFLAGS"
    fi
  else
    AC_MSG_WARN([Skipping mysql plugin])
    AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
-   CPPFLAGS="$_SAVEDCPPFLAGS"
  fi
  LIBS="$_SAVEDLIBS"
  
--- 189,198 ----
      AC_MSG_WARN([Skipping mysql plugin])
      AC_MSG_WARN([install mysql client headers to compile this plugin (see Requirements).])
    fi
  else
    AC_MSG_WARN([Skipping mysql plugin])
    AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
  fi
+ CPPFLAGS="$_SAVEDCPPFLAGS"
  LIBS="$_SAVEDLIBS"
  
***************
*** 290,293 ****
--- 287,291 ----
     AC_DEFINE(COMPILER_SUPPORTS_LL,1,[Define if compiler support long long])
  fi
+ 
  AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE_VA_COPY,[
  AC_TRY_LINK([#include <stdarg.h>
***************
*** 445,449 ****
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs],[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
--- 443,447 ----
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
***************
*** 485,489 ****
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'state uid ppid command args'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -ao 'vsz command'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
--- 483,487 ----
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'state uid ppid command args'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -ao 'vsz command'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
***************
*** 499,503 ****
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
--- 497,501 ----
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
***************
*** 513,517 ****
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxno 'vsz comm'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
--- 511,515 ----
  	EXTRAS="$EXTRAS check_nagios"
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxno 'vsz comm'",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
***************
*** 525,529 ****
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
--- 523,527 ----
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
***************
*** 537,541 ****
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
--- 535,539 ----
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
***************
*** 553,557 ****
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -laxnwww",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
--- 551,555 ----
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -laxnwww",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
***************
*** 570,574 ****
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS laxnwww",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
--- 568,572 ----
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS laxnwww",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
***************
*** 585,589 ****
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[])
--- 583,587 ----
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[])
***************
*** 597,601 ****
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS glaxen",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS glaxen",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
--- 595,599 ----
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
  	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS glaxen",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
  	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS glaxen",[])
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
***************
*** 881,885 ****
  fi
  
- dnl AC_EGREP_HEADER (PATTERN, HEADER-FILE, ACTION-IF-FOUND [,          ACTION-IF-NOT-FOUND])
  AC_TRY_COMPILE([#ifdef __STDC__
  #include <stdio.h>
--- 879,882 ----