Properly handle SMTP server responses which are split into multiple

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index a53ef4f009d791019acd5bab21bb539367b353f0..9067978aa6a7a532d32154063d1bdb31e2b19ab3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION ($Revision$)
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.4.7)
+AC_INIT(nagios-plugins,1.4.9)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES(gl/Makefile)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -155,7 +155,7 @@ AC_SUBST(MATHLIBS)
 
 dnl Check for libtap, to run perl-like tests
 AC_CHECK_LIB(tap, plan_tests, 
-       EXTRA_TEST="test_utils test_disk"
+       EXTRA_TEST="test_utils test_disk test_tcp"
        AC_SUBST(EXTRA_TEST)
        )
 
@@ -240,13 +240,26 @@ else
 fi
 LIBS="$_SAVEDLIBS"
 
+dnl Check for headers used by check_ide_smart
+AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
+if test "$FOUNDINCLUDE" = "yes" ; then
+       AC_CHECK_HEADER(linux/types.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
+fi
+
+if test "$FOUNDINCLUDE" = "yes" ; then
+       EXTRAS="$EXTRAS check_ide_smart"
+else
+       AC_MSG_WARN([Skipping check_ide_smart plugin.]) 
+       AC_MSG_WARN([check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.]) 
+fi
+
 dnl Check for mysql libraries
 np_mysqlclient
 if test $with_mysql = "no" ; then
   AC_MSG_WARN([Skipping mysql plugin])
   AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
 else
-  EXTRAS="$EXTRA check_mysql check_mysql_query"
+  EXTRAS="$EXTRAS check_mysql check_mysql_query"
   MYSQLINCLUDE="$np_mysql_include"
   MYSQLLIBS="$np_mysql_libs"
   MYSQLCFLAGS="$np_mysql_cflags"
@@ -1054,6 +1067,14 @@ if test -n "$ac_cv_nslookup_command"; then
        AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup])
 fi
 
+AC_MSG_CHECKING([for number of cpus])
+AC_TRY_COMPILE([#include <unistd.h>],
+       [sysconf(_SC_NPROCESSORS_CONF) > 0;],
+       AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus])
+       AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]),
+       AC_MSG_RESULT([cannot calculate])
+       )
+
 AC_PATH_PROG(PATH_TO_UPTIME,uptime)
 AC_ARG_WITH(uptime_command,
             ACX_HELP_STRING([--with-uptime-command=PATH],
@@ -1429,6 +1450,9 @@ elif test -f ../plugins/check_nt.c ; then
 fi
 
 
+dnl used in check_dhcp
+AC_CHECK_HEADERS(sys/sockio.h)
+
 case $host in
        *bsd*)
                AC_DEFINE(__bsd__,1,[bsd specific code in check_dhcp.c])
@@ -1450,7 +1474,7 @@ AC_SUBST(EXTRA_NETOBJS)
 AC_SUBST(DEPLIBS)
 
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 
 dnl Check for Redhat spopen problem
 dnl Wierd problem where ECHILD is returned from a wait call in error
@@ -1479,6 +1503,16 @@ elif test "$ac_cv_enable_redhat_pthread_workaround" = "yes" ; then
        AC_DEFINE(REDHAT_SPOPEN_ERROR, 1, [Forced workaround on redhat in spopen])
 fi
 
+dnl Perl modules
+AC_ARG_ENABLE(perl-modules,
+       AC_HELP_STRING([--enable-perl-modules], 
+               [Enables installation of Nagios::Plugin and its dependencies (default: no)]),
+       [enable_perl_modules=$enableval],
+       [enable_perl_modules=no])
+if test "$enable_perl_modules" = "yes" ; then
+  AC_SUBST(PERLMODS_DIR,perlmods)
+fi
+
 dnl External libraries - see ACKNOWLEDGEMENTS
 gl_INIT
 
@@ -1497,6 +1531,7 @@ AC_OUTPUT(
   plugins-scripts/subst 
   plugins-scripts/utils.pm 
   plugins-scripts/utils.sh 
+  perlmods/Makefile
   command.cfg 
   test.pl 
   pkg/solaris/pkginfo 
@@ -1534,6 +1569,7 @@ ACX_FEATURE([with],[mysql])
 ACX_FEATURE([with],[openssl])
 ACX_FEATURE([with],[gnutls])
 ACX_FEATURE([with],[perl])
+ACX_FEATURE([enable],[perl-modules])
 ACX_FEATURE([with],[cgiurl])
 ACX_FEATURE([with],[trusted-path])