summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-05-16 11:15:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:30 -0500
commit3e5335063a15dda4c21baab0961d766f30b21d84 (patch)
treed5abc97a31d6c8ef43b14cb992874f6c4fc1dd8c /source4/lib
parent5ca5e6bdf94fc80cfa3abca4876ac93f017348ae (diff)
downloadsamba-3e5335063a15dda4c21baab0961d766f30b21d84.tar.gz
samba-3e5335063a15dda4c21baab0961d766f30b21d84.tar.bz2
samba-3e5335063a15dda4c21baab0961d766f30b21d84.zip
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)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/replace/dlfcn.m413
1 files changed, 7 insertions, 6 deletions
diff --git a/source4/lib/replace/dlfcn.m4 b/source4/lib/replace/dlfcn.m4
index 2d5b2c5141..d42409ac63 100644
--- 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"