Author: metze
Date: 2006-12-28 18:10:14 +0000 (Thu, 28 Dec 2006)
New Revision: 20387

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

Log:
merge from samba3:

remove unneeded dlopen related configure checks and includes
this is done by libreplace...

this hopefully fixes the build on HPUX 11.00

metze
Modified:
   branches/SAMBA_3_0_24/source/configure.in
   branches/SAMBA_3_0_24/source/include/includes.h


Changeset:
Modified: branches/SAMBA_3_0_24/source/configure.in
===================================================================
--- branches/SAMBA_3_0_24/source/configure.in   2006-12-28 18:09:32 UTC (rev 
20386)
+++ branches/SAMBA_3_0_24/source/configure.in   2006-12-28 18:10:14 UTC (rev 
20387)
@@ -857,7 +857,7 @@
 AC_CHECK_HEADERS(sys/un.h)
 AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h 
termio.h)
 AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h 
sys/sockio.h)
-AC_CHECK_HEADERS(sys/sysmacros.h dlfcn.h)
+AC_CHECK_HEADERS(sys/sysmacros.h)
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
 AC_CHECK_HEADERS(langinfo.h locale.h)
 AC_CHECK_HEADERS(xfs/libxfs.h)
@@ -975,11 +975,6 @@
 fi
 
 ############################################
-# we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins 
and the plugin loading code
-AC_SEARCH_LIBS(dlopen, [dl])
-# dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be 
set then
-
-############################################
 # check if the compiler can do immediate structures
 AC_CACHE_CHECK([if the compiler will optimize out function 
calls],samba_cv_optimize_out_funcation_calls, [
     AC_TRY_LINK([
@@ -1220,7 +1215,7 @@
     EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
 fi
 
-AC_CHECK_FUNCS(dlopen dlclose dlsym dlerror waitpid getcwd strdup strndup 
strnlen strerror chown fchown chmod fchmod chroot link mknod mknod64)
+AC_CHECK_FUNCS(waitpid getcwd strdup strndup strnlen strerror chown fchown 
chmod fchmod chroot link mknod mknod64)
 AC_CHECK_FUNCS(strtol strtoll strtoul strtoull strtouq __strtoull)
 AC_CHECK_FUNCS(fstat strchr utime utimes getrlimit fsync memset strlcpy 
strlcat setpgid)
 AC_CHECK_FUNCS(memmove vsnprintf snprintf asprintf vasprintf setsid glob 
strpbrk pipe crypt16 getauthuid)

Modified: branches/SAMBA_3_0_24/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0_24/source/include/includes.h     2006-12-28 18:09:32 UTC 
(rev 20386)
+++ branches/SAMBA_3_0_24/source/include/includes.h     2006-12-28 18:10:14 UTC 
(rev 20387)
@@ -897,12 +897,6 @@
 #define DEFAULT_SOCKET_OPTIONS ""
 #endif
 
-/* Load header file for dynamic linking stuff */
-
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
 /* dmalloc -- free heap debugger (dmalloc.org).  This should be near
  * the *bottom* of include files so as not to conflict. */
 #ifdef ENABLE_DMALLOC

Reply via email to