Code

Fix linking against OpenSSL where libdl is required
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>
Thu, 22 May 2008 08:25:41 +0000 (08:25 +0000)
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>
Thu, 22 May 2008 08:25:41 +0000 (08:25 +0000)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1998 f882894a-f735-0410-b71e-b25c423dba1c

NEWS
configure.in

diff --git a/NEWS b/NEWS
index 62cb47afb998f94f9b870b18731d1849e1779964..2bf0130b9365550afceae62c6593109d21f00c93 100644 (file)
--- 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
index 8ba09cb69916cbaec1e2b8be603c02c944ce006f..856f3aae9779a345f8ad1473e6b40d066a7a8d96 100644 (file)
@@ -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