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 7afa8d2a4707e999a380e747ccaae1de53a00251)

diff --git a/source4/lib/replace/dlfcn.m4 b/source4/lib/replace/dlfcn.m4
index 2d5b2c5141af48226059ef7ab314dfeea84193cc..d42409ac6301ccdc89eb72e9ee6ff7ff807ff79e 100644 (file)
--- a/source4/lib/replace/dlfcn.m4
+++ b/source4/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"