summaryrefslogtreecommitdiffstats
path: root/source
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 12:22:10 -0500
commit2c72980a808a9ebe5518c6e03baa66e6b97cc7db (patch)
treeb225c04d33f781ecd70f2e84411b852978d59336 /source
parent0bdf4f1a5937abd0ef266700115d74396bc1629c (diff)
downloadsamba-2c72980a808a9ebe5518c6e03baa66e6b97cc7db.tar.gz
samba-2c72980a808a9ebe5518c6e03baa66e6b97cc7db.tar.xz
samba-2c72980a808a9ebe5518c6e03baa66e6b97cc7db.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
Diffstat (limited to 'source')
-rw-r--r--source/lib/replace/dlfcn.m413
1 files changed, 7 insertions, 6 deletions
diff --git a/source/lib/replace/dlfcn.m4 b/source/lib/replace/dlfcn.m4
index 2d5b2c5141a..d42409ac630 100644
--- a/source/lib/replace/dlfcn.m4
+++ b/source/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"