Patch #: 68 Type: operational change Priority: none Modification: move various config parameters into m4.features Modification: minor bug fixes to define argument spacing Submitted: Edward Moy Reported: Rakesh Patel Reported: Tom Ivar Helbekkmo Reported: James Pearson Reported: JQ Johnson Archived: munnari.OZ.AU mac/cap.patches/cap60.patch068 Application: 'cd cap60; patch -p < cap60.patches/cap60.patch068' Summary: m4.features now handles AUFS & LWSRV options File: cap60/Configure *** Configure.orig Sun Nov 17 16:24:54 1991 --- Configure Sun Nov 17 23:21:43 1991 *************** *** 1,7 **** #!/bin/sh ! # $Author: djh $ $Date: 1991/11/17 05:24:41 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.29 1991/11/17 05:24:41 djh Rel djh $ ! # $Revision: 2.29 $ # 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/11/17 12:20:37 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.30 1991/11/17 12:20:37 djh Rel djh $ ! # $Revision: 2.30 $ # 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) # *************** *** 502,511 **** # Necessary preamble - please don't alter define(`concat',$1$2$3$4$5$6$7$8$9) define(`specialcflags',`') # # To change the feature set, simply uncomment the wanted defines(). ! # The Configure file will then use the customised version. For more details, ! # (especially regarding performance) refer to the file 'CAP60.README' # # + SHORT_NAMES adds short name support to AUFS for AppleShare PC. # define(`specialcflags',concat(specialcflags,` -DSHORT_NAMES')) --- 502,514 ---- # Necessary preamble - please don't alter define(`concat',$1$2$3$4$5$6$7$8$9) define(`specialcflags',`') + define(`aufsosflags',`') + define(`simpleflags',`') + define(`lwflags',`') # # To change the feature set, simply uncomment the wanted defines(). ! # The Configure file will then use the customised version. ! # For more details, refer to the file 'CAP60.README' # # + SHORT_NAMES adds short name support to AUFS for AppleShare PC. # define(`specialcflags',concat(specialcflags,` -DSHORT_NAMES')) *************** *** 558,563 **** --- 561,605 ---- # + AUFS_README links readme file into new user's top level # define(`specialcflags',concat(specialcflags,` -DAUFS_README')) # + # + # + # AUFS definable options (previously required editing m4.setup) + # + # + NONLXLATE for aufs + # define(`aufsosflags',concat(aufsosflags,` -DNONLXLATE')) + # + # + FULL_NCS_SUPPORT (National Character Support) for aufs + # define(`aufsosflags',concat(aufsosflags,` -DFULL_NCS_SUPPORT')) + # + # + GGTYPE="gid_t" (group ID type) for AUFS + # define(`aufsosflags',concat(aufsosflags,` -DGGTYPE="gid_t"')) + # + # + NOCHGRPEXEC don't exec chgrp, just use chown(2) 3rd arg. [Not for Sys V] + # define(`aufsosflags',concat(aufsosflags,` -DNOCHGRPEXEC')) + # + # + USEDIRSETGID set group ID bit on non-primary group dirs [SunOS/Sys V] + # define(`aufsosflags',concat(aufsosflags,` -DUSEDIRSETGID')) + # + # + NETWORKTRASH fix permissions on network trash stuff + # define(`aufsosflags',concat(aufsosflags,` -DNETWORKTRASH')) + # + # + # + # LWSRV definable options (previously required editing m4.setup) + # + # + LPRARGS passes arguments on lwsrv command line directly to lpr + # define(`lwflags',concat(lwflags,` -DLPRARGS')) + # + # + DOCNAME adds document name as a part of job name to lpr + # define(`lwflags',concat(lwflags,` -DDOCNAME')) + # + # + PAGECOUNT adds page count to job name (value is internal buffer size) + # define(`lwflags',concat(lwflags,` -DPAGECOUNT=512')) + # define(`simpleflags',concat(simpleflags,` -DPAGECOUNT=512')) + # + # + ADOBE_DSC2_CONFORMANT forces Adobe DSC2 conformance + # define(`simpleflags',concat(simpleflags,` -DADOBE_DSC2_CONFORMANT')) + # EOT0 result=0 if [ -f m4.features ]; then *************** *** 958,968 **** # WARNING: OS DEPENDENT # define([smartunixfinderinfo],1) # ! # Valid here are -DNONXLATE, -DFULL_NCS_SUPPORT ! # or GGTYPE="gid_t" # Others: USESTATFS, USEGETMNT, USECHOWN, USEQUOTA, USESUNQUOTA # are autoconfigured ! define([aufsosdefs],[]) # # lib/cap/authenticate.c: configuration file --- 1000,1010 ---- # WARNING: OS DEPENDENT # define([smartunixfinderinfo],1) # ! # Set -DNONLXLATE, -DFULL_NCS_SUPPORT, -DGGTYPE="gid_t" or -DNOCHGRPEXEC ! # in m4.features # Others: USESTATFS, USEGETMNT, USECHOWN, USEQUOTA, USESUNQUOTA # are autoconfigured ! define([aufsosdefs],[aufsosflags()]) # # lib/cap/authenticate.c: configuration file *************** *** 972,983 **** # # lwsrv: see applications/lwsrv/README # ! # Valid is: -DADOBE_DSC2_CONFORMANT ! define([simpleflags],[]) ! # ! # Valid are: -DDOCNAME, -DPAGECOUNT=buffer_size ! define([lwflags],[-DDOCNAME -DPAGECOUNT=512]) ! # and more later ... # # lwrename: set name of file containing list of printers to be renamed --- 1014,1020 ---- # # lwsrv: see applications/lwsrv/README # ! # lwflags and simpleflags are now defined in m4.features # # lwrename: set name of file containing list of printers to be renamed *************** *** 1138,1144 **** define([afposdefs], concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])), ifdef([X_LOCKF],[], ! [ifdef([X_FCNTLLOCKF],[-DLOCKFUSESFCNTL],[-DNOLOCKF])]))) # for aufs define([aufsosdefs], concat(aufsosdefs, --- 1175,1181 ---- define([afposdefs], concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])), ifdef([X_LOCKF],[], ! [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF])]))) # for aufs define([aufsosdefs], concat(aufsosdefs, *************** *** 1158,1164 **** # lw config define([lwflags], concat(lwflags, ! ifdef([fastether],[-DSFLOWQ=1],[]), ifelse(os,[aix],[],[]))) # more papif config --- 1195,1201 ---- # lw config define([lwflags], concat(lwflags, ! ifdef([fastether],[ -DSFLOWQ=1],[]), ifelse(os,[aix],[],[]))) # more papif config *** README.orig Sun Nov 17 23:22:51 1991 --- README Sun Nov 17 23:23:24 1991 *************** *** 3,9 **** (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 67, November 1991 Introduction ------------ --- 3,9 ---- (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 68, November 1991 Introduction ------------