summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-05-22 08:25:41 +0000
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-05-22 08:25:41 +0000
commit30b87e4bb8226ba0e761f2b0a8b540b461b7d095 (patch)
tree3f44e4f997c579599b3637d0f40a4702f761ef07
parentb52e63da65ac5db7affbd09e110904855f3b1ed7 (diff)
downloadmonitoring-plugins-30b87e4bb8226ba0e761f2b0a8b540b461b7d095.tar.gz
Fix linking against OpenSSL where libdl is required
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1998 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--NEWS1
-rw-r--r--configure.in8
2 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 62cb47af..2bf0130b 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ This file documents the major additions and syntax changes between releases.
25 Added support for --extra-opts in all C plugins (disabled by default, see configure --help) 25 Added support for --extra-opts in all C plugins (disabled by default, see configure --help)
26 Fixed passive option in check_by_ssh 26 Fixed passive option in check_by_ssh
27 On non-skipped stderr, check_by_ssh now returns UNKNOWN or worse (result from command) instead of always UNKNOWN. 27 On non-skipped stderr, check_by_ssh now returns UNKNOWN or worse (result from command) instead of always UNKNOWN.
28 Fix linking against OpenSSL where libdl is required
28 29
291.4.11 13th December 2007 301.4.11 13th December 2007
30 Fixed check_http regression in 1.4.10 where following redirects to 31 Fixed check_http regression in 1.4.10 where following redirects to
diff --git a/configure.in b/configure.in
index 8ba09cb6..856f3aae 100644
--- a/configure.in
+++ b/configure.in
@@ -337,6 +337,14 @@ if test "$FOUNDINCLUDE" = "no"; then
337 CPPFLAGS="$_SAVEDCPPFLAGS" 337 CPPFLAGS="$_SAVEDCPPFLAGS"
338fi 338fi
339 339
340dnl *** The following block comes from wget configure.ac ***
341dnl Unfortunately, as of this writing (OpenSSL 0.9.6), the libcrypto
342dnl shared library doesn't record its dependency on libdl, so we
343dnl need to check for it ourselves so we won't fail to link due to a
344dnl lack of -ldl. Most OSes use dlopen(), but HP-UX uses
345dnl shl_load().
346AC_CHECK_LIB(dl,dlopen)
347AC_CHECK_LIB(dl,shl_load)
340 348
341dnl openssl detection/configuration 349dnl openssl detection/configuration
342if ! test x"$with_openssl" = x"no"; then 350if ! test x"$with_openssl" = x"no"; then