Merge branch 'checktalloc' of /home/jelmer/samba4

diff --combined source3/Makefile.in
index 6b0a1516d0de043148a565ad20a923269a9ec24a,56080841db84ca4e3f44bce87d66bba54d8218f4..f69c39b6e46af06f7fcf9352e58e7ed2384ccb92
--- 1/source3/Makefile.in
--- 2/source3/Makefile.in
+++ b/source3/Makefile.in
@@@ -88,12 -88,11 +88,11 @@@ UNINSTALLLIBCMD_A=@UNINSTALLLIBCMD_A
  VPATH=@srcdir@
  srcdir=@abs_srcdir@
  builddir=@abs_builddir@
- SHELL=/bin/sh
- DESTDIR=/
- 
  # XXX: Perhaps this should be @SHELL@ instead -- apparently autoconf
  # will search for a POSIX-compliant shell, and that might not be
  # /bin/sh on some platforms.  I guess it's not a big problem -- mbp
+ SHELL=/bin/sh
+ DESTDIR=/
  
  # See the autoconf manual "Installation Directory Variables" for a
  # discussion of the subtle use of these variables.
@@@ -457,7 -456,7 +456,7 @@@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/
             libsmb/clireadwrite.o libsmb/clilist.o libsmb/cliprint.o \
             libsmb/clitrans.o libsmb/clisecdesc.o libsmb/clidgram.o \
             libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \
 -             libsmb/credentials.o libsmb/pwd_cache.o \
 +             libsmb/credentials.o \
             libsmb/clioplock.o libsmb/clirap2.o \
             libsmb/smb_seal.o libsmb/async_smb.o \
             $(LIBSAMBA_OBJ) \
@@@ -667,7 -666,6 +666,7 @@@ VFS_READAHEAD_OBJ = modules/vfs_readahe
  VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
  VFS_FILEID_OBJ = modules/vfs_fileid.o
  VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
 +VFS_PREOPEN_OBJ = modules/vfs_preopen.o
  VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
  VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
  VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
@@@ -2568,10 -2566,6 +2567,10 @@@ bin/aio_fork.@SHLIBEXT@: $(BINARY_PRERE
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ)
  
 +bin/preopen.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_PREOPEN_OBJ)
 +      @echo "Building plugin $@"
 +      @$(SHLD_MODULE) $(VFS_PREOPEN_OBJ)
 +
  bin/acl_xattr.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ACL_XATTR_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_ACL_XATTR_OBJ)

