svn commit: samba r20385 - in branches/SAMBA_3_0/source/lib/replace: .

metze at samba.org metze at samba.org
Thu Dec 28 17:17:16 GMT 2006


Author: metze
Date: 2006-12-28 17:17:16 +0000 (Thu, 28 Dec 2006)
New Revision: 20385

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20385

Log:
merge from samba4:

only try to find dlfcn.h if the dlopen symbol was found,
it hopefully fixes systems where dlfcn.h but no library with dlopen

metze
Modified:
   branches/SAMBA_3_0/source/lib/replace/dlfcn.m4


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/dlfcn.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/dlfcn.m4	2006-12-28 17:16:30 UTC (rev 20384)
+++ branches/SAMBA_3_0/source/lib/replace/dlfcn.m4	2006-12-28 17:17:16 UTC (rev 20385)
@@ -4,13 +4,15 @@
 
 AC_SEARCH_LIBS(dlopen, dl)
 
-AC_CHECK_HEADERS(dlfcn.h)
+if test "$ac_cv_search_dlopen" != no; then
+	AC_CHECK_HEADERS(dlfcn.h)
 
-libreplace_cv_dlfcn=no
-AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes])
+	libreplace_cv_dlfcn=no
+	AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes])
 
-if test x"${libreplace_cv_dlfcn}" = x"yes";then
-	LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
+	if test x"${libreplace_cv_dlfcn}" = x"yes";then
+		LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
+	fi
 fi
 
 LIBDL="$LIBS"



More information about the samba-cvs mailing list