standardize localization string

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index 8e971dde2dc90a023f9d3f5bfc04290697be905c..17bc5abb869514039aef3d0a2c5ca3d5f531f461 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.50)
-AC_INIT(nagios-plugins,1.4.0alpha2)
+AC_INIT(nagios-plugins,1.4.0-alpha3)
 AC_CONFIG_SRCDIR(Helper.pm)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -33,7 +33,7 @@ jm_PREREQ_ERROR
 AC_FUNC_ERROR_AT_LINE
 
 AC_CONFIG_LIBOBJ_DIR(lib)
-AC_FUNC_GETLOADAVG($topdir/lib)
+AC_FUNC_GETLOADAVG([lib])
 
 ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD])
 dnl AM_WITH_REGEX
@@ -420,7 +420,9 @@ fi
 dnl Check for OpenSSL header files
 unset FOUNDINCLUDE
 _SAVEDCPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I$OPENSSL/include"
+if test "$OPENSSL" != "/usr"; then
+  CPPFLAGS="$CPPFLAGS -I$OPENSSL/include"
+fi
 AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h,
                  SSLINCLUDE="-I$OPENSSL/include"
                  FOUNDINCLUDE=yes,
@@ -449,7 +451,7 @@ dnl test headers and libs to decide whether check_http should use SSL
 if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
   if test "$ac_cv_lib_ssl_main" = "yes"; then
     if test "$FOUNDINCLUDE" = "yes"; then
-      check_tcp_ssl="check_simap check_spop"
+      check_tcp_ssl="check_simap check_spop check_jabber check_nntps"
       AC_SUBST(check_tcp_ssl)
       AC_SUBST(SSLLIBS)
       AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
@@ -467,7 +469,13 @@ AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(signal.h strings.h string.h syslog.h uio.h errno.h regex.h sys/types.h sys/time.h sys/socket.h sys/loadavg.h)
 AC_CHECK_HEADERS(features.h stdarg.h sys/unistd.h ctype.h stdlib.h)
-AC_CHECK_HEADERS(limits.h sys/param.h sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h fcntl.h sys/statfs.h sys/dustat.h sys/statvfs.h)
+AC_CHECK_HEADERS(limits.h sys/param.h)
+AC_CHECK_HEADERS([sys/mount.h],[],[],[
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
+AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h fcntl.h sys/statfs.h sys/dustat.h sys/statvfs.h)
 
 # glibc 2.3.2 stdlib.h does not define HUGE_VAL (see man strtod)
 AC_MSG_CHECKING([for HUGE_VAL in <stdlib.h>])
@@ -555,12 +563,22 @@ if test x"$ac_cv_compiler_supports_ll" = x"yes"; then
    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_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
 AC_TRY_LINK([#include <stdarg.h>
-va_list ap1,ap2;], [__va_copy(ap1,ap2);],
-ac_cv_HAVE_VA_COPY=yes,ac_cv_HAVE_VA_COPY=no)])
+va_list ap1,ap2;], [va_copy(ap1,ap2);],
+ac_cv_HAVE_VA_COPY=yes,
+ac_cv_HAVE_VA_COPY=no)])
 if test x"$ac_cv_HAVE_VA_COPY" = x"yes"; then
-    AC_DEFINE(HAVE_VA_COPY,1,[Define if system has va_copy])
+    AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
+else    
+    AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE___VA_COPY,[
+    AC_TRY_LINK([#include <stdarg.h>
+    va_list ap1,ap2;], [__va_copy(ap1,ap2);],
+    ac_cv_HAVE___VA_COPY=yes,
+    ac_cv_HAVE___VA_COPY=no)])
+    if test x"$ac_cv_HAVE___VA_COPY" = x"yes"; then
+        AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available])
+    fi
 fi
 
 AC_CHECK_FUNCS(vsnprintf snprintf asprintf vasprintf)
@@ -1366,21 +1384,29 @@ dnl fwict, the 2-arg is an SVR4 standard, whereas the 3-arg is shared
 dnl in the various BSD's
 dnl
 
-AC_CHECK_HEADERS([sys/swap.h sys/stat.h sys/param.h])
+AC_CHECK_HEADERS([sys/swap.h], [], [], [
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
+AC_CHECK_HEADERS([sys/stat.h sys/param.h])
 AC_CHECK_DECLS([swapctl],,,[
                #include <unistd.h>
                #include <sys/types.h>
+              #include <sys/param.h>
                #include <sys/stat.h>
                #include <sys/swap.h>
                ])
 AC_CHECK_TYPES([swaptbl_t, swapent_t],,,[
                #include <sys/types.h>
+              #include <sys/param.h>
                #include <sys/stat.h>
                #include <sys/swap.h>
                ])
 AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[
                #include <unistd.h>
                #include <sys/types.h>
+              #include <sys/param.h>
                #include <sys/stat.h>
                #include <sys/swap.h>
                ])