From: Michael Adam <obnox@samba.org>
Date: Wed, 16 May 2007 11:15:16 +0000 (+0000)
Subject: r22931: Fix logic in detection of the need to replace dlopen and friends.
X-Git-Tag: samba-4.0.0alpha6~801^2~5856
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f1d0a2d8fb786f3ad823f02ab818598407a3353;p=thirdparty%2Fsamba.git

r22931: Fix logic in detection of the need to replace dlopen and friends.
Originally, dlfcn.o was only added to LIBREPLACEOBJ if dlopen
was found in libdl but header dlfcn.h was not appropriate.

Michael
(This used to be commit 2c72980a808a9ebe5518c6e03baa66e6b97cc7db)
---

diff --git a/source3/lib/replace/dlfcn.m4 b/source3/lib/replace/dlfcn.m4
index 2d5b2c5141a..d42409ac630 100644
--- a/source3/lib/replace/dlfcn.m4
+++ b/source3/lib/replace/dlfcn.m4
@@ -2,17 +2,18 @@ dnl dummies provided by dlfcn.c if not available
 save_LIBS="$LIBS"
 LIBS=""
 
+libreplace_cv_dlfcn=no
 AC_SEARCH_LIBS(dlopen, dl)
 
-if test "$ac_cv_search_dlopen" != no; then
+if test x"${ac_cv_search_dlopen}" = x"no"; then
+	libreplace_cv_dlfcn=yes
+else
 	AC_CHECK_HEADERS(dlfcn.h)
-
-	libreplace_cv_dlfcn=no
 	AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes])
+fi
 
-	if test x"${libreplace_cv_dlfcn}" = x"yes";then
-		LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
-	fi
+if test x"${libreplace_cv_dlfcn}" = x"yes";then
+	LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
 fi
 
 LIBDL="$LIBS"