From 2c72980a808a9ebe5518c6e03baa66e6b97cc7db Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 16 May 2007 11:15:16 +0000 Subject: 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 --- source/lib/replace/dlfcn.m4 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source') 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" -- cgit