fb1f7d52bfa6cef6c2b471ff3981e2a6 samba-2.2.0.tar.gz

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

diff --git a/samba-autoconf.patch b/samba-autoconf.patch
index a58fb3b4d514e0e5f6d2d01b8f44786196312fb5..4b3b79715d0c7cd8dc8e97937e1e6577d4e72f64 100644 (file)
--- a/samba-autoconf.patch
+++ b/samba-autoconf.patch
@@ -1,38 +1,21 @@
---- samba-2.0.6/source/configure.in.nsl        Wed Nov 10 21:35:56 1999
-+++ samba-2.0.6/source/configure.in    Thu Mar 16 15:57:05 2000
-@@ -14,6 +14,7 @@
- AC_SUBST(WRAP32)
- AC_SUBST(PICFLAG)
- AC_SUBST(SHLIBEXT)
-+AC_SUBST(CLIENT_LIBS)
+diff -urN samba-2.2.0.org/source/configure.in samba-2.2.0/source/configure.in
+--- samba-2.2.0.org/source/configure.in        Wed Apr 18 01:27:35 2001
++++ samba-2.2.0/source/configure.in    Wed Apr 18 01:29:23 2001
+@@ -483,7 +483,7 @@
+     AC_CHECK_HEADERS(readline/history.h)
  
- # compile with optimisation and without debugging by default
- CFLAGS=${CFLAGS-"-O"}
-@@ -298,7 +299,7 @@
- # test for where we get readline() from
- if test "$ac_cv_header_readline_h" = "yes" ||
-    test "$ac_cv_header_readline_readline_h" = "yes"; then
--  AC_CHECK_LIB(readline,readline)
-+  AC_CHECK_LIB(readline, readline, [CLIENT_LIBS="$CLIENT_LIBS -lreadline"])
- fi
+     AC_CHECK_HEADERS(readline.h readline/readline.h,[
+-      for termlib in ncurses curses termcap terminfo termlib; do
++      for termlib in tinfo ncurses curses termcap terminfo termlib; do
+        AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
+       done
+       AC_CHECK_LIB(readline, rl_callback_handler_install,
+@@ -510,7 +510,7 @@
+     AC_CHECK_HEADERS(readline/history.h)
  
- 
---- samba-2.0.6/source/Makefile.in.nsl Thu Mar 16 17:24:31 2000
-+++ samba-2.0.6/source/Makefile.in     Thu Mar 16 15:11:02 2000
-@@ -8,6 +8,7 @@
- mandir=@mandir@
- 
- LIBS=@LIBS@
-+CLIENT_LIBS=@CLIENT_LIBS@
- CC=@CC@
- CFLAGS=@CFLAGS@
- CPPFLAGS=@CPPFLAGS@
-@@ -370,7 +371,7 @@
- 
- bin/smbclient: $(CLIENT_OBJ) bin/.dummy
-       @echo Linking $@
--      @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS)
-+      @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS) $(CLIENT_LIBS)
- 
- bin/smbspool: $(CUPS_OBJ) bin/.dummy
-       @echo Linking $@
+     AC_CHECK_HEADERS(readline.h readline/readline.h,[
+-      for termlib in ncurses curses termcap terminfo termlib; do
++      for termlib in tinfo ncurses curses termcap terminfo termlib; do
+        AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
+       done
+       AC_CHECK_LIB(readline, rl_callback_handler_install,