Patch #:	44
Type:		operational change
Priority:	none
Modification:	add an option to restrict CAP builds to the current directory
Modification:	fix Configure bugs for A/UX
Submitted:	David Hornsby <djh@munnari.OZ.AU>
Submitted:	Bill Douglas <xdaa374@emx.utexas.edu>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch044
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch044'
Summary:	fix typo, add another question/answer session
File:		cap60/Configure

*** Configure.orig	Sun Jul 14 21:26:52 1991
--- Configure		Mon Jul 29 02:36:57 1991
***************
*** 1,7 ****
  #!/bin/sh
! # $Author: djh $ $Date: 1991/07/14 11:26:42 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.14 1991/07/14 11:26:42 djh Rel djh $
! # $Revision: 2.14 $
  # 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: 1991/07/28 16:36:28 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.15 1991/07/28 16:36:28 djh Rel djh $
! # $Revision: 2.15 $
  # 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)
  # 
***************
*** 258,263 ****
--- 258,264 ----
  etherpobjs="define([etherpobjs],[])"
  lapobj="define([lapobj],[abkip.o abddp.o abnbp.o atalkdbm.o])"
  usingphase2="# define([usephase2],1)"
+ singletree="# define([debug],1)"
  result=0
  usephase2=0
  uabsupport=0
***************
*** 422,433 ****
    fi
  fi
  if [ $useauxappletalk -ne 0 ]; then
!   labobj="define([lapobj],[abauxddp.o abauxnbp.o])"
  fi
  if [ $usephase2 -ne 0 ]; then
    usingphase2="define([usephase2],1)"
  fi
  echo
  echo "CAP can be configured for various optional features."
  echo "For more information, refer to the file 'CAP60.README'."
  echo
--- 423,454 ----
    fi
  fi
  if [ $useauxappletalk -ne 0 ]; then
!   lapobj="define([lapobj],[abauxddp.o abauxnbp.o])"
  fi
  if [ $usephase2 -ne 0 ]; then
    usingphase2="define([usephase2],1)"
  fi
  echo
+ echo "CAP can be setup to occupy a single directory tree (for testing)."
+ result=0
+ while :
+ do
+   echo $newl "Do you wish to restrict CAP to this subdirectory (default no) ? "
+   read ans
+   if [ -z "${ans}" ]; then
+     ans="no"
+   fi
+   case ${ans} in
+     "yes"|"y") result=1; break;;
+     "no" |"n") result=0; break;;
+     *) echo "you must answer yes or no or carriage return for no." ;;
+   esac
+ done
+ if [ $result -ne 0 ]; then
+   echo "OK, using" ${mydir} "as the CAP root directory."
+   singletree="define([debug],1)"
+ fi
+ echo
  echo "CAP can be configured for various optional features."
  echo "For more information, refer to the file 'CAP60.README'."
  echo
***************
*** 810,815 ****
--- 831,839 ----
  echo "# The following selects byteswapping or otherwise"
  echo "${byteswapping}"
  echo
+ echo "# We use the debug flag to restrict CAP to a single directory tree"
+ echo "${singletree}"
+ echo
  echo "# uncomment if your param.h includes types.h and types.h doesn't"
  echo "# prevent itself from being included twice"
  echo "# define _TYPES"
***************
*** 819,825 ****
  
  #define([columbia],1) # so columbia can do things quickly
  #define([rutgers],1) # so rutgers can do things quickly
- #define([debug],1) # testing things (without disrupting)
  
  # location of include files
  define([includedir],[[/usr/include]])
--- 843,848 ----
***************
*** 1032,1039 ****
  	define([lflags],concat(lflags,[ -n]))])
  
  # check to see if we need sysvinstall usage
! ifelse(os,[aux], [define([sysvinstall],[yes])],
!        os,[hpux],[define([sysvinstall],[yes])],
         os,[irix],[define([sysvinstall],[yes])])
  
  # or if we really want to use install
--- 1055,1061 ----
  	define([lflags],concat(lflags,[ -n]))])
  
  # check to see if we need sysvinstall usage
! ifelse(os,[hpux],[define([sysvinstall],[yes])],
         os,[irix],[define([sysvinstall],[yes])])
  
  # or if we really want to use install
*** README.orig		Mon Jul 29 02:35:16 1991
--- README		Mon Jul 29 02:35:53 1991
***************
*** 3,9 ****
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 43, July 1991
  
  Introduction
  ------------
--- 3,9 ----
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 44, July 1991
  
  Introduction
  ------------