Remove readline dependency for systems whose libedit.a has readline emulation.

I've finally learned enough autoconf voodoo to do this the right way :)
Also preliminary preparations for CUPS (IPP) support.

7 files changed, 193 insertions, 24 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 4c8cf6bce85..e13d3a99403 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 1999/11/16 21:23:03 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2000/01/19 00:42:41 jlam Exp $
 
 DISTNAME=	samba-2.0.6
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
@@ -8,7 +8,11 @@ MASTER_SITES=	ftp://ftp.samba.org/pub/samba/
 MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.samba.org/
 
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+
+.if !exists(/usr/include/readline.h)
 DEPENDS+=	readline-4.0:../../devel/readline
+.endif
 
 GNU_CONFIGURE=	yes
 
@@ -30,6 +34,9 @@ CONFIGURE_ARGS= --with-swatdir=${PREFIX}/share/swat \
 
 PLIST_SUBST+=	SAMBA_PRIVATE=${SAMBA_PRIVATE}
 
+pre-configure:
+	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/faq
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/textdocs
diff --git a/net/samba/files/patch-sum b/net/samba/files/patch-sum
index 26037e873bb..50d146e8629 100644
--- a/net/samba/files/patch-sum
+++ b/net/samba/files/patch-sum
@@ -1,4 +1,8 @@
-$NetBSD: patch-sum,v 1.3 1999/11/16 21:01:05 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/01/19 00:42:42 jlam Exp $
 
 MD5 (patch-aa) = ec7d06cb6906d123898042ddc1023de6
 MD5 (patch-ab) = 7964a37dc354868db4734997be75b2f8
