summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in29
1 files changed, 13 insertions, 16 deletions
diff --git a/configure.in b/configure.in
index 4f2a4ac..c673018 100644
--- a/configure.in
+++ b/configure.in
@@ -159,8 +159,6 @@ LIBS="$_SAVEDLIBS"
159dnl Check for mysql libraries 159dnl Check for mysql libraries
160_SAVEDLIBS="$LIBS" 160_SAVEDLIBS="$LIBS"
161_SAVEDCPPFLAGS="$CPPFLAGS" 161_SAVEDCPPFLAGS="$CPPFLAGS"
162dnl CPPFLAGS="-I/usr/include"
163
164AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval]) 162AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval])
165if test -n "$MYSQL"; then 163if test -n "$MYSQL"; then
166 MYSQLLIBDIR=$MYSQL/lib/mysql 164 MYSQLLIBDIR=$MYSQL/lib/mysql
@@ -184,19 +182,18 @@ if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_m
184 AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" ) 182 AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" )
185 if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then 183 if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
186 EXTRAS="$EXTRAS check_mysql" 184 EXTRAS="$EXTRAS check_mysql"
187 CPPFLAGS="$_SAVEDCPPFLAGS -I$MYSQL/include" 185 AC_SUBST(MYSQLINCLUDE)
188 AC_SUBST(MYSQLLIBS) 186 AC_SUBST(MYSQLLIBS)
189 AC_SUBST(check_mysql_LDFLAGS) 187 AC_SUBST(check_mysql_LDFLAGS)
190 else 188 else
191 AC_MSG_WARN([Skipping mysql plugin]) 189 AC_MSG_WARN([Skipping mysql plugin])
192 AC_MSG_WARN([install mysql client headers to compile this plugin (see Requirements).]) 190 AC_MSG_WARN([install mysql client headers to compile this plugin (see Requirements).])
193 CPPFLAGS="$_SAVEDCPPFLAGS"
194 fi 191 fi
195else 192else
196 AC_MSG_WARN([Skipping mysql plugin]) 193 AC_MSG_WARN([Skipping mysql plugin])
197 AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).]) 194 AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
198 CPPFLAGS="$_SAVEDCPPFLAGS"
199fi 195fi
196CPPFLAGS="$_SAVEDCPPFLAGS"
200LIBS="$_SAVEDLIBS" 197LIBS="$_SAVEDLIBS"
201 198
202dnl Check for OpenSSL location 199dnl Check for OpenSSL location
@@ -289,6 +286,7 @@ AC_CACHE_CHECK([for LL suffix on long long integers],ac_cv_compiler_supports_ll,
289if test x"$ac_cv_compiler_supports_ll" = x"yes"; then 286if test x"$ac_cv_compiler_supports_ll" = x"yes"; then
290 AC_DEFINE(COMPILER_SUPPORTS_LL,1,[Define if compiler support long long]) 287 AC_DEFINE(COMPILER_SUPPORTS_LL,1,[Define if compiler support long long])
291fi 288fi
289
292AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE_VA_COPY,[ 290AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE_VA_COPY,[
293AC_TRY_LINK([#include <stdarg.h> 291AC_TRY_LINK([#include <stdarg.h>
294va_list ap1,ap2;], [__va_copy(ap1,ap2);], 292va_list ap1,ap2;], [__va_copy(ap1,ap2);],
@@ -444,7 +442,7 @@ then
444 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'",[Verbatim command to execute for ps in check_netsaint]) 442 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'",[Verbatim command to execute for ps in check_netsaint])
445 EXTRAS="$EXTRAS check_nagios" 443 EXTRAS="$EXTRAS check_nagios"
446 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'",[]) 444 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'",[])
447 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs],[]) 445 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
448 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'",[]) 446 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'",[])
449 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[]) 447 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
450 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'",[]) 448 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'",[])
@@ -484,7 +482,7 @@ then
484 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'state user ppid args'",[]) 482 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'state user ppid args'",[])
485 EXTRAS="$EXTRAS check_nagios" 483 EXTRAS="$EXTRAS check_nagios"
486 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'state uid ppid command args'",[]) 484 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'state uid ppid command args'",[])
487 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[]) 485 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
488 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -ao 'vsz command'",[]) 486 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -ao 'vsz command'",[])
489 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[]) 487 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
490 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'",[]) 488 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'",[])
@@ -498,7 +496,7 @@ then
498 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'",[]) 496 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'",[])
499 EXTRAS="$EXTRAS check_nagios" 497 EXTRAS="$EXTRAS check_nagios"
500 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'",[]) 498 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'",[])
501 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[]) 499 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
502 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'",[]) 500 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'",[])
503 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[]) 501 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
504 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'",[]) 502 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'",[])
@@ -512,7 +510,7 @@ then
512 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxno 'state user ppid comm'",[]) 510 AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxno 'state user ppid comm'",[])
513 EXTRAS="$EXTRAS check_nagios" 511 EXTRAS="$EXTRAS check_nagios"
514 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'",[]) 512 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'",[])
515 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[]) 513 AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
516 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxno 'vsz comm'",[]) 514 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxno 'vsz comm'",[])
517 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[]) 515 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
518 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'",[]) 516 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'",[])
@@ -524,7 +522,7 @@ then
524 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf]) 522 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
525 AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[]) 523 AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
526 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[]) 524 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
527 AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[]) 525 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])
528 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[]) 526 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
529 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[]) 527 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
530 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[]) 528 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[])
@@ -536,7 +534,7 @@ then
536 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf]) 534 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
537 AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[]) 535 AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
538 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[]) 536 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
539 AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[]) 537 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])
540 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[]) 538 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
541 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[]) 539 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
542 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[]) 540 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[])
@@ -552,7 +550,7 @@ then
552 EXTRAS="$EXTRAS check_nagios" 550 EXTRAS="$EXTRAS check_nagios"
553 AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[]) 551 AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
554 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -laxnwww",[]) 552 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -laxnwww",[])
555 AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s",[]) 553 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])
556 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[]) 554 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
557 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[]) 555 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
558 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[]) 556 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[])
@@ -569,7 +567,7 @@ then
569 EXTRAS="$EXTRAS check_nagios" 567 EXTRAS="$EXTRAS check_nagios"
570 AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[]) 568 AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
571 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS laxnwww",[]) 569 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS laxnwww",[])
572 AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[]) 570 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])
573 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[]) 571 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
574 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[]) 572 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
575 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[]) 573 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[])
@@ -584,7 +582,7 @@ then
584 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf]) 582 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
585 AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[]) 583 AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
586 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[]) 584 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
587 AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[]) 585 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])
588 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[]) 586 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -el",[])
589 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[]) 587 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[])
590 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[]) 588 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[])
@@ -596,7 +594,7 @@ then
596 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf]) 594 AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
597 AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[]) 595 AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
598 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS glaxen",[]) 596 AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS glaxen",[])
599 AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[]) 597 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])
600 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS glaxen",[]) 598 AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS glaxen",[])
601 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[]) 599 AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
602 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS glaxen",[]) 600 AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS glaxen",[])
@@ -880,7 +878,6 @@ elif test -f ../plugins/check_nt.c ; then
880 EXTRAS="$EXTRAS check_nt" 878 EXTRAS="$EXTRAS check_nt"
881fi 879fi
882 880
883dnl AC_EGREP_HEADER (PATTERN, HEADER-FILE, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
884AC_TRY_COMPILE([#ifdef __STDC__ 881AC_TRY_COMPILE([#ifdef __STDC__
885#include <stdio.h> 882#include <stdio.h>
886#include <stdlib.h> 883#include <stdlib.h>