Patch #:	181
Type:		operational change
Priority:	none
Modification:	make Configure ask for alternate include file location
Submitted:	David Hornsby <djh@munnari.OZ.AU>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch181
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch181'
Summary:	some sites mount /usr (and /usr/include) read-only
File:		cap60/Configure

*** Configure.orig	Tue Nov 30 20:26:27 1993
--- Configure		Tue Dec  7 03:39:46 1993
***************
*** 1,7 ****
  #!/bin/sh
! # $Author: djh $ $Date: 1993/11/30 09:26:16 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.71 1993/11/30 09:26:16 djh Rel djh $
! # $Revision: 2.71 $
  # 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: 1993/12/06 16:39:28 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.72 1993/12/06 16:39:28 djh Rel djh $
! # $Revision: 2.72 $
  # 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)
  # 
***************
*** 383,388 ****
--- 383,389 ----
  usingphase2="# define([usephase2],1)"
  usingatis="# define([useatis],1)"
  singletree="# define([debug],1)"
+ includefile="# define([includef],1)"
  result=0
  usephase2=0
  uabsupport=0
***************
*** 729,734 ****
--- 730,760 ----
  if [ $result -ne 0 ]; then
    echo "OK, using" ${mydir} "as the CAP root directory."
    singletree="define([debug],1)"
+ else
+   echo
+   result=0
+   while :
+   do
+     echo $newl "Look for my include files in other than /usr/include (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 $newl "Include file location (" ${mydir} ") ? "
+     read ans
+     if [ -n "${ans}" ]; then
+       mydir="${ans}"
+     fi
+     echo "OK, using include files in" ${mydir}
+     includefile="define([includef],1)"
+   fi
  fi
  echo
  echo "CAP can be configured for various optional features."
***************
*** 1288,1293 ****
--- 1314,1322 ----
  echo "# for testing purposes, e.g. testing new versions"
  echo "${singletree}"
  echo
+ echo "# The includef flag sets an alternate localtion for include files"
+ echo "${includefile}"
+ echo
  echo "# Systems with kernel AppleTalk support do not need atis"
  echo "${usingatis}"
  echo
***************
*** 1628,1633 ****
--- 1657,1668 ----
   define([build_here],1)
  # location of atalk.local, etc.
   define([etcdest],concat(cwd,[[[/etc]]]))
+ ])
+ 
+ ifdef([includef],[
+ # location of include files
+  define([includedir],[cwd])
+  define([cflags],concat(cflags,[ -I],includedir))
  ])
  
  ifdef([build_here],[
*** lib/cap/abversion.c.orig	Wed Dec  1 20:12:11 1993
--- lib/cap/abversion.c		Tue Dec  7 03:41:29 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1993/12/01 09:12:06 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.80 1993/12/01 09:12:06 djh Rel djh $
!  * $Revision: 2.80 $
   *
   */
  
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/12/06 16:41:22 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.81 1993/12/06 16:41:22 djh Rel djh $
!  * $Revision: 2.81 $
   *
   */
  
***************
*** 32,38 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 180;
    myversion.cv_rmonth = "December";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
--- 32,38 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 181;
    myversion.cv_rmonth = "December";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
*** README.orig		Wed Dec  1 20:12:49 1993
--- README		Tue Dec  7 03:42:22 1993
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 180, December 1993
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 181, December 1993
  
  Notice
  ------