+MD5 (patch-ac) = 22d4c0e385cfaebeb037880788e2c843
+MD5 (patch-ad) = 71024b4dc45dc0efb20dc8d23f473a62
+MD5 (patch-ae) = b147480c2a01874bb6cb4cbce2b7894c
+MD5 (patch-af) = 971f4a0975fbaa5bc11544248d4c7bfa
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
deleted file mode 100644
index e094c34f4bd..00000000000
--- a/net/samba/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.7 1999/11/16 21:01:05 jlam Exp $
-
---- configure.orig	Wed Oct 13 01:26:42 1999
-+++ configure	Tue Nov 16 10:40:35 1999
-@@ -3478,7 +3478,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lreadline  $LIBS"
-+LIBS="-lreadline -ltermcap  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3484 "configure"
- #include "confdefs.h"
-@@ -3512,7 +3512,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lreadline $LIBS"
-+  LIBS="-lreadline -ltermcap $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac
new file mode 100644
index 00000000000..08c696162fa
--- /dev/null
+++ b/net/samba/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.3 2000/01/19 00:42:43 jlam Exp $
+
+--- acconfig.h.orig	Wed Oct 13 01:26:21 1999
++++ acconfig.h	Tue Jan 18 14:12:29 2000
+@@ -78,7 +78,9 @@
+ #undef SIZEOF_INO_T
+ #undef SIZEOF_OFF_T
+ #undef STAT_STATVFS64
++#undef HAVE_READLINE
+ #undef HAVE_LIBREADLINE
++#undef HAVE_LIBEDIT
+ #undef HAVE_KERNEL_OPLOCKS
+ #undef HAVE_IRIX_SPECIFIC_CAPABILITIES
+ #undef HAVE_INT16_FROM_RPC_RPC_H
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
new file mode 100644
index 00000000000..22a2664029e
--- /dev/null
+++ b/net/samba/patches/patch-ad
@@ -0,0 +1,76 @@
+$NetBSD: patch-ad,v 1.1 2000/01/19 00:42:43 jlam Exp $
+
+--- client/client.c.orig	Wed Nov 10 21:35:59 1999
++++ client/client.c	Tue Jan 18 15:27:27 2000
+@@ -1588,22 +1588,19 @@
+ 	return True;
+ }
+ 
+-#if defined(HAVE_LIBREADLINE)
++#if defined(HAVE_READLINE)
+ #  if defined(HAVE_READLINE_HISTORY_H) || defined(HAVE_HISTORY_H)
+ /****************************************************************************
+ history
+ ****************************************************************************/
+ static void cmd_history(void)
+ {
+-	HIST_ENTRY **hlist;
+ 	register int i;
+ 
+-	hlist = history_list ();	/* Get pointer to history list */
+-	
+-	if (hlist)			/* If list not empty */
++	if (history_length)		/* If history is not empty */
+ 	{
+-		for (i = 0; hlist[i]; i++)	/* then display it */
+-			DEBUG(0, ("%d: %s\n", i, hlist[i]->line));
++		for (i = 1; i <= history_length; i++)	/* then display it */
++			DEBUG(0, ("%d: %s\n", i, history_get(i)->line));
+ 	}
+ }
+ #  endif 
+@@ -1664,7 +1661,7 @@
+   {"setmode",cmd_setmode,"filename <setmode string> change modes of file",{COMPL_REMOTE,COMPL_NONE}},
+   {"help",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}},
+   {"?",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}},
+-#ifdef HAVE_LIBREADLINE
++#ifdef HAVE_READLINE
+   {"history",cmd_history,"displays the command history",{COMPL_NONE,COMPL_NONE}},
+ #endif
+   {"!",NULL,"run a shell command on the local system",{COMPL_NONE,COMPL_NONE}},
+@@ -1724,7 +1721,7 @@
+ 	}
+ }
+ 
+-#ifndef HAVE_LIBREADLINE
++#ifndef HAVE_READLINE
+ /****************************************************************************
+ wait for keyboard activity, swallowing network packets
+ ****************************************************************************/
+@@ -1806,7 +1803,7 @@
+ 	pstring line;
+ 	char *ptr;
+ 
+-#ifdef HAVE_LIBREADLINE
++#ifdef HAVE_READLINE
+ /* Minimal readline support, 29Jun1999, s.xenitellis@rhbnc.ac.uk */
+ 	const int PromptSize = 2048;
+ 	char prompt_str[PromptSize];	/* This holds the buffer "smb: \dir1\> " */
+@@ -1817,7 +1814,7 @@
+ 	while (!feof(stdin)) {
+ 		fstring tok;
+ 		int i;
+-#ifdef HAVE_LIBREADLINE
++#ifdef HAVE_READLINE
+ 		if ( temp != (char *)NULL )
+ 		{
+ 			free( temp );	/* Free memory allocated every time by readline() */
+@@ -2197,7 +2194,7 @@
+ 
+ 	DEBUGLEVEL = 2;
+ 
+-#ifdef HAVE_LIBREADLINE
++#ifdef HAVE_READLINE
+ 	/* Allow conditional parsing of the ~/.inputrc file. */
+ 	rl_readline_name = "smbclient";
+ #endif    
diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae
new file mode 100644
index 00000000000..6896f249e81
--- /dev/null
+++ b/net/samba/patches/patch-ae
@@ -0,0 +1,55 @@
+$NetBSD: patch-ae,v 1.1 2000/01/19 00:42:43 jlam Exp $
+
+--- configure.in.orig	Wed Nov 10 21:35:56 1999
++++ configure.in	Tue Jan 18 14:12:29 2000
+@@ -220,9 +220,6 @@
+ AC_CHECK_TYPE(offset_t,loff_t)
+ AC_CHECK_TYPE(ssize_t, int)
+ 
+-# we need libcups for CUPS support...
+-AC_CHECK_LIB(cups,httpConnect)
+-
+ # we need libdl for PAM and the new VFS code
+ AC_CHECK_LIB(dl,main)
+ 
+@@ -298,7 +295,14 @@
+ # 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(termcap, tputs)
++    if test "$ac_cv_lib_termcap_tputs" = "yes"; then
++	AC_CHECK_LIB(edit, readline, , [AC_CHECK_LIB(readline, readline)])
++	if test "$ac_cv_lib_edit_readline" = "yes" ||
++	   test "$ac_cv_lib_readline_readline" = "yes"; then
++	    AC_DEFINE(HAVE_READLINE)
++	fi
++    fi
+ fi
+ 
+ 
+@@ -1036,6 +1040,24 @@
+     AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES)
+ fi
+ 
++
++#################################################
++# check for CUPS support
++AC_MSG_CHECKING(whether to use CUPS)
++AC_ARG_WITH(cups,
++[  --with-cups    Include CUPS support
++  --without-cups Don't include CUPS support (default)],
++[ case "$withval" in
++  yes)
++    AC_MSG_RESULT(yes)
++    AC_CHECK_LIB(cups, httpConnect)
++    ;;
++  *)
++    AC_MSG_RESULT(no)
++    ;;
++  esac ],
++  AC_MSG_RESULT(no)
++)
+ 
+ #################################################
+ # check for smbwrapper support
diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af
new file mode 100644
index 00000000000..1a3adec20c8
--- /dev/null
+++ b/net/samba/patches/patch-af
@@ -0,0 +1,35 @@
+$NetBSD: patch-af,v 1.1 2000/01/19 00:42:43 jlam Exp $
+
+--- include/includes.h.orig	Wed Nov 10 21:36:00 1999
++++ include/includes.h	Tue Jan 18 14:12:29 2000
+@@ -775,20 +775,20 @@
+ #define ULTRIX_AUTH 1
+ #endif
+ 
+-#ifdef HAVE_LIBREADLINE
+-#  ifdef HAVE_READLINE_READLINE_H
+-#    include <readline/readline.h>
+-#    ifdef HAVE_READLINE_HISTORY_H
+-#      include <readline/history.h>
++#ifdef HAVE_READLINE
++#  ifdef HAVE_READLINE_H
++#    include <readline.h>
++#    ifdef HAVE_HISTORY_H
++#      include <history.h>
+ #    endif
+ #  else
+-#    ifdef HAVE_READLINE_H
+-#      include <readline.h>
+-#      ifdef HAVE_HISTORY_H
+-#        include <history.h>
++#    ifdef HAVE_READLINE_READLINE_H
++#      include <readline/readline.h>
++#      ifdef HAVE_READLINE_HISTORY_H
++#        include <readline/history.h>
+ #      endif
+ #    else
+-#      undef HAVE_LIBREADLINE
++#      undef HAVE_READLINE
+ #    endif
+ #  endif
+ #endif