Patch #:	106
Type:		operational change
Priority:	none
Modification:	make 'Configure' list available delivery methods
Submitted:	William Roberts <liam@dcs.qmw.ac.uk>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch106
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch106'
Summary:	list UAB/Native EtherTalk/Kernel EtherTalk if supported
File:		cap60/Configure

*** Configure.orig	Wed Jun 24 09:21:17 1992
--- Configure		Mon Jun 29 23:51:25 1992
***************
*** 1,7 ****
  #!/bin/sh
! # $Author: djh $ $Date: 1992/06/23 23:21:02 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.42 1992/06/23 23:21:02 djh Rel djh $
! # $Revision: 2.42 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
--- 1,7 ----
  #!/bin/sh
! # $Author: djh $ $Date: 1992/06/29 13:50:41 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.43 1992/06/29 13:50:41 djh Rel djh $
! # $Revision: 2.43 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
***************
*** 321,326 ****
--- 321,346 ----
  		ethersupport=0
  		;;
  esac
+ # Tell people their list of choices...
+ if [ ${uabsupport} -eq 1 -o ${ethersupport} -eq 1 \
+ 	-o ${kernelsupport} -eq 1 ]; then
+   echo "In addition to IPTalk (default), this operating system"
+   echo "can also support AppleTalk packets over EtherTalk via:"
+   echo
+   if [ ${uabsupport} -eq 1 ]; then
+       echo "    UAB (Unix AppleTalk Bridge)"
+   fi
+   if [ ${ethersupport} -eq 1 ]; then
+       echo "    Native EtherTalk"
+   fi
+   if [ ${kernelsupport} -eq 1 ]; then
+       echo "    Kernel AppleTalk"
+   fi
+   echo
+   echo  "See the README files and other documentation for further info."
+   echo
+ fi
+ 
  if [ ${uabsupport} -eq 1 ]; then
    result=0
    while :
***************
*** 984,990 ****
--- 1004,1016 ----
  echo "# The following selects byteswapping or otherwise"
  echo "${byteswapping}"
  echo
+ echo "# We use build_here to restrict CAP to a single directory tree"
+ echo "# but still using etcdest (see below) for the location of atalk.local"
+ echo "# and other configuration files"
+ echo "# define([build_here],1)"
+ echo
  echo "# We use the debug flag to restrict CAP to a single directory tree"
+ echo "# for testing purposes, e.g. testing new versions"
  echo "${singletree}"
  echo
  echo "# Systems with kernel AppleTalk support do not need atis"
***************
*** 1280,1291 ****
  #AUFSOSDEFS = aufsosdefs()
  
  ifdef([debug],[
  # location of include files
   define([includedir],[cwd])
  # location of des subroutine source (see lib/afp/README)
   define([desloc],[[../../extras]])
- # location of atalk.local, etc.
-  define([etcdest],concat(cwd,[[[/etc]]]))
  # location of user cap programs
   define([capdestdir],concat(cwd,[[[/bin]]]))
  # location of cap "server" programs (aufs, lwsrv, papif, uab etc.)
--- 1306,1321 ----
  #AUFSOSDEFS = aufsosdefs()
  
  ifdef([debug],[
+  define([build_here],1)
+ # location of atalk.local, etc.
+  define([etcdest],concat(cwd,[[[/etc]]]))
+ ])
+ 
+ ifdef([build_here],[
  # location of include files
   define([includedir],[cwd])
  # location of des subroutine source (see lib/afp/README)
   define([desloc],[[../../extras]])
  # location of user cap programs
   define([capdestdir],concat(cwd,[[[/bin]]]))
  # location of cap "server" programs (aufs, lwsrv, papif, uab etc.)
*** lib/cap/abversion.c.orig	Mon Jun 29 22:22:09 1992
--- lib/cap/abversion.c		Mon Jun 29 23:53:11 1992
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1992/06/29 12:22:01 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.5 1992/06/29 12:22:01 djh Rel djh $
!  * $Revision: 2.5 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1992/06/29 13:53:05 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.6 1992/06/29 13:53:05 djh Rel djh $
!  * $Revision: 2.6 $
  */
  
  /*
***************
*** 31,37 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 105;
    myversion.cv_rmonth = "June";
    myversion.cv_ryear = "1992";
    switch (lap_proto) {
--- 31,37 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 106;
    myversion.cv_rmonth = "June";
    myversion.cv_ryear = "1992";
    switch (lap_proto) {
*** README.orig		Mon Jun 29 22:25:28 1992
--- README		Mon Jun 29 23:54:17 1992
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 105, June 1992
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 106, June 1992
  
  Notice
  ------