From: Tom Yu <tlyu@mit.edu>
Date: Tue, 1 Aug 2006 23:50:00 +0000 (+0000)
Subject: pull up r18331 from trunk
X-Git-Tag: krb5-1.5.1-beta1~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de6684d3cf6ed37a57793c5a20a07a97e4270414;p=krb5.git

pull up r18331 from trunk

 r18331@cathode-dark-space:  raeburn | 2006-07-17 13:55:54 -0400
 ticket: 3971
 target_version: 1.5.1
 tags: pullup

 (KRB5_AC_FIND_DLOPEN): Use AC_SEARCH_LIBS.


ticket: 3971
version_fixed: 1.5.5

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18398 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 5a080f8c3..8fd2f8d34 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -157,9 +157,14 @@ fi
 
 dnl find dlopen
 AC_DEFUN([KRB5_AC_FIND_DLOPEN],[
-AC_CHECK_LIB(dl, dlopen,[DL_LIB=-ldl
+old_LIBS="$LIBS"
+DL_LIB=
+AC_SEARCH_LIBS(dlopen, dl, [
+if test "$ac_cv_search_dlopen" != "none required"; then
+  DL_LIB=$ac_cv_search_dlopen
+fi
+LIBS="$old_LIBS"
 AC_DEFINE(USE_DLOPEN,1,[Define if dlopen should be used])])
-dnl AC_CHECK_LIB(ld, main, DL_LIB=-lld)
 AC_SUBST(DL_LIB)
 ])