Patch #: 84 Type: operational change Priority: none Modification: make atis et. al. optional for A/UX Modification: add -lbsd for A/UX signal handling Submitted: William Roberts Archived: munnari.OZ.AU mac/cap.patches/cap60.patch084 Application: 'cd cap60; patch -p < cap60.patches/cap60.patch084' Summary: add 'useatis' flag to Configure and Makefile.m4's File: cap60/Configure File: cap60/etc/makefile.m4 File: cap60/samples/Makefile.m4 File: cap60/contrib/Makefile.m4 File: cap60/contrib/printqueue.c *** Configure.orig Mon Nov 25 02:25:39 1991 --- Configure Sun Feb 16 21:32:32 1992 *************** *** 1,7 **** #!/bin/sh ! # $Author: djh $ $Date: 1991/11/24 15:25:20 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.31 1991/11/24 15:25:20 djh Rel djh $ ! # $Revision: 2.31 $ # 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/02/16 10:32:04 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.32 1992/02/16 10:32:04 djh Rel djh $ ! # $Revision: 2.32 $ # 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) # *************** *** 46,51 **** --- 46,52 ---- echo echo "MAJOR CONFIGURATION" + useatis=1 # Configure OS echo "Checking for Ultrix 4.0 or later versions of Ultrix" # Ultrix4.0 *************** *** 147,152 **** --- 148,154 ---- echo "Release 2.0 or greater" echo "(defaulting to native AppleTalk)" useauxappletalk=1 + useatis=0 lpd="lpr" else echo "Release 1.1.1 or less" *************** *** 283,288 **** --- 285,291 ---- etherpobjs="define([etherpobjs],[])" lapobj="define([lapobj],[abkip.o abddp.o abnbp.o atalkdbm.o])" usingphase2="# define([usephase2],1)" + usingatis="# define([useatis],1)" singletree="# define([debug],1)" result=0 usephase2=0 *************** *** 467,472 **** --- 470,478 ---- if [ $usephase2 -ne 0 ]; then usingphase2="define([usephase2],1)" fi + if [ $useatis -ne 0 ]; then + usingatis="define([useatis],1)" + fi echo echo "CAP can be setup to occupy a single directory tree (for testing)." result=0 *************** *** 855,860 **** --- 861,867 ---- echo $newl "[Hit carriage return to continue] " read ans echo "Creating ${of}" + rm -f ${of} exec > ${of} ${PCAT} <<\EOT define(`concat',$1$2$3$4$5$6$7$8$9) *************** *** 926,931 **** --- 933,941 ---- echo "# We use the debug flag to restrict CAP to a single directory tree" echo "${singletree}" echo + echo "# Systems with kernel AppleTalk support do not need atis" + echo "${usingatis}" + 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" *************** *** 989,995 **** ifelse(os,[aix],[ define([libspecial],concat(libspecial,[ -lbsd]))]) ifelse(os,[aux],[ ! define([libspecial],concat(libspecial,[ -lat]))]) ifelse(os,[hpux],[ define([libspecial],concat(libspecial,[ -lBSD]))]) --- 999,1005 ---- ifelse(os,[aix],[ define([libspecial],concat(libspecial,[ -lbsd]))]) ifelse(os,[aux],[ ! define([libspecial],concat(libspecial,[ -lat -lbsd]))]) ifelse(os,[hpux],[ define([libspecial],concat(libspecial,[ -lBSD]))]) *** etc/Makefile.m4.orig Tue Nov 19 01:41:44 1991 --- etc/Makefile.m4 Sun Feb 16 21:33:35 1992 *************** *** 7,13 **** # for other libraries (like BSD on hpux) SLIB=libspecial() ! PROGS=atis # aufs.c definitions: USEVPRINTF - use vprintf in logging ifdef([usevprintf],[],[#])ATISDEFS=-DUSEVPRINTF --- 7,14 ---- # for other libraries (like BSD on hpux) SLIB=libspecial() ! ifdef([useatis],[],[# ])ATISPROGS=atis ! PROGS=${ATISPROGS} # aufs.c definitions: USEVPRINTF - use vprintf in logging ifdef([usevprintf],[],[#])ATISDEFS=-DUSEVPRINTF *** samples/Makefile.m4.orig Sun Sep 22 15:57:11 1991 --- samples/Makefile.m4 Sun Feb 16 21:34:40 1992 *************** *** 11,18 **** # Make sure to define needgetopt if your system doesnt have it GETOPT=ifdef([needgetopt],[att_getopt.o]) ! PROGS=lwpr tlw atlook atlooklws atpinger iwpr isrv atistest ash \ ! instappl getzones DESTDIR=capdestdir() CAPLIB=libcap() --- 11,19 ---- # Make sure to define needgetopt if your system doesnt have it GETOPT=ifdef([needgetopt],[att_getopt.o]) ! ifdef([useatis],[],[# ])ATISPROGS=atistest ! PROGS=lwpr tlw atlook atlooklws atpinger iwpr isrv ash \ ! instappl getzones ${ATISPROGS} DESTDIR=capdestdir() CAPLIB=libcap() *** contrib/Makefile.m4.orig Sun Sep 22 15:56:19 1991 --- contrib/Makefile.m4 Sun Feb 16 21:35:47 1992 *************** *** 13,21 **** SDESTDIR=capsrvrdestdir() RENAMEFLAG=-DLWRENAMEFILE=lwrenamefile() ! SRVR=snitch lwrename printqueue USER=cvt2apple cvt2cap ! PROGS= ${SRVR} ${USER} all: ${PROGS} --- 13,23 ---- SDESTDIR=capsrvrdestdir() RENAMEFLAG=-DLWRENAMEFILE=lwrenamefile() ! ifdef([useatis],[],[# ])ATISPROGS=snitch ! ! SRVR=lwrename printqueue ${ATISPROGS} USER=cvt2apple cvt2cap ! PROGS= ${USER} ${SRVR} all: ${PROGS} *** contrib/printqueue.c.orig Sat Aug 31 19:39:15 1991 --- contrib/printqueue.c Sun Feb 16 21:37:18 1992 *************** *** 16,21 **** --- 16,24 ---- #include #endif NEEDFCNTLDOTH #include + #ifndef _TYPES + # include /* sometimes needed for sys/file.h */ + #endif _TYPES #include #include #ifdef USEDIRENT *** README.orig Sun Feb 16 21:38:01 1992 --- README Sun Feb 16 21:38:29 1992 *************** *** 3,9 **** (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 83, February 1992 Introduction ------------ --- 3,9 ---- (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 84, February 1992 Introduction ------------