diff --combined source3/configure.in
index ab5e81fb3c58eb6492e1c58a4983d18d27fc427f,6d9e198244f3875d3595a72ee7cb79923414b0f3..98f41d61e547158047f55d063369e544ffc541dc
--- 1/source3/configure.in
--- 2/source3/configure.in
+++ b/source3/configure.in
@@@ -20,10 -20,29 +20,29 @@@ AC_SUBST(builddir
  
  m4_include(m4/samba_version.m4)
  m4_include(m4/check_path.m4)
+ m4_include(pkg.m4)
  
  AC_LIBREPLACE_CC_CHECKS
  
- m4_include(../lib/talloc/libtalloc.m4)
+ AC_ARG_ENABLE(external_libtalloc, [AS_HELP_STRING([--enable-external-libtalloc], [Enable external talloc [default=auto]])], 
+ [ enable_external_libtalloc=$enableval ], [ enable_external_libtalloc=auto ])
+ 
+ if test "x$enable_external_libtalloc" != xno
+ then
+       PKG_CHECK_MODULES(TALLOC, talloc >= 1.3.0, 
+               [ enable_external_libtalloc=yes ],
+               [ if x$enable_external_libtalloc = xyes; then 
+                       AC_MSG_ERROR([Unable to find libtalloc])
+             else 
+                       enable_external_libtalloc=no
+                 fi
+               ])
+ fi
+ 
+ if test "x$enable_external_libtalloc" = xno
+ then
+       m4_include(../lib/talloc/libtalloc.m4)
+ fi
  
  LIBTALLOC_OBJ0=""
  for obj in ${TALLOC_OBJ}; do
@@@ -417,7 -436,7 +436,7 @@@ dnl These have to be built static
  default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss2 rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
  
  dnl These are preferably build shared, and static if dlopen() is not available
 -default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer"
 +default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen"
  
  if test "x$developer" = xyes; then
     default_static_modules="$default_static_modules rpc_rpcecho"
@@@ -1177,10 -1196,13 +1196,10 @@@ if test x"$LIBUNWIND_PTRACE" != x"" ; t
  #endif
            ],
            [
 -              int main(int argc, const char ** argv)
 -              {
 -                      pid_t me = (pid_t)-1;
 -                      ptrace(PTRACE_ATTACH, me, 0, 0);
 -                      ptrace(PTRACE_DETACH, me, 0, 0);
 -                      return 0;
 -              }
 +              pid_t me = (pid_t)-1;
 +              ptrace(PTRACE_ATTACH, me, 0, 0);
 +              ptrace(PTRACE_DETACH, me, 0, 0);
 +              return 0;
            ],
            [
                AC_MSG_RESULT(yes)
@@@ -6182,7 -6204,6 +6201,7 @@@ SMB_MODULE(vfs_readahead, \$(VFS_READAH
  SMB_MODULE(vfs_tsmsm, \$(VFS_TSMSM_OBJ), "bin/tsmsm.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_fileid, \$(VFS_FILEID_OBJ), "bin/fileid.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_aio_fork, \$(VFS_AIO_FORK_OBJ), "bin/aio_fork.$SHLIBEXT", VFS)
 +SMB_MODULE(vfs_preopen, \$(VFS_PREOPEN_OBJ), "bin/preopen.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_syncops, \$(VFS_SYNCOPS_OBJ), "bin/syncops.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)
  SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", VFS)

diff --combined source3/samba4.m4
index 97a1a3ba19f30b4fcfe0667e6defe46168c76310,3a8b05ff3c93c1f50334f43308f6529a49d2c2fd..cfb7c1c75e16d8b2a309111464e83d9ae7763862
--- 1/source3/samba4.m4
--- 2/source3/samba4.m4
+++ b/source3/samba4.m4
@@@ -84,7 -84,7 +84,7 @@@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb 
  
  SMB_INCLUDE_MK(../lib/tdb/python.mk) 
  
 -SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = 0.9.3,
 +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = 0.9.4,
        [],[m4_include(../lib/tevent/samba.m4)]
  )
  
@@@ -152,6 -152,14 +152,14 @@@ f
  dnl Samba 4 files
  AC_SUBST(LD)
  AC_LIBREPLACE_SHLD_FLAGS
+ dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
+ LIB_REMOVE_USR_LIB(LDFLAGS)
+ LIB_REMOVE_USR_LIB(LIBS)
+ LIB_REMOVE_USR_LIB(KRB5_LIBS)
+ 
+ dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
+ CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
+ CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
  SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir])
                 
  oldbuilddir="$builddir"

diff --combined source4/configure.ac
index 87ed4d82513a62449ff758849488bc04d2273212,792e90131a9d4b1539d97198229fa8e1b5a5ae9d..a1eb4f4b468d9f194f26f1bcf7ac4737487afda4
--- 1/source4/configure.ac
--- 2/source4/configure.ac
+++ b/source4/configure.ac
@@@ -42,7 -42,7 +42,7 @@@ AC_CONFIG_FILES(param/samba-hostconfig.
  AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
  AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
  
- SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.1, [],
+ SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.3.0, [],
        [
                m4_include(../lib/talloc/libtalloc.m4)
                SMB_INCLUDE_MK(../lib/talloc/config.mk)
@@@ -59,7 -59,7 +59,7 @@@ SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb 
  
  SMB_INCLUDE_MK(../lib/tdb/python.mk) 
  
 -SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = 0.9.3,
 +SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = 0.9.4,
        [],[m4_include(../lib/tevent/samba.m4)]
  )