- 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 30b0481814a67cc044d529065a9180560bc8c003..116ca816d864d7d673b5f5b23616f27f090a0fe8 100644 (file)
--- a/samba-config.patch
+++ b/samba-config.patch
@@ -1,15 +1,3 @@
-diff -urN samba-2.2.1.org/source/Makefile.in samba-2.2.1/source/Makefile.in
---- samba-2.2.1.org/source/Makefile.in Sun Jul  8 22:29:34 2001
-+++ samba-2.2.1/source/Makefile.in     Wed Jul 11 19:56:04 2001
-@@ -49,7 +49,7 @@
- CONFIGFILE = $(CONFIGDIR)/smb.conf
- LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- DRIVERFILE = $(CONFIGDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
- 
 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
@@ -34,30 +22,6 @@ diff -urN samba-2.2.1.org/source/configure.in samba-2.2.1/source/configure.in
      with_pam_for_crypt=yes
      ;;
    *)
-@@ -1776,20 +1781,18 @@
-   yes)
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(WITH_SSL)
--    withval="/usr/local/ssl"     # default
--
-+    withval="/usr"     # default
-     if test "${with_sslinc+set}" = set; then
- 
-       withval="$with_sslinc"
-       case "$withval" in
-       yes|no)
-         echo "configure: warning: --with-sslinc called without argument - will use default" 1>&w
--        CFLAGS="-I/usr/local/ssl/include $CFLAGS"
-+       CFLAGS="-I/usr/include/openssl $CFLAGS"
-         LIBS="-lssl -lcrypto $LIBS"
--        LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS"
-       ;;
-         * )
--          CFLAGS="-I${withval} $CFLAGS"
-+        CFLAGS="-I${withval}/include/openssl $CFLAGS"
-         LIBS="-lssl -lcrypto $LIBS"
-         LDFLAGS="-L${withval}/lib $LDFLAGS"
-       ;;
 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