diff options
| author | Michael Adam <obnox@samba.org> | 2007-05-16 11:15:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:10 -0500 |
| commit | 4f1d0a2d8fb786f3ad823f02ab818598407a3353 (patch) | |
| tree | c3c8b797dce5e9192af90f680875d9ae60d0faf5 /source3/lib/replace | |
| parent | e24acb681b0f0d3a04c1ae50e6c68369e5edc115 (diff) | |
| download | samba-4f1d0a2d8fb786f3ad823f02ab818598407a3353.tar.gz samba-4f1d0a2d8fb786f3ad823f02ab818598407a3353.tar.bz2 samba-4f1d0a2d8fb786f3ad823f02ab818598407a3353.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 2c72980a808a9ebe5518c6e03baa66e6b97cc7db)
Diffstat (limited to 'source3/lib/replace')
| -rw-r--r-- | source3/lib/replace/dlfcn.m4 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/lib/replace/dlfcn.m4 b/source3/lib/replace/dlfcn.m4 index 2d5b2c5141..d42409ac63 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" |