|
Lines 1-6
Link Here
|
| 1 |
--- configure.in.orig 2009-09-16 10:20:34.000000000 +0200 |
1 |
--- configure.in.orig 2013-10-02 17:22:21.000000000 +0200 |
| 2 |
+++ configure.in 2009-12-17 15:42:34.486203026 +0100 |
2 |
+++ configure.in 2013-12-09 16:12:25.845469460 +0100 |
| 3 |
@@ -11,8 +11,6 @@ |
3 |
@@ -12,8 +12,6 @@ |
| 4 |
RELEASE=1 |
4 |
RELEASE=1 |
| 5 |
AC_SUBST(RELEASE) |
5 |
AC_SUBST(RELEASE) |
| 6 |
|
6 |
|
|
Lines 9-15
Link Here
|
| 9 |
dnl Deprecated configure options |
9 |
dnl Deprecated configure options |
| 10 |
|
10 |
|
| 11 |
|
11 |
|
| 12 |
@@ -43,6 +41,7 @@ |
12 |
@@ -44,6 +42,7 @@ |
| 13 |
gl_EARLY |
13 |
gl_EARLY |
| 14 |
AC_PROG_GCC_TRADITIONAL |
14 |
AC_PROG_GCC_TRADITIONAL |
| 15 |
AC_PROG_LIBTOOL |
15 |
AC_PROG_LIBTOOL |
|
Lines 17-23
Link Here
|
| 17 |
|
17 |
|
| 18 |
AM_PROG_CC_C_O |
18 |
AM_PROG_CC_C_O |
| 19 |
|
19 |
|
| 20 |
@@ -200,11 +199,12 @@ |
20 |
@@ -211,11 +210,12 @@ |
| 21 |
ACX_HELP_STRING([--with-pgsql=DIR], |
21 |
ACX_HELP_STRING([--with-pgsql=DIR], |
| 22 |
[sets path to pgsql installation]), |
22 |
[sets path to pgsql installation]), |
| 23 |
PGSQL=$withval,) |
23 |
PGSQL=$withval,) |
|
Lines 32-102
Link Here
|
| 32 |
fi |
32 |
fi |
| 33 |
AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt) |
33 |
AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt) |
| 34 |
if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then |
34 |
if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then |
| 35 |
@@ -241,37 +241,42 @@ |
35 |
@@ -259,10 +259,10 @@ |
| 36 |
AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) |
36 |
dnl Check for DBI libraries |
| 37 |
AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).]) |
37 |
AS_IF([test "x$with_dbi" != "xno"], [ |
| 38 |
fi |
38 |
_SAVEDLIBS="$LIBS" |
| 39 |
+else |
39 |
- AC_CHECK_LIB(dbi,dbi_initialize) |
| 40 |
+ AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) |
40 |
+ AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib) |
| 41 |
+ AC_MSG_WARN([PostgreSQL directory has not been found]) |
41 |
if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then |
| 42 |
+fi |
42 |
EXTRAS="$EXTRAS check_dbi" |
| 43 |
LIBS="$_SAVEDLIBS" |
43 |
- DBILIBS="-ldbi" |
| 44 |
CPPFLAGS="$_SAVEDCPPFLAGS" |
44 |
+ DBILIBS="-L${LOCALBASE}/lib -ldbi" |
| 45 |
|
45 |
AC_SUBST(DBILIBS) |
| 46 |
+AC_ARG_ENABLE(radius,--enable-radius compile check_radius) |
46 |
else |
| 47 |
+if test x$enable_radius = xyes; then |
47 |
AC_MSG_WARN([Skipping dbi plugin]) |
|
|
48 |
@@ -276,17 +276,13 @@ |
| 48 |
dnl Check for radius libraries |
49 |
dnl Check for radius libraries |
| 49 |
_SAVEDLIBS="$LIBS" |
50 |
AS_IF([test "x$with_radius" != "xno"], [ |
| 50 |
-AC_CHECK_LIB(radiusclient,rc_read_config) |
51 |
_SAVEDLIBS="$LIBS" |
| 51 |
-if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then |
52 |
- AC_CHECK_LIB(radiusclient,rc_read_config) |
| 52 |
- EXTRAS="$EXTRAS check_radius" |
53 |
- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then |
| 53 |
- RADIUSLIBS="-lradiusclient" |
54 |
- EXTRAS="$EXTRAS check_radius" |
| 54 |
- AC_SUBST(RADIUSLIBS) |
55 |
- RADIUSLIBS="-lradiusclient" |
| 55 |
-else |
56 |
- AC_SUBST(RADIUSLIBS) |
| 56 |
- AC_CHECK_LIB(radiusclient-ng,rc_read_config) |
57 |
- else |
| 57 |
+ AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib) |
58 |
- AC_CHECK_LIB(radiusclient-ng,rc_read_config) |
| 58 |
if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then |
59 |
+ AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib) |
| 59 |
EXTRAS="$EXTRAS check_radius" |
60 |
if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then |
| 60 |
- RADIUSLIBS="-lradiusclient-ng" |
61 |
EXTRAS="$EXTRAS check_radius" |
| 61 |
+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng"\ |
62 |
- RADIUSLIBS="-lradiusclient-ng" |
| 62 |
+ RADIUSINCLUDE="-I${LOCALBASE}/include" |
63 |
+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng" |
| 63 |
AC_SUBST(RADIUSLIBS) |
64 |
+ RADIUSINCLUDE="-I${LOCALBSE}/include" |
| 64 |
+ AC_SUBST(RADIUSINCLUDE) |
65 |
AC_SUBST(RADIUSLIBS) |
| 65 |
else |
66 |
+ AC_SUBST(RADIUSINCLUDE) |
| 66 |
AC_MSG_WARN([Skipping radius plugin]) |
67 |
else |
| 67 |
AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) |
68 |
AC_MSG_WARN([Skipping radius plugin]) |
| 68 |
fi |
69 |
AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) |
| 69 |
-fi |
70 |
@@ -300,12 +296,13 @@ |
| 70 |
LIBS="$_SAVEDLIBS" |
|
|
| 71 |
+fi |
| 72 |
|
| 73 |
+AC_ARG_ENABLE(ldap,--enable-ldap compile check_ldap) |
| 74 |
+if test x$enable_ldap = xyes; then |
| 75 |
dnl Check for LDAP libraries |
71 |
dnl Check for LDAP libraries |
| 76 |
_SAVEDLIBS="$LIBS" |
72 |
AS_IF([test "x$with_ldap" != "xno"], [ |
| 77 |
-AC_CHECK_LIB(ldap,main,,,-llber) |
73 |
_SAVEDLIBS="$LIBS" |
| 78 |
-if test "$ac_cv_lib_ldap_main" = "yes"; then |
74 |
- AC_CHECK_LIB(ldap,main,,,-llber) |
| 79 |
- LDAPLIBS="-lldap -llber"\ |
75 |
- if test "$ac_cv_lib_ldap_main" = "yes"; then |
| 80 |
- LDAPINCLUDE="-I/usr/include/ldap" |
76 |
- LDAPLIBS="-lldap -llber"\ |
| 81 |
+AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber) |
77 |
- LDAPINCLUDE="-I/usr/include/ldap" |
| 82 |
+if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then |
78 |
+ AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber) |
| 83 |
+ LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber"\ |
79 |
+ if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then |
| 84 |
+ LDAPINCLUDE="-I${LOCALBASE}/include" |
80 |
+ LDAPLIBS="-L${LOCALBSE}/lib -lldap -llber" |
| 85 |
AC_SUBST(LDAPLIBS) |
81 |
+ LDAPINCLUDE="-I${LOCALBASE}/include" |
| 86 |
AC_SUBST(LDAPINCLUDE) |
82 |
AC_SUBST(LDAPLIBS) |
| 87 |
+ LIBS="-L${LOCALBASE}/lib $LIBS" |
83 |
AC_SUBST(LDAPINCLUDE) |
| 88 |
AC_CHECK_FUNCS(ldap_set_option) |
84 |
+ LIBS="-L${LOCALBASE}/lib $LIBS" |
| 89 |
EXTRAS="$EXTRAS check_ldap" |
85 |
AC_CHECK_FUNCS(ldap_set_option) |
| 90 |
AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) |
86 |
EXTRAS="$EXTRAS check_ldap" |
| 91 |
@@ -280,6 +285,7 @@ |
87 |
AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) |
| 92 |
AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).]) |
88 |
@@ -729,22 +726,10 @@ |
| 93 |
fi |
|
|
| 94 |
LIBS="$_SAVEDLIBS" |
| 95 |
+fi |
| 96 |
|
| 97 |
dnl Check for headers used by check_ide_smart |
| 98 |
AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no) |
| 99 |
@@ -597,22 +603,10 @@ |
| 100 |
dnl ac_cv_ps_cols=8 |
89 |
dnl ac_cv_ps_cols=8 |
| 101 |
dnl AC_MSG_RESULT([$ac_cv_ps_command]) |
90 |
dnl AC_MSG_RESULT([$ac_cv_ps_command]) |
| 102 |
|
91 |
|
|
Lines 122-128
Link Here
|
| 122 |
then |
111 |
then |
| 123 |
ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
112 |
ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
| 124 |
ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" |
113 |
ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" |
| 125 |
@@ -620,9 +614,8 @@ |
114 |
@@ -752,9 +737,8 @@ |
| 126 |
ac_cv_ps_cols=9 |
115 |
ac_cv_ps_cols=9 |
| 127 |
AC_MSG_RESULT([$ac_cv_ps_command]) |
116 |
AC_MSG_RESULT([$ac_cv_ps_command]) |
| 128 |
|
117 |
|
|
Lines 134-140
Link Here
|
| 134 |
elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ |
123 |
elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ |
| 135 |
egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null |
124 |
egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null |
| 136 |
then |
125 |
then |
| 137 |
@@ -632,209 +625,6 @@ |
126 |
@@ -764,209 +748,6 @@ |
| 138 |
ac_cv_ps_cols=9 |
127 |
ac_cv_ps_cols=9 |
| 139 |
AC_MSG_RESULT([$ac_cv_ps_command]) |
128 |
AC_MSG_RESULT([$ac_cv_ps_command]) |
| 140 |
|
129 |
|
|
Lines 344-352
Link Here
|
| 344 |
else |
333 |
else |
| 345 |
AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled]) |
334 |
AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled]) |
| 346 |
fi |
335 |
fi |
| 347 |
@@ -1212,6 +1002,8 @@ |
336 |
@@ -1354,6 +1135,8 @@ |
| 348 |
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who", |
337 |
AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares]) |
| 349 |
[path and arguments for invoking 'who']) |
338 |
fi |
| 350 |
|
339 |
|
| 351 |
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp) |
340 |
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp) |
| 352 |
+if test x$enable_snmp = xyes; then |
341 |
+if test x$enable_snmp = xyes; then |
|
Lines 353-359
Link Here
|
| 353 |
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) |
342 |
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) |
| 354 |
AC_ARG_WITH(snmpget_command, |
343 |
AC_ARG_WITH(snmpget_command, |
| 355 |
ACX_HELP_STRING([--with-snmpget-command=PATH], |
344 |
ACX_HELP_STRING([--with-snmpget-command=PATH], |
| 356 |
@@ -1242,7 +1034,10 @@ |
345 |
@@ -1384,7 +1167,10 @@ |
| 357 |
else |
346 |
else |
| 358 |
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) |
347 |
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) |
| 359 |
fi |
348 |
fi |
|
Lines 364-370
Link Here
|
| 364 |
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) |
353 |
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) |
| 365 |
AC_PATH_PROG(PATH_TO_QSTAT,qstat) |
354 |
AC_PATH_PROG(PATH_TO_QSTAT,qstat) |
| 366 |
AC_ARG_WITH(qstat_command, |
355 |
AC_ARG_WITH(qstat_command, |
| 367 |
@@ -1267,7 +1062,10 @@ |
356 |
@@ -1409,7 +1195,10 @@ |
| 368 |
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", |
357 |
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", |
| 369 |
[path to qstat/quakestat]) |
358 |
[path to qstat/quakestat]) |
| 370 |
fi |
359 |
fi |
|
Lines 373-381
Link Here
|
| 373 |
+AC_ARG_ENABLE(fping,--enable-fping compile check_fping) |
362 |
+AC_ARG_ENABLE(fping,--enable-fping compile check_fping) |
| 374 |
+if test x$enable_fping = xyes; then |
363 |
+if test x$enable_fping = xyes; then |
| 375 |
AC_PATH_PROG(PATH_TO_FPING,fping) |
364 |
AC_PATH_PROG(PATH_TO_FPING,fping) |
| 376 |
AC_ARG_WITH(fping_command, |
365 |
AC_PATH_PROG(PATH_TO_FPING6,fping6) |
| 377 |
ACX_HELP_STRING([--with-fping-command=PATH], |
366 |
|
| 378 |
@@ -1279,6 +1077,7 @@ |
367 |
@@ -1430,6 +1219,7 @@ |
| 379 |
else |
368 |
else |
| 380 |
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) |
369 |
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) |
| 381 |
fi |
370 |
fi |
|
Lines 383-389
Link Here
|
| 383 |
|
372 |
|
| 384 |
AC_PATH_PROG(PATH_TO_SSH,ssh) |
373 |
AC_PATH_PROG(PATH_TO_SSH,ssh) |
| 385 |
AC_ARG_WITH(ssh_command, |
374 |
AC_ARG_WITH(ssh_command, |
| 386 |
@@ -1346,32 +1145,12 @@ |
375 |
@@ -1497,32 +1287,12 @@ |
| 387 |
dnl end if for PATH_TO_SWAP |
376 |
dnl end if for PATH_TO_SWAP |
| 388 |
fi |
377 |
fi |
| 389 |
|
378 |
|