- support <asm/statfs.h> and <sys/statfs.h> conflict on alpha,ppc,sparc too

[packages/samba.git] / samba-config.patch

diff --git a/samba-config.patch b/samba-config.patch
index f4d1f41471e3cadf64e455a72cef3f43988e334d..116ca816d864d7d673b5f5b23616f27f090a0fe8 100644 (file)
--- a/samba-config.patch
+++ b/samba-config.patch
@@ -1,41 +1,30 @@
-diff -Nur samba-2.0.0/source/Makefile.in samba-2.0.0.pld/source/Makefile.in
---- samba-2.0.0/source/Makefile.in     Tue Jan 26 21:10:24 1999
-+++ samba-2.0.0.pld/source/Makefile.in Tue Jan 26 21:09:44 1999
-@@ -25,9 +25,9 @@
- BINDIR = @bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
--VARDIR = @localstatedir@
-+VARDIR = /var/log/samba
- MANDIR = @mandir@
+diff -urN samba-2.2.1.org/source/configure.in samba-2.2.1/source/configure.in
+--- samba-2.2.1.org/source/configure.in        Tue Jul 10 02:12:50 2001
++++ samba-2.2.1/source/configure.in    Wed Jul 11 20:00:03 2001
+@@ -656,6 +656,11 @@
+               AC_DEFINE(HAVE_STRCASECMP))
+ fi
  
- # The permissions to give the executables
-@@ -43,16 +43,16 @@
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
- # This is where smbpasswd et al go
--PRIVATEDIR = @privatedir@
-+PRIVATEDIR = $(LIBDIR)
- 
- SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
- SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
- 
- # This is where SWAT images and help files go
--SWATDIR = @swatdir@
-+SWATDIR = /usr/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
-diff -Nur samba-2.0.0/source/smbwrapper/smbsh.in samba-2.0.0.pld/source/smbwrapper/smbsh.in
---- samba-2.0.0/source/smbwrapper/smbsh.in     Wed Oct  7 06:43:09 1998
-+++ samba-2.0.0.pld/source/smbwrapper/smbsh.in Tue Jan 26 21:09:58 1999
++# Check for yp_get_default_domain in -lnsl (linux glibc2.1)
++#
++AC_LIBTESTFUNC(nsl, yp_get_default_domain)
++#
++
+ #
+ # Check for the functions putprpwnam, set_auth_parameters,
+ # getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
+@@ -1630,7 +1635,7 @@
+   yes)
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(WITH_PAM)
+-    LIBS="$LIBS -lpam"
++    LIBS="$LIBS -ldl -lpam -lpamc"
+     with_pam_for_crypt=yes
+     ;;
+   *)
+diff -urN samba-2.2.1.org/source/smbwrapper/smbsh.in samba-2.2.1/source/smbwrapper/smbsh.in
+--- samba-2.2.1.org/source/smbwrapper/smbsh.in Wed Oct  7 06:43:09 1998
++++ samba-2.2.1/source/smbwrapper/smbsh.in     Wed Jul 11 20:00:35 2001
 @@ -1,6 +1,6 @@
  #! /bin/sh