aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> 2008-05-22 08:25:41 +0000
committerGravatar Thomas 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.
Added support for --extra-opts in all C plugins (disabled by default, see configure --help)
Fixed passive option in check_by_ssh
On non-skipped stderr, check_by_ssh now returns UNKNOWN or worse (result from command) instead of always UNKNOWN.
+ Fix linking against OpenSSL where libdl is required
1.4.11 13th December 2007
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
CPPFLAGS="$_SAVEDCPPFLAGS"
fi
+dnl *** The following block comes from wget configure.ac ***
+dnl Unfortunately, as of this writing (OpenSSL 0.9.6), the libcrypto
+dnl shared library doesn't record its dependency on libdl, so we
+dnl need to check for it ourselves so we won't fail to link due to a
+dnl lack of -ldl. Most OSes use dlopen(), but HP-UX uses
+dnl shl_load().
+AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB(dl,shl_load)
dnl openssl detection/configuration
if ! test x"$with_openssl" = x"no"; then