diff -cr /afs/dementia.org/src/motif/andrew/config/Amoeba.cf ./Amoeba.cf
*** /afs/dementia.org/src/motif/andrew/config/Amoeba.cf	Mon Jan 30 18:41:22 1995
--- ./Amoeba.cf	Thu Apr 11 14:12:11 1996
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: Amoeba.cf,v 1.7 95/01/05 19:38:42 kaleb Exp $
  
  /*  The presence of this configuration file in the X distribution
   *  does not imply full support for the system it describes.
--- 1,5 ----
! XCOMM platform:  $XConsortium: Amoeba.cf /main/10 1996/01/22 17:35:12 gildea $
! XCOMM platform:  $XFree86: xc/config/cf/Amoeba.cf,v 3.6 1995/01/28 15:40:08 dawes Exp $
  
  /*  The presence of this configuration file in the X distribution
   *  does not imply full support for the system it describes.
***************
*** 12,23 ****
--- 13,34 ----
   * Configuration file for Amoeba 5.2
   */
  
+ #ifndef OSName
  #define OSName                  Amoeba 5.2
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion          5
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion          2
+ #endif
+ #ifndef OSTeenyVersion
  #define OSTeenyVersion          0
+ #endif
+ #ifndef OSVendor
  #define OSVendor                Vrije Universiteit
+ #endif
  
  #define AmoebaArchitecture	YES
  
***************
*** 298,303 ****
--- 309,320 ----
  	@echo '** TODO: Install man page ' file.man
  #endif /* InstallManPageLong */
  
+ #ifndef InstallGenManPageLong
+ #define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ install.man:: file.man							@@\
+ 	@echo '** TODO: Install man page ' file.man
+ #endif /* InstallGenManPageLong */
+ 
  #ifndef InstallManPageAliases
  #define	InstallManPageAliases(file,destdir,aliases)			@@\
  install.man::								@@\
***************
*** 309,314 ****
--- 326,343 ----
  	done; \								@@\
  	$(RM) $${TMP})
  #endif /* InstallManPageAliases */
+ 
+ #ifndef InstallGenManPageAliases
+ #define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ install.man::								@@\
+ 	@(TMP=/tmp/tmp.$$$$; \						@@\
+ 	$(RM) $${TMP}; \						@@\
+ 	echo .so `basename destdir`/file.suffix > $${TMP}; \		@@\
+ 	for i in aliases; do (set -x; \					@@\
+ 	$(TOB) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ 		@@\
+ 	done; \								@@\
+ 	$(RM) $${TMP})
+ #endif /* InstallGenManPageAliases */
  
  #ifndef InstallNamedNonExec
  #define	InstallNamedNonExec(srcname,dstname,dest)			@@\
diff -cr /afs/dementia.org/src/motif/andrew/config/DGUX.cf ./DGUX.cf
*** /afs/dementia.org/src/motif/andrew/config/DGUX.cf	Wed Oct 13 15:30:06 1993
--- ./DGUX.cf	Thu Apr 11 14:12:12 1996
***************
*** 1,9 ****
! XCOMM platform:  $XConsortium: DGUX.cf,v 1.3 93/10/13 15:29:59 rws Exp $
  
  #define OSName            DG/UX 4.32
  XCOMM operating system:  OSName
  #define OSMajorVersion    4
  #define OSMinorVersion    32
  
  #define BootstrapCFlags   -DDGUX
  #define StandardDefines   -DDGUX -DSYSV
--- 1,15 ----
! XCOMM platform:  $XConsortium: DGUX.cf /main/4 1996/01/22 17:35:23 gildea $
  
+ #ifndef OSName
  #define OSName            DG/UX 4.32
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion    4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    32
+ #endif
  
  #define BootstrapCFlags   -DDGUX
  #define StandardDefines   -DDGUX -DSYSV
diff -cr /afs/dementia.org/src/motif/andrew/config/FreeBSD.cf ./FreeBSD.cf
*** /afs/dementia.org/src/motif/andrew/config/FreeBSD.cf	Wed Sep 27 14:49:51 1995
--- ./FreeBSD.cf	Thu Apr 11 14:12:14 1996
***************
*** 1,66 ****
! XCOMM platform:  $XConsortium: FreeBSD.cf,v 1.5 95/04/07 19:42:53 kaleb Exp $
  
! #define OSName            FreeBSD 1.1
! #define OSVendor          /**/
  XCOMM operating system:  OSName
! #define OSMajorVersion    1
! #define OSMinorVersion    1
! #define OSTeenyVersion    0
  
! #define HasPutenv       YES
! #define HasBSD44Sockets YES
  
! #define CppCmd          /usr/libexec/cpp -traditional
! #define PreProcessCmd   /usr/libexec/cpp -traditional
  #undef  InstallCmd
! #define InstallCmd /usr/bin/install
  
! #define UseGas		YES
  #ifndef GccUsesGas
! # define GccUsesGas	YES
  #endif
  
  #ifndef AsmDefines
! #  define AsmDefines -DUSE_GAS
  #endif
  
  #if GccUsesGas
! # define GccGasOption -DGCCUSESGAS
  #else
! # define GccGasOption /**/
  #endif
  
  #ifndef HasGcc2
! # define HasGcc2 YES
  #endif
  
  #define CcCmd gcc
! #define DefaultCCOptions /**/
  
  #ifdef i386Architecture
! #define OptimizedCDebugFlags -m486 -O2
  #else
! #define OptimizedCDebugFlags -O2
  #endif
- #if OSMajorVersion < 2
- #define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
  #else
! #define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
  #endif
! #define ServerExtraDefines GccGasOption
  
! #define StandardDefines	-DCSRG_BASED
! #define XawI18nDefines  -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  
! #define TroffCmd        groff -Tps
! #define SetTtyGroup     YES
! #define HasNdbm         YES
! #define HasShm          YES
! #define HasWChar32      YES
  
! #define HasLibCrypt	YES
  
! #define AvoidNullMakeCommand YES
  
  #include <bsdLib.rules>
  
--- 1,92 ----
! XCOMM platform:  $XConsortium: FreeBSD.cf /main/10 1996/01/22 17:35:30 gildea $
  
! #ifndef OSName
! #define OSName			FreeBSD 2.1
! #endif
! #ifndef OSVendor
! #define OSVendor		Walnut Creek CD-ROM
! #endif
  XCOMM operating system:  OSName
! #ifndef OSMajorVersion
! #define OSMajorVersion		2
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion		1
! #endif
! #ifndef OSTeenyVersion
! #define OSTeenyVersion		0
! #endif
  
! #define HasPutenv		YES
! #define HasBSD44Sockets	 YES
  
! #define CppCmd			/usr/libexec/cpp -traditional
! #define PreProcessCmd		/usr/libexec/cpp -traditional
  #undef  InstallCmd
! #define InstallCmd		/usr/bin/install
  
! #define UseGas			YES
  #ifndef GccUsesGas
! # define GccUsesGas		YES
  #endif
  
  #ifndef AsmDefines
! #  define AsmDefines		-DUSE_GAS
  #endif
  
  #if GccUsesGas
! # define GccGasOption		-DGCCUSESGAS
  #else
! # define GccGasOption		/**/
  #endif
  
  #ifndef HasGcc2
! # define HasGcc2		YES
  #endif
  
+ #define MkdirHierCmd		mkdir -p
+ 
  #define CcCmd gcc
! #ifndef DefaultCCOptions
! #define DefaultCCOptions	-pipe
! #endif
  
  #ifdef i386Architecture
! #define OptimizedCDebugFlags	-m486 -O2 -fno-strength-reduce
  #else
! #define OptimizedCDebugFlags	-O2
! #endif
! 
! #if OSMajorVersion > 1
! #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
! #define XawI18nDefines		-DUSE_XWCHAR_STRING
! #define HasMakefileSafeInclude	YES
! #define IncludeMakefile(file)	@@# dependencies are in .depend
! #define DependFileName		.depend
! #ifndef ExtraLibraries
! #define ExtraLibraries		-lgnumalloc
  #endif
  #else
! #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
! #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
! #ifndef ExtraLibraries
! #define ExtraLibraries		/* -lmalloc */
  #endif
! #endif
! 
! #define ServerExtraDefines	GccGasOption XFree86ServerDefines
  
! #define StandardDefines		-DCSRG_BASED
  
! #define TroffCmd		groff -Tps
! #define SetTtyGroup		YES
! #define HasNdbm			YES
! #define HasShm			YES
! #define HasWChar32		YES
  
! #define HasLibCrypt		YES
  
! #define AvoidNullMakeCommand	YES
  
  #include <bsdLib.rules>
  
diff -cr /afs/dementia.org/src/motif/andrew/config/Imake.cf ./Imake.cf
*** /afs/dementia.org/src/motif/andrew/config/Imake.cf	Mon Jan 30 18:41:19 1995
--- ./Imake.cf	Thu Apr 11 14:12:10 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
  /*
   * To add support for another platform:
   * 
--- 1,4 ----
! XCOMM $XConsortium: Imake.cf /main/22 1995/12/05 16:39:53 mor $
  /*
   * To add support for another platform:
   * 
***************
*** 19,266 ****
   */
  
  #ifdef ultrix
! #define MacroIncludeFile <ultrix.cf>
! #define MacroFile ultrix.cf
! #ifdef vax
! #undef vax
! #define VaxArchitecture
! #endif
! #ifdef mips
! #undef mips
! #define MipsArchitecture
! #endif
! #undef ultrix
! #define UltrixArchitecture
  #endif /* ultrix */
  
  #if defined(vax) && !defined(UltrixArchitecture)
! #define MacroIncludeFile <bsd.cf>
! #define MacroFile bsd.cf
! #undef vax
! #define BSDArchitecture
! #define VaxArchitecture
  #endif /* vax */
  
  #ifdef bsdi
! #define MacroIncludeFile <bsdi.cf>
! #define MacroFile bsdi.cf
! #undef bsdi
! #define BSD386Architecture
! #define i386BsdArchitecture
! #define i386Architecture
  #endif /* bsdi */
  
  #ifdef __NetBSD__
! #define MacroIncludeFile <NetBSD.cf>
! #define MacroFile NetBSD.cf
! #undef __NetBSD__
! #define NetBSDArchitecture
! #ifdef __i386__
! #define i386BsdArchitecture
! #define i386Architecture
! #endif
! #if defined(__sparc__) || defined(sparc)
! #define SparcArchitecture
! #undef sparc
! #endif
  #endif /* NetBSD */
  
  #ifdef __FreeBSD__
! #define MacroIncludeFile <FreeBSD.cf>
! #define MacroFile FreeBSD.cf
! #undef __FreeBSD__
! #define FreeBSDArchitecture
! #ifdef __i386__
! #define i386BsdArchitecture
! #define i386Architecture
! #endif
  #endif /* __FreeBSD__ */
  
  #ifdef AMOEBA
! /* Should be before the 'sun' entry because we may be cross-compiling */
! #define MacroIncludeFile <Amoeba.cf>
! #define MacroFile Amoeba.cf
! #if defined(i80386) || defined(__i80386__)
! #define i386Architecture
! #else
! #if defined(mc68000) || defined(__mc68000__)
! #define Sun3Architecture
! #define SunArchitecture
! #else
! #if defined(sparc) || defined(__sparc__)
! #define SparcArchitecture
! #define SunArchitecture
! #endif
! #endif
! #endif
! #undef i80386
! #undef mc68000
! #undef sparc
! #undef sun
  #endif /* AMOEBA */
  
  #ifdef sun
! #define MacroIncludeFile <sun.cf>
! #define MacroFile sun.cf
! #ifdef SVR4
! #undef SVR4
! #define SVR4Architecture
! #endif
! #ifdef sparc
! #undef sparc
! #define SparcArchitecture
! #endif
! #ifdef mc68000
! #undef mc68000
! #define Sun3Architecture
! #endif
! #ifdef i386
! #undef i386
! #define i386Architecture
! #endif
! #undef sun
! #define SunArchitecture
  #endif /* sun */
  
  #ifdef hpux
! #define MacroIncludeFile <hp.cf>
! #define MacroFile hp.cf
! #undef hpux
! #define HPArchitecture
  #endif /* hpux */
  
  #ifdef USL
! #define MacroIncludeFile <usl.cf>
! #define MacroFile usl.cf
! #undef USL
! #undef SVR4
! #define SVR4Architecture
! #define i386Architecture
  #endif /* USL */
  
  #ifdef NCR
! #define MacroIncludeFile <ncr.cf>
! #define MacroFile ncr.cf
! #undef NCR
! #undef SVR4
! #define SVR4Architecture
! #define i386Architecture
  #endif /* NCR */
  
  #ifdef apollo
! #define MacroIncludeFile <apollo.cf>
! #define MacroFile apollo.cf
! #undef apollo
! #define ApolloArchitecture
  #endif /* apollo */
  
  #ifdef sony
! #define MacroIncludeFile <sony.cf>
! #define MacroFile sony.cf
! #undef sony
! #undef sony_news
! #define SonyArchitecture
! #ifdef mc68020
! #undef mc68020
! #undef mc68030
! #define Mc68020Architecture
! #endif
! #ifdef mips
! #undef mips
! #define MipsArchitecture
! #endif
! #if !defined(bsd43) || defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV)
! #define SonySysvArchitecture
! #else
! #define SonyBsdArchitecture
! #endif
  #endif /* sony */
  
  #ifdef M4310
! #define MacroIncludeFile <pegasus.cf>
! #define MacroFile pegasus.cf
! #undef M4310
! #define PegasusArchitecture
  #endif /* M4310 */
  
  #ifdef M4330
! #define MacroIncludeFile <m4330.cf>
! #define MacroFile m4330.cf
! #undef  M4330
! #define M4330Architecture
  #endif /* M4330 */
  
  #ifdef macII
! #define MacroIncludeFile <macII.cf>
! #define MacroFile macII.cf
! #undef  macII
! #define MacIIArchitecture
  #endif /* macII */
  
  #ifdef _CRAY
! #define MacroIncludeFile <cray.cf>
! #define MacroFile cray.cf
! #undef cray
! #undef CRAY
! #undef CRAY1
! #undef CRAY2
! #undef YMP
! #define CrayArchitecture
  #endif /* _CRAY */
  
  #ifdef sgi
! #define MacroIncludeFile <sgi.cf>
! #define MacroFile sgi.cf
! #undef sgi
! #define SGIArchitecture
! #undef mips
! #define MipsArchitecture
  #endif /* sgi */
  
  #ifdef stellar
! #define MacroIncludeFile <stellar.cf>
! #define MacroFile stellar.cf
! #undef stellar
! #define StellarArchitecture
  #endif /* stellar */
  
  #if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix)
! #define MacroIncludeFile <ibm.cf>
! #define MacroFile ibm.cf
! #ifdef ibm
! #undef ibm
! #endif
! #define IBMArchitecture
! #ifdef i386
! #undef i386
! #define PS2Architecture
! #endif
! #ifdef ibm032
! #undef ibm032
! #define RtArchitecture
! #endif
! #ifdef aix
! #undef aix
! #define AIXArchitecture
! #endif
! #ifdef _IBMR2
! #undef _IBMR2
! #define RsArchitecture
! #endif
  #endif /* ibm */
  
  #ifdef luna
! #undef luna
! #define MacroIncludeFile <luna.cf>
! #define MacroFile luna.cf
! #define LunaArchitecture
! #ifdef mc68000
! #undef mc68000
! #define Mc68000Architecture
! #else
! #undef mc88000
! #define Mc88000Architecture
! #endif
  #endif /* luna */
  
  #ifdef Mips
--- 19,292 ----
   */
  
  #ifdef ultrix
! # define MacroIncludeFile <ultrix.cf>
! # define MacroFile ultrix.cf
! # ifdef vax
! #  undef vax
! #  define VaxArchitecture
! # endif
! # ifdef mips
! #  undef mips
! #  define MipsArchitecture
! # endif
! # undef ultrix
! # define UltrixArchitecture
  #endif /* ultrix */
  
  #if defined(vax) && !defined(UltrixArchitecture)
! # define MacroIncludeFile <bsd.cf>
! # define MacroFile bsd.cf
! # undef vax
! # define BSDArchitecture
! # define VaxArchitecture
  #endif /* vax */
  
  #ifdef bsdi
! # define MacroIncludeFile <bsdi.cf>
! # define MacroFile bsdi.cf
! # undef bsdi
! # define BSD386Architecture
! # define i386BsdArchitecture
! # define i386Architecture
! # undef i386
  #endif /* bsdi */
  
  #ifdef __NetBSD__
! # define MacroIncludeFile <NetBSD.cf>
! # define MacroFile NetBSD.cf
! # undef __NetBSD__
! # define NetBSDArchitecture
! # ifdef __i386__
! #  define i386BsdArchitecture
! #  define i386Architecture
! #  undef i386
! # endif
! # if defined(__sparc__) || defined(sparc)
! #  define SparcArchitecture
! #  undef sparc
! # endif
  #endif /* NetBSD */
  
  #ifdef __FreeBSD__
! # define MacroIncludeFile <FreeBSD.cf>
! # define MacroFile FreeBSD.cf
! # undef __FreeBSD__
! # define FreeBSDArchitecture
! # ifdef __i386__
! #  define i386BsdArchitecture
! #  define i386Architecture
! #  undef i386
! # endif
  #endif /* __FreeBSD__ */
  
  #ifdef AMOEBA
!  /* Should be before the 'sun' entry because we may be cross-compiling */
! # define MacroIncludeFile <Amoeba.cf>
! # define MacroFile Amoeba.cf
! # if defined(i80386) || defined(__i80386__)
! #  undef i80386
! #  define i386Architecture
! # else
! #  if defined(mc68000) || defined(__mc68000__)
! #   undef mc68000
! #   define Sun3Architecture
! #   define SunArchitecture
! #  else
! #   if defined(sparc) || defined(__sparc__)
! #    undef sparc
! #    define SparcArchitecture
! #    define SunArchitecture
! #   endif
! #  endif
! #  undef sun
! # endif
  #endif /* AMOEBA */
  
  #ifdef sun
! # define MacroIncludeFile <sun.cf>
! # define MacroFile sun.cf
! # ifdef SVR4
! #  undef SVR4
! #  define SVR4Architecture
! # endif
! # ifdef sparc
! #  undef sparc
! # define SparcArchitecture
! # endif
! # ifdef mc68000
! #  undef mc68000
! # define Sun3Architecture
! # endif
! # ifdef i386
! #  undef i386
! #  define i386Architecture
! # endif
! # undef sun
! # define SunArchitecture
  #endif /* sun */
  
  #ifdef hpux
! # define MacroIncludeFile <hp.cf>
! # define MacroFile hp.cf
! # undef hpux
! # define HPArchitecture
  #endif /* hpux */
  
+ #ifdef sco
+ # define MacroIncludeFile <sco.cf>
+ # define MacroFile sco.cf
+ # undef sco
+ # undef USL
+ # undef SYSV
+ # undef i386
+ /* # define i386Architecture */
+ # define SCOArchitecture
+ #endif /* sco */
+ 
  #ifdef USL
! # define MacroIncludeFile <usl.cf>
! # define MacroFile usl.cf
! # undef USL
! # undef SVR4
! # undef i386
! # define SVR4Architecture
! # define i386Architecture
! # define USLArchitecture
  #endif /* USL */
  
  #ifdef NCR
! # define MacroIncludeFile <ncr.cf>
! # define MacroFile ncr.cf
! # undef NCR
! # undef SVR4
! # undef i386
! # define SVR4Architecture
! # define i386Architecture
! # define NCRArchitecture
  #endif /* NCR */
  
  #ifdef apollo
! # define MacroIncludeFile <apollo.cf>
! # define MacroFile apollo.cf
! # undef apollo
! # define ApolloArchitecture
  #endif /* apollo */
  
  #ifdef sony
! # define MacroIncludeFile <sony.cf>
! # define MacroFile sony.cf
! # undef sony
! # undef sony_news
! # define SonyArchitecture
! # ifdef mc68020
! #  undef mc68020
! #  undef mc68030
! #  define Mc68020Architecture
! # endif
! # ifdef mips
! #  undef mips
! #  define MipsArchitecture
! # endif
! # ifdef __svr4
! #  define SVR4Architecture
! # else
! #  if !defined(bsd43) || defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV)
! #   define SonySysvArchitecture
! #  else
! #   define SonyBsdArchitecture
! #  endif
! # endif
  #endif /* sony */
  
  #ifdef M4310
! # define MacroIncludeFile <pegasus.cf>
! # define MacroFile pegasus.cf
! # undef M4310
! # define PegasusArchitecture
  #endif /* M4310 */
  
  #ifdef M4330
! # define MacroIncludeFile <m4330.cf>
! # define MacroFile m4330.cf
! # undef  M4330
! # define M4330Architecture
  #endif /* M4330 */
  
  #ifdef macII
! # define MacroIncludeFile <macII.cf>
! # define MacroFile macII.cf
! # undef  macII
! # define MacIIArchitecture
  #endif /* macII */
  
  #ifdef _CRAY
! # define MacroIncludeFile <cray.cf>
! # define MacroFile cray.cf
! # undef cray
! # undef CRAY
! # undef CRAY1
! # undef CRAY2
! # undef YMP
! # define CrayArchitecture
  #endif /* _CRAY */
  
  #ifdef sgi
! # define MacroIncludeFile <sgi.cf>
! # define MacroFile sgi.cf
! # undef sgi
! # define SGIArchitecture
! # undef mips
! # define MipsArchitecture
! # ifdef _SVR4
! #  undef _SVR4
! #  define SVR4Architecture
! # endif
  #endif /* sgi */
  
  #ifdef stellar
! # define MacroIncludeFile <stellar.cf>
! # define MacroFile stellar.cf
! # undef stellar
! # define StellarArchitecture
  #endif /* stellar */
  
  #if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix)
! # define MacroIncludeFile <ibm.cf>
! # define MacroFile ibm.cf
! # ifdef ibm
! #  undef ibm
! # endif
! # define IBMArchitecture
! # ifdef i386
! #  undef i386
! #  define PS2Architecture
! # endif
! # ifdef ibm032
! #  undef ibm032
! #  define RtArchitecture
! # endif
! # ifdef aix
! #  undef aix
! #  define AIXArchitecture
! # endif
! # ifdef _IBMR2
! #  undef _IBMR2
! #  define RsArchitecture
! # endif
  #endif /* ibm */
  
  #ifdef luna
! # undef luna
! # define MacroIncludeFile <luna.cf>
! # define MacroFile luna.cf
! # define LunaArchitecture
! # ifdef mc68000
! #  undef mc68000
! #  define Mc68000Architecture
! # else
! #  undef mc88000
! #  define Mc88000Architecture
! # endif
  #endif /* luna */
  
  #ifdef Mips
***************
*** 290,295 ****
--- 316,322 ----
  #ifdef SVR4
  # ifdef i386
  #  define i386Architecture
+ #  undef i386
  # endif
  # define SVR4Architecture
  # define MacroIncludeFile <svr4.cf>
***************
*** 302,311 ****
--- 329,340 ----
  #  define MacroIncludeFile <x386.cf>
  #  define MacroFile x386.cf
  #  define i386SVR3Architecture
+ #  undef i386
  # endif
  #endif /* SYSV */
  
  #ifdef SYSV386
+ # undef i386
  # ifdef SVR4
  #  define i386Architecture
  #  define SVR4Architecture
***************
*** 321,330 ****
  #endif /* SYSV386 */
  
  #ifdef DGUX
! #define MacroIncludeFile <DGUX.cf>
! #define MacroFile DGUX.cf
! #undef DGUX
! #define DguxArchitecture
  #endif /* DGUX */
  
  #ifdef __convex__
--- 350,359 ----
  #endif /* SYSV386 */
  
  #ifdef DGUX
! # define MacroIncludeFile <DGUX.cf>
! # define MacroFile DGUX.cf
! # undef DGUX
! # define DguxArchitecture
  #endif /* DGUX */
  
  #ifdef __convex__
***************
*** 337,392 ****
  #endif /* _convex_ */
  
  #ifdef __osf__
! #define MacroIncludeFile <osf1.cf>
! #define MacroFile osf1.cf
! #define OSF1Architecture
! #undef __osf__
! #ifdef __mips__
! #undef __mips__
! #define MipsArchitecture
! #endif
! #ifdef __alpha
! #undef __alpha
! #define AlphaArchitecture
! #endif
  #endif /* __osf__ */
  
  #ifdef Oki
! #define MacroIncludeFile <Oki.cf>
! #define MacroFile Oki.cf
! #undef Oki
! #define i860SVR4Architecture
  #endif /* Oki */
  
  #ifdef WIN32
! #define MacroIncludeFile <Win32.cf>
! #define MacroFile Win32.cf
! #define Win32Architecture
  #endif /* WIN32 */
  
  #ifdef linux 
! #define MacroIncludeFile <linux.cf>
! #define MacroFile linux.cf
! #undef linux
! #define LinuxArchitecture
! #define i386Architecture
  #endif /* linux */
  
  #ifdef __uxp__
! #define MacroIncludeFile <fujitsu.cf>
! #define MacroFile fujitsu.cf
! #undef __uxp__
! #ifdef sparc
! #undef sparc
! #define SparcArchitecture
! #endif
  #endif /* __uxp__ */
  
  #ifdef __sxg__
! #define MacroIncludeFile <fujitsu.cf>
! #define MacroFile fujitsu.cf
! #undef __sxg__
! #define mc68000Architecture
  #endif /* __sxg__ */
  
  #if defined(sequent) || defined(_SEQUENT_)
--- 366,424 ----
  #endif /* _convex_ */
  
  #ifdef __osf__
! # define MacroIncludeFile <osf1.cf>
! # define MacroFile osf1.cf
! # define OSF1Architecture
! # undef __osf__
! # ifdef __mips__
! #  undef __mips__
! #  define MipsArchitecture
! # endif
! # ifdef __alpha
! #  undef __alpha
! #  define AlphaArchitecture
! # endif
  #endif /* __osf__ */
  
  #ifdef Oki
! # define MacroIncludeFile <Oki.cf>
! # define MacroFile Oki.cf
! # undef Oki
! # define i860SVR4Architecture
! # define SVR4Architecture
! # undef SVR4
  #endif /* Oki */
  
  #ifdef WIN32
! # define MacroIncludeFile <Win32.cf>
! # define MacroFile Win32.cf
! # define Win32Architecture
  #endif /* WIN32 */
  
  #ifdef linux 
! # define MacroIncludeFile <linux.cf>
! # define MacroFile linux.cf
! # undef linux
! # define LinuxArchitecture
! # define i386Architecture
! # undef i386
  #endif /* linux */
  
  #ifdef __uxp__
! # define MacroIncludeFile <fujitsu.cf>
! # define MacroFile fujitsu.cf
! # undef __uxp__
! # ifdef sparc
! #  undef sparc
! #  define SparcArchitecture
! # endif
  #endif /* __uxp__ */
  
  #ifdef __sxg__
! # define MacroIncludeFile <fujitsu.cf>
! # define MacroFile fujitsu.cf
! # undef __sxg__
! # define mc68000Architecture
  #endif /* __sxg__ */
  
  #if defined(sequent) || defined(_SEQUENT_)
***************
*** 404,415 ****
  #endif
  
  #if defined(_nec_ews_svr4) || defined(nec_ews_svr4) || defined(nec_ews_svr2) || defined(SX) || defined(_nec_up) || defined(_nec_ft) || defined(PC_UX)
! #ifdef nec
! #undef nec
! #endif
! #define MacroIncludeFile <nec.cf>
! #define MacroFile nec.cf
! #define NecArchitecture
  #endif
  
  #ifndef MacroIncludeFile
--- 436,447 ----
  #endif
  
  #if defined(_nec_ews_svr4) || defined(nec_ews_svr4) || defined(nec_ews_svr2) || defined(SX) || defined(_nec_up) || defined(_nec_ft) || defined(PC_UX)
! # ifdef nec
! #  undef nec
! # endif
! # define MacroIncludeFile <nec.cf>
! # define MacroFile nec.cf
! # define NecArchitecture
  #endif
  
  #ifndef MacroIncludeFile
diff -cr /afs/dementia.org/src/motif/andrew/config/Imake.rules ./Imake.rules
*** /afs/dementia.org/src/motif/andrew/config/Imake.rules	Tue Nov 14 11:45:22 1995
--- ./Imake.rules	Thu Apr 11 14:11:46 1996
***************
*** 1,6 ****
! XCOMM -----------------------------------------------------------------------
  XCOMM Imake rules for building libraries, programs, scripts, and data files
! XCOMM rules:  $XConsortium: Imake.rules,v 1.197.1.1 95/06/19 18:01:48 gildea Exp $
  
  /*
   *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
--- 1,6 ----
! XCOMM ---------------------------------------------------------------------
  XCOMM Imake rules for building libraries, programs, scripts, and data files
! XCOMM rules:  $XConsortium: Imake.rules /main/208 1996/01/17 11:08:27 kaleb $
  
  /*
   *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
***************
*** 39,44 ****
--- 39,46 ----
   * BuildIncludes		(srclist,dstsubdir,dstupdir)
   * LinkRule			(program,options,objects,libraries)
   * HostLinkRule			(program,options,objects,libraries)
+  * NoCmpScript			(target)
+  * NoConfigRec			(target)
   * NormalProgramTarget		(program,objects,deplibs,locallibs,syslibs)
   * SetUIDProgramTarget		(program,objects,deplibs,locallibs,syslibs)
   * SingleProgramTarget		(program,objects,locallibs,syslibs)
***************
*** 63,75 ****
--- 65,81 ----
   * InstallManPageLong		(file,destdir,dest)
   * InstallManPage		(file,destdir)
   * InstallManPageAliases	(file,destdir,aliases)
+  * ManKeywordsTarget		(manpath)
   * InstallNamedNonExec		(srcname,dstname,dest)
   * InstallNonExecFile		(file,dest)
+  * InstallNonExecFileNoClobber	(file,dest)
   * InstallNonExec		(file,dest)
   * InstallProgramWithFlags	(program,dest,flags)
   * InstallProgram		(program,dest)
   * InstallScript		(program,dest)
   * InstallNamedProg		(srcname,dstname,dest)
+  * InstallNamedProgNoClobber	(srcname,dstname,dest)
+  * MakeFlagsToShellFlags	(makeflags,shellcmd)
   * LinkFileList			(step,list,dir,sub)
   * InstallMultipleDestFlags	(step,list,dest,flags)
   * InstallMultipleDest		(step,list,dest)
***************
*** 106,111 ****
--- 112,118 ----
   * SpecialCObjectRule		(basename,depends,options)
   * LexFile			(file)
   * YaccFile			(file,flags)
+  * YaccFileNoFlags		(file)
   * MakeLibrary			(libname,objlist)
   * NormalLibraryTarget		(libname,objlist)
   * NormalLibraryTarget2		(libname,objlist1,objlist2)
***************
*** 166,173 ****
  #define DirFailPrefix
  #endif
  
! #ifndef SaberProgramTarget
! #define SaberProgramTarget(program,srclist,objlist,locallibs,syslibs) /**/
  #endif
  
  /*
--- 173,202 ----
  #define DirFailPrefix
  #endif
  
! /*
!  * NoCmpScript - suppress clearmake build script comparison.
!  */
! #ifndef NoCmpScript
! #if HasClearmake
! #define NoCmpScript(targ)						@@\
! XCOMM special target for clearmake					@@\
! .NO_CMP_SCRIPT: targ
! #else
! #define NoCmpScript(targ) /**/
! #endif
! #endif
! 
! /*
!  * NoConfigRec - suppress using clearmake configuration records.
!  */
! #ifndef NoConfigRec
! #if HasClearmake
! #define NoConfigRec(targ)						@@\
! XCOMM special target for clearmake					@@\
! .NO_CONFIG_REC: targ
! #else
! #define NoConfigRec(targ) /**/
! #endif
  #endif
  
  /*
***************
*** 435,441 ****
  
  #ifndef BuildIncludesTop
  #define BuildIncludesTop(srclist)					@@\
! includes::								@@\
  	MakeDir($(BUILDINCDIR))						@@\
  	@(set -x; cd $(BUILDINCDIR); for i in srclist; do \		@@\
  		RemoveFile($$i); \					@@\
--- 464,470 ----
  
  #ifndef BuildIncludesTop
  #define BuildIncludesTop(srclist)					@@\
! includes:: srclist							@@\
  	MakeDir($(BUILDINCDIR))						@@\
  	@(set -x; cd $(BUILDINCDIR); for i in srclist; do \		@@\
  		RemoveFile($$i); \					@@\
***************
*** 445,451 ****
  
  #ifndef BuildIncludes
  #define BuildIncludes(srclist,dstsubdir,dstupdir)			@@\
! includes::								@@\
  	MakeDir($(BUILDINCDIR)/dstsubdir)				@@\
  	@(set -x; cd $(BUILDINCDIR)/dstsubdir; for i in srclist; do \	@@\
  		RemoveFile($$i); \					@@\
--- 474,480 ----
  
  #ifndef BuildIncludes
  #define BuildIncludes(srclist,dstsubdir,dstupdir)			@@\
! includes:: srclist							@@\
  	MakeDir($(BUILDINCDIR)/dstsubdir)				@@\
  	@(set -x; cd $(BUILDINCDIR)/dstsubdir; for i in srclist; do \	@@\
  		RemoveFile($$i); \					@@\
***************
*** 758,771 ****
  #endif
  
  #ifndef InstallNamedTarget
! #define	InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
  step:: srcname								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
  #endif /* InstallNamedTarget */
  
  #ifndef InstallTarget
! #define	InstallTarget(step,file,flags,dest)				@@\
  InstallNamedTarget(step,file,flags,dest,file)
  #endif /* InstallTarget */
  
--- 787,816 ----
  #endif
  
  #ifndef InstallNamedTarget
! #define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
  step:: srcname								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
  #endif /* InstallNamedTarget */
  
+ /*
+  * InstallNamedTargetNoClobber - Like InstallNamedTarget, but doesn't
+  * do the install if an installed version already exists.  Useful
+  * for files that might have local customizations that you don't
+  * want to clobber.  Config files are good candidates for this.
+  */
+ #ifndef InstallNamedTargetNoClobber
+ #define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname)	@@\
+ step:: srcname								@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	@if [ -f $(DESTDIR)dest/dstname ]; then \			@@\
+ 	 echo "Not overwriting existing" $(DESTDIR)dest/dstname; \	@@\
+ 	else set -x; \							@@\
+ 	 $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname; fi
+ #endif /* InstallNamedTargetNoClobber */
+ 
  #ifndef InstallTarget
! #define InstallTarget(step,file,flags,dest)				@@\
  InstallNamedTarget(step,file,flags,dest,file)
  #endif /* InstallTarget */
  
***************
*** 871,876 ****
--- 916,933 ----
  	RemoveFile($${TMP}))
  #endif /* InstallManPageAliases */
  
+ /*
+  * ManKeywordsTarget - generate the database used by "man -k".
+  * This rule updates the index in the directory "manpath", which
+  * indexes all the manual pages in the section subdirectories under
+  * it.  An update command is defined only on systems that have a
+  * per MANPATH element index.  If the OS supports only one system-wide
+  * database, we don't update it, because then we can't do cross
+  * installations or use a non-empty DESTDIR for testing.
+  */
+ #ifndef ManKeywordsTarget
+ #define ManKeywordsTarget(manpath) man_keywords::
+ #endif
  
  /*
   * InstallNamedNonExec - generate rules to install a data file
***************
*** 885,896 ****
   * InstallNonExecFile - generate rules to install a data file
   */
  #ifndef InstallNonExecFile
! #define	InstallNonExecFile(file,dest)					@@\
  InstallTarget(install,file,$(INSTDATFLAGS),dest)
  #endif /* InstallNonExecFile */
  
  
  /*
   * InstallLinkKitNonExecFile - rule for installing server Link Kit files.
   *                         (only used for XFree86). This is a no-op
   *                         rule so that Imakefiles on non-XFree86 systems
--- 942,962 ----
   * InstallNonExecFile - generate rules to install a data file
   */
  #ifndef InstallNonExecFile
! #define InstallNonExecFile(file,dest)					@@\
  InstallTarget(install,file,$(INSTDATFLAGS),dest)
  #endif /* InstallNonExecFile */
  
  
  /*
+  * InstallNonExecFileNoClobber - install a data file once
+  */
+ #ifndef InstallNonExecFileNoClobber
+ #define InstallNonExecFileNoClobber(file,dest)				@@\
+ InstallNamedTargetNoClobber(install,file,$(INSTDATFLAGS),dest,file)
+ #endif /* InstallNonExecFileNoClobber */
+ 
+ 
+ /*
   * InstallLinkKitNonExecFile - rule for installing server Link Kit files.
   *                         (only used for XFree86). This is a no-op
   *                         rule so that Imakefiles on non-XFree86 systems
***************
*** 946,955 ****
   * InstallNamedProg - install a program with renaming and no stripping.
   */
  #ifndef InstallNamedProg
! #define	InstallNamedProg(srcname,dstname,dest)				@@\
  InstallNamedTarget(install,srcname,$(INSTBINFLAGS),dest,dstname)
  #endif /* InstallNamedProg */
  
  
  /*
   * LinkFileList - link a list of list of files from one place to another
--- 1012,1047 ----
   * InstallNamedProg - install a program with renaming and no stripping.
   */
  #ifndef InstallNamedProg
! #define InstallNamedProg(srcname,dstname,dest)				@@\
  InstallNamedTarget(install,srcname,$(INSTBINFLAGS),dest,dstname)
  #endif /* InstallNamedProg */
  
+ /*
+  * InstallNamedProgNoClobber - Like InstallNamedProg, but doesn't
+  * do the install if an installed version already exists.
+  */
+ #ifndef InstallNamedProgNoClobber
+ #define InstallNamedProgNoClobber(srcname,dstname,dest)			@@\
+ InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname)
+ #endif /* InstallNamedProgNoClobber */
+ 
+ /*
+  * MakeFlagsToShellFlags - set variables before starting a loop.
+  * makeflags is the set of "make" flags to check.
+  * shellcmd is the shell command to execute if any of the flags are set.
+  *
+  * The usual use of this rule is to translate make's "don't quit on error"
+  * flags into the equivalent for the shell.  To do this, "make -i" always
+  * becomes "set +e".  "make -k" should also turn on "set +e" if the target
+  * is building subdirectories.  That is, subdirectories are independent
+  * and should appear to be multiple targets, even though they are
+  * implemented in a loop in a single target.
+  */
+ #ifndef MakeFlagsToShellFlags
+ #define MakeFlagsToShellFlags(makeflags,shellcmd)\
+ 	for flag in ${MAKEFLAGS} ''; do \				@@\
+ 	  case "$$flag" in *=*) ;; *[makeflags]*) shellcmd;; esac; done
+ #endif
  
  /*
   * LinkFileList - link a list of list of files from one place to another
***************
*** 957,964 ****
  #ifndef LinkFileList
  #define LinkFileList(step,list,dir,sub)					@@\
  step:: list								@@\
! 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
! 	echo "	cd" dir; cd dir; \					@@\
  	for i in list; do (set -x; RemoveFile($$i); $(LN) sub/$$i .); done
  #endif
  
--- 1049,1056 ----
  #ifndef LinkFileList
  #define LinkFileList(step,list,dir,sub)					@@\
  step:: list								@@\
! 	@MakeFlagsToShellFlags(i,set +e); \				@@\
! 	echo "	cd" dir; cd dir && \					@@\
  	for i in list; do (set -x; RemoveFile($$i); $(LN) sub/$$i .); done
  #endif
  
***************
*** 972,978 ****
  #define InstallMultipleDestFlags(step,list,dest,flags)			@@\
  step:: list								@@\
  	MakeDir($(DESTDIR)dest)						@@\
! 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
  	for i in list; do \						@@\
  		(set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest); \	@@\
  	done
--- 1064,1070 ----
  #define InstallMultipleDestFlags(step,list,dest,flags)			@@\
  step:: list								@@\
  	MakeDir($(DESTDIR)dest)						@@\
! 	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	for i in list; do \						@@\
  		(set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest); \	@@\
  	done
***************
*** 1019,1024 ****
--- 1111,1146 ----
  InstallMultipleDestFlags(install.man,list,dest,$(INSTMANFLAGS))
  #endif /* InstallMultipleMan */
  
+ /*
+  * IncludeMakefile - rule to include another Makefile.
+  * Must not generate an error or even a warning if the named file
+  * is not present, since we use this to include Makefile.dep, which
+  * may not be built yet.
+  * This is defined non-null iff HasMakefileSafeInclude is YES.
+  * The double-@ is to ensure no leading spaces on the line.
+  */
+ #ifndef IncludeMakefile
+ #if HasClearmake
+ #define IncludeMakefile(file) @@sinclude file
+ #else
+ #define IncludeMakefile(file) /**/
+ #endif
+ #endif
+ 
+ /*
+  * DependDependencyStatement - Used by DependDependency to set up the
+  * most specific dependency, which differs based on whether we support
+  * a separate Makefile.dep on this platform.
+  */
+ #ifndef DependDependencyStatement
+ #if HasMakefileSafeInclude
+ #define DependDependencyStatement()					@@\
+ DependFileName:: ProgramTargetName($(DEPEND))
+ #else
+ #define DependDependencyStatement()					@@\
+ depend:: ProgramTargetName($(DEPEND))
+ #endif
+ #endif
  
  /*
   * DependDependency - generate rules to build the makedepend program if 
***************
*** 1029,1078 ****
  #define DependDependency() /**/
  #else
  #define DependDependency() 						@@\
! depend:: ProgramTargetName($(DEPEND))					@@\
  									@@\
  ProgramTargetName($(DEPEND)):						@@\
  	@echo "checking $@ over in $(DEPENDSRC) first..."; \		@@\
! 	cd $(DEPENDSRC); $(MAKE); \					@@\
  	echo "okay, continuing in $(CURRENT_DIR)"
  
  #endif /* UseInstalled */
  #endif /* DependDependency */
  
- /*
-  * IxxDependency - generate rules to build the interface translator if 
-  * this Imakefile is within the source tree.
-  */
- #ifndef IxxDependency
- #ifdef UseInstalled
- #define IxxDependency() /**/
- #else
- #define IxxDependency()							@@\
- interfaces:: ProgramTargetName($(IXX))					@@\
- 									@@\
- ProgramTargetName($(IXX)):						@@\
- 	@echo "checking $@ over in $(IXXSRC) first..."; \		@@\
- 	cd $(IXXSRC); $(MAKE); \					@@\
- 	echo "okay, continuing in $(CURRENT_DIR)"
- #endif /* UseInstalled */
- #endif /* IxxDependency */
  
  /*
   * DependTarget - generate rules to compute dependencies for all files listed
   * in $(SRCS).
   */
  #ifndef DependTarget
  #define	DependTarget()							@@\
  DependDependency()							@@\
  									@@\
  depend::								@@\
  	RunProgram(DEPEND,$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS))
  #endif /* DependTarget */
  
  /*
   * DependTarget3 - generate rules to compute dependencies for all files given.
   */
  #ifndef DependTarget3
  #define	DependTarget3(srcs1,srcs2,srcs3)				@@\
  DependDependency()							@@\
  									@@\
--- 1151,1206 ----
  #define DependDependency() /**/
  #else
  #define DependDependency() 						@@\
! DependDependencyStatement()						@@\
! 									@@\
! NoCmpScript(ProgramTargetName($(DEPEND)))				@@\
  									@@\
  ProgramTargetName($(DEPEND)):						@@\
  	@echo "checking $@ over in $(DEPENDSRC) first..."; \		@@\
! 	cd $(DEPENDSRC) && $(MAKE); \					@@\
  	echo "okay, continuing in $(CURRENT_DIR)"
  
  #endif /* UseInstalled */
  #endif /* DependDependency */
  
  
  /*
   * DependTarget - generate rules to compute dependencies for all files listed
   * in $(SRCS).
   */
  #ifndef DependTarget
+ #if HasMakefileSafeInclude
+ #define DependTarget()							@@\
+ DependDependency()							@@\
+ 									@@\
+ depend:: DependFileName							@@\
+ 									@@\
+ DependFileName::							@@\
+ 	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)) > $@
+ #else /* HasMakefileSafeInclude */
  #define	DependTarget()							@@\
  DependDependency()							@@\
  									@@\
  depend::								@@\
  	RunProgram(DEPEND,$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS))
+ #endif /* HasMakefileSafeInclude else */
  #endif /* DependTarget */
  
  /*
   * DependTarget3 - generate rules to compute dependencies for all files given.
   */
  #ifndef DependTarget3
+ #if HasMakefileSafeInclude
+ #define DependTarget3(srcs1,srcs2,srcs3)				@@\
+ DependDependency()							@@\
+ 									@@\
+ depend:: DependFileName							@@\
+ 									@@\
+ DependFileName::							@@\
+ 	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1) > $@	@@\
+ 	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2) >> $@	@@\
+ 	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3) >> $@
+ #else /* HasMakefileSafeInclude */
  #define	DependTarget3(srcs1,srcs2,srcs3)				@@\
  DependDependency()							@@\
  									@@\
***************
*** 1080,1085 ****
--- 1208,1214 ----
  	RunProgram(DEPEND,$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1)	@@\
  	RunProgram(DEPEND,-a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2)	@@\
  	RunProgram(DEPEND,-a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3)
+ #endif /* HasMakefileSafeInclude else */
  #endif /* DependTarget3 */
  
  
***************
*** 1089,1095 ****
  #ifndef CleanTarget
  #define	CleanTarget()							@@\
  clean::									@@\
! 	$(RM_CMD) FilesToClean ExtraFilesToClean "#"*			@@\
  									@@\
  ProofCleanTarget()
  #endif /* CleanTarget */
--- 1218,1224 ----
  #ifndef CleanTarget
  #define	CleanTarget()							@@\
  clean::									@@\
! 	$(RM) FilesToClean ExtraFilesToClean "#"*			@@\
  									@@\
  ProofCleanTarget()
  #endif /* CleanTarget */
***************
*** 1117,1123 ****
  #define ImakeDependency(target)						@@\
  target:: ProgramTargetName($(IMAKE))					@@\
  									@@\
! ProgramTargetName($(IMAKE)):						@@\
  	-@(cd $(IMAKESRC); if [ -f Makefile ]; then \			@@\
  	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \	@@\
  	echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \	@@\
--- 1246,1254 ----
  #define ImakeDependency(target)						@@\
  target:: ProgramTargetName($(IMAKE))					@@\
  									@@\
! NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf)			@@\
! 									@@\
! ProgramTargetName($(IMAKE)) $(IMAKE).Osuf:				@@\
  	-@(cd $(IMAKESRC); if [ -f Makefile ]; then \			@@\
  	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \	@@\
  	echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \	@@\
***************
*** 1166,1172 ****
   */
  #ifndef LibCleanDir
  #define LibCleanDir(dir) -@if [ -d dir ]; then \			@@\
! 		(set -x; cd dir; RemoveFiles(*.Osuf)); else exit 0; fi
  #endif
  
  /*
--- 1297,1303 ----
   */
  #ifndef LibCleanDir
  #define LibCleanDir(dir) -@if [ -d dir ]; then \			@@\
! 		(set -x; cd dir && RemoveFiles(*.Osuf)); else exit 0; fi
  #endif
  
  /*
***************
*** 1177,1182 ****
--- 1308,1314 ----
  Concat(LINT,varname) = _UseCat($(LINTLIBDIR)/llib-l,libsource/llib-,libname.ln)
  #endif
  
+ 
  /*
   * UnsharedLibReferences - variables for unshared libraries
   */
***************
*** 1228,1233 ****
--- 1360,1366 ----
   */
  #ifndef CPPOnlyCompile
  #define CPPOnlyCompile(src,options) RemoveFile($@)			@@\
+ 	ClearmakeOSName							  \
  	$(CC) -E $(CFLAGS) options src > $@
  #endif
  
***************
*** 1236,1246 ****
--- 1369,1381 ----
   */
  #ifndef ObjectCompile
  #define ObjectCompile(options) RemoveFile($@)				@@\
+ 	ClearmakeOSName							  \
  	$(CC) -c $(CFLAGS) options $*.c
  #endif
  
  #ifndef ObjectCplusplusCompile
  #define ObjectCplusplusCompile(options) RemoveFile($@)			@@\
+ 	ClearmakeOSName							  \
  	$(CXX) -c $(CXXFLAGS) options $*.CCsuf
  #endif
  
***************
*** 1271,1282 ****
--- 1406,1419 ----
   */
  #ifndef LibObjCompile
  #define LibObjCompile(dir,options) RemoveFiles($@ dir/$@)		@@\
+ 	ClearmakeOSName							  \
  	$(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c		@@\
  	$(MV) $@ dir/$@
  #endif
  
  #ifndef LibObjCplusplusCompile
  #define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@)	@@\
+ 	ClearmakeOSName							  \
  	$(CXX) -c $(CXXOPTIONS) $(CXXDEFINES) options $*.CCsuf		@@\
  	$(MV) $@ dir/$@
  #endif
***************
*** 1340,1345 ****
--- 1477,1483 ----
  #define NormalFortranObjectRule()					@@\
  .f.Osuf:								@@\
  	RemoveFile($@)							@@\
+ 	ClearmakeOSName							  \
  	$(FC) -c $(FCFLAGS) $*.f
  #endif
  
***************
*** 1375,1380 ****
--- 1513,1520 ----
  
  #ifndef ObjectFromSpecialSource
  #define ObjectFromSpecialSource(dst,src,flags)				@@\
+ NoConfigRec(dst.c)							@@\
+ 									@@\
  dst.c:  src.c								@@\
  	RemoveFile($@)							@@\
  	$(LN) $? $@							@@\
***************
*** 1387,1395 ****
--- 1527,1548 ----
  	RemoveFile(dst.c)
  #endif /* ObjectFromSpecialSource */
  
+ #ifndef LexFileExplicit
+ #if HasClearmake		/* provide a place to hang ClearmakeOSName */
+ #define LexFileExplicit(file)						@@\
+ file.c: file.l								@@\
+ 	ClearmakeOSName							  \
+ 	$(LEX) $(LFLAGS) file.l						@@\
+ 	$(MV) lex.yy.c file.c
+ #else
+ #define LexFileExplicit(file) /* the default rule is fine */
+ #endif
+ #endif
  
  #ifndef LexFile
  #define LexFile(file)							@@\
+ LexFileExplicit(file)							@@\
+ 									@@\
  depend:: file.c								@@\
  									@@\
  clean::									@@\
***************
*** 1401,1406 ****
--- 1554,1560 ----
  depend:: file.c								@@\
  									@@\
  file.h file.c: file.y							@@\
+ 	ClearmakeOSName							  \
  	$(YACC) flags file.y						@@\
  	$(MV) y.tab.c file.c						@@\
  	$(MV) y.tab.h file.h						@@\
***************
*** 1409,1424 ****
  	RemoveFiles(y.tab.c y.tab.h file.h file.c)
  #endif /* YaccFile */
  
! #ifndef MakeHFromIDL
! #define MakeHFromIDL(name,flags)					@@\
  									@@\
! interfaces:: name.h							@@\
  									@@\
! name.h: name.idl							@@\
! 	@RemoveFile(name.h)						@@\
! 	$(CPP) $(CXXDEFINES) name.idl | \				@@\
! 	$(IXX) $(IXXFLAGS) $(IXXINCLUDES) -file name.idl flags > name.h
! #endif /* MakeHFromIDL */
  
  #ifndef MakeLibrary
  #define MakeLibrary(libname,objlist) $(AR) libname objlist
--- 1563,1581 ----
  	RemoveFiles(y.tab.c y.tab.h file.h file.c)
  #endif /* YaccFile */
  
! #ifndef YaccFileNoFlags
! #define YaccFileNoFlags(file)						@@\
! depend:: file.c								@@\
  									@@\
! file.c: file.y								@@\
! 	ClearmakeOSName							  \
! 	$(YACC) file.y							@@\
! 	$(MV) y.tab.c file.c						@@\
  									@@\
! clean::									@@\
! 	RemoveFiles(y.tab.c file.c)
! #endif /* YaccFileNoFlags */
! 
  
  #ifndef MakeLibrary
  #define MakeLibrary(libname,objlist) $(AR) libname objlist
***************
*** 1430,1436 ****
  #else
  #define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@\
  	RemoveFile($(BUILDLIBDIR)/lib)					@@\
! 	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .
  #endif
  #endif /* LinkBuildLibrary */
  
--- 1587,1593 ----
  #else
  #define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@\
  	RemoveFile($(BUILDLIBDIR)/lib)					@@\
! 	cd $(BUILDLIBDIR) && $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .
  #endif
  #endif /* LinkBuildLibrary */
  
***************
*** 1512,1518 ****
  									@@\
  LibraryTargetName(libname): objlist					@@\
  	RemoveFile($@)							@@\
! 	(cd down; MakeLibrary(up/$@,objlist))				@@\
  	RanLibrary($@)							@@\
  	_LinkBuildLibrary($@)
  #endif /* UnsharedLibraryTarget */
--- 1669,1675 ----
  									@@\
  LibraryTargetName(libname): objlist					@@\
  	RemoveFile($@)							@@\
! 	(cd down && MakeLibrary(up/$@,objlist))				@@\
  	RanLibrary($@)							@@\
  	_LinkBuildLibrary($@)
  #endif /* UnsharedLibraryTarget */
***************
*** 1528,1536 ****
  									@@\
  LibraryTargetName(libname): objlist1 objlist2 objlist3			@@\
  	RemoveFile($@)							@@\
! 	(cd down; MakeLibrary(up/$@,objlist1))				@@\
! 	(cd down; MakeLibrary(up/$@,objlist2))				@@\
! 	(cd down; MakeLibrary(up/$@,objlist3))				@@\
  	RanLibrary($@)							@@\
  	_LinkBuildLibrary($@)
  #endif /* UnsharedLibraryTarget3 */
--- 1685,1693 ----
  									@@\
  LibraryTargetName(libname): objlist1 objlist2 objlist3			@@\
  	RemoveFile($@)							@@\
! 	(cd down && MakeLibrary(up/$@,objlist1))			@@\
! 	(cd down && MakeLibrary(up/$@,objlist2))			@@\
! 	(cd down && MakeLibrary(up/$@,objlist3))			@@\
  	RanLibrary($@)							@@\
  	_LinkBuildLibrary($@)
  #endif /* UnsharedLibraryTarget3 */
***************
*** 1561,1567 ****
  									@@\
  LibraryTargetNameSuffix(libname,_p): objlist				@@\
  	RemoveFile($@)							@@\
! 	cd profiled; MakeLibrary(../$@,objlist)				@@\
  	RanLibrary($@)
  
  #endif /* ProfiledLibraryTarget */
--- 1718,1724 ----
  									@@\
  LibraryTargetNameSuffix(libname,_p): objlist				@@\
  	RemoveFile($@)							@@\
! 	cd profiled && MakeLibrary(../$@,objlist)			@@\
  	RanLibrary($@)
  
  #endif /* ProfiledLibraryTarget */
***************
*** 1576,1582 ****
  									@@\
  LibraryTargetNameSuffix(libname,_d): objlist				@@\
  	RemoveFile($@)							@@\
! 	cd debugger; MakeLibrary(../$@,objlist)				@@\
  	RanLibrary($@)
  
  #endif /* DebuggedLibraryTarget */
--- 1733,1739 ----
  									@@\
  LibraryTargetNameSuffix(libname,_d): objlist				@@\
  	RemoveFile($@)							@@\
! 	cd debugger && MakeLibrary(../$@,objlist)			@@\
  	RanLibrary($@)
  
  #endif /* DebuggedLibraryTarget */
***************
*** 1686,1691 ****
--- 1843,1850 ----
  	RemoveFile($@)							@@\
  	$(LN) $? $@							@@\
  									@@\
+ NoConfigRec(src)							@@\
+ 									@@\
  includes:: src								@@\
  									@@\
  depend:: src								@@\
***************
*** 1704,1709 ****
--- 1863,1870 ----
  	RemoveFile($@)							@@\
  	$(LN) $? $@							@@\
  									@@\
+ NoConfigRec(tofile)							@@\
+ 									@@\
  includes:: tofile							@@\
  									@@\
  depend:: tofile								@@\
***************
*** 1738,1748 ****
  #ifndef NamedTargetSubdirs
  #define NamedTargetSubdirs(name,dirs,verb,flags,subname)		@@\
  name::									@@\
! 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \			@@\
  	for i in dirs ;\						@@\
  	do \								@@\
! 		(cd $$i ; echo verb "in $(CURRENT_DIR)/$$i..."; \	@@\
! 			$(MAKE) $(MFLAGS) flags subname); \		@@\
  	done
  #endif
  
--- 1899,1909 ----
  #ifndef NamedTargetSubdirs
  #define NamedTargetSubdirs(name,dirs,verb,flags,subname)		@@\
  name::									@@\
! 	@MakeFlagsToShellFlags(ik,set +e); \				@@\
  	for i in dirs ;\						@@\
  	do \								@@\
! 		echo verb "in $(CURRENT_DIR)/$$i..."; \			@@\
! 		(cd $$i &&  $(MAKE) $(MFLAGS) flags subname); \		@@\
  	done
  #endif
  
***************
*** 1828,1836 ****
  /*
   * CleanSubdirs - generate rules to recursively clean out garbage files.
   */
  #ifndef NamedCleanSubdirs
  #define NamedCleanSubdirs(name,dirs) \
! NamedTargetSubdirs(name,dirs,"cleaning",RM_CMD='$(RM_CMD)',clean)
  #endif /* NamedCleanSubdirs */
  
  #ifndef CleanSubdirs
--- 1989,1998 ----
  /*
   * CleanSubdirs - generate rules to recursively clean out garbage files.
   */
+ #define BootstrapCleanSubdirs /**/	/* used at top-level */
  #ifndef NamedCleanSubdirs
  #define NamedCleanSubdirs(name,dirs) \
! NamedTargetSubdirs(name,dirs,"cleaning",BootstrapCleanSubdirs,clean)
  #endif /* NamedCleanSubdirs */
  
  #ifndef CleanSubdirs
***************
*** 1885,1897 ****
   * MakeMakeSubdirs - generate rules to recursively recreate Makefiles as part
   * of the specified step in the build.  If $(TOP) is set to an absolute path, 
   * do not prepend the ../ prefix.  This makes running things outside of the 
!  * source tree to be much easier.
   */
  #ifndef MakeMakeSubdirs
  #define MakeMakeSubdirs(dirs,target)					@@\
  target::								@@\
! 	-@case '${MFLAGS}' in *[ik]*) set +e;; esac; \			@@\
! 	case '${MFLAGS}' in *n*) executeit="no";; esac; \		@@\
  	for i in dirs ;\						@@\
  	do \								@@\
  		case "$(CURRENT_DIR)" in \				@@\
--- 2047,2068 ----
   * MakeMakeSubdirs - generate rules to recursively recreate Makefiles as part
   * of the specified step in the build.  If $(TOP) is set to an absolute path, 
   * do not prepend the ../ prefix.  This makes running things outside of the 
!  * source tree much easier.
!  * $(ONESUBDIR)/Makefile exists as a separate, explicit target so that
!  * clearmake will know what its goal is and do wink-in.
   */
  #ifndef MakeMakeSubdirs
  #define MakeMakeSubdirs(dirs,target)					@@\
+ $(ONESUBDIR)/Makefile:							@@\
+ 	@MakeFlagsToShellFlags(n,executeit="no"); \			@@\
+ 	cd $(ONESUBDIR); \						@@\
+ 	if [ "$$executeit" != "no" ]; then \				@@\
+ 		ImakeSubCmdHelper -DTOPDIR=$(IMAKETOP) -DCURDIR=$(ONECURDIR)$(ONESUBDIR); \ @@\
+ 	fi;								@@\
+ 									@@\
  target::								@@\
! 	-@MakeFlagsToShellFlags(ik,set +e); \				@@\
! 	MakeFlagsToShellFlags(n,executeit="no"); \			@@\
  	for i in dirs ;\						@@\
  	do \								@@\
  		case "$(CURRENT_DIR)" in \				@@\
***************
*** 1928,1944 ****
  		*) imaketop=$$newtop/$(TOP) \				@@\
  		   imakeprefix=$$newtop/ ;; \				@@\
  		esac; \							@@\
! 		cd $$i; \						@@\
! 		RemoveFile(Makefile.bak); \				@@\
! 		if [ -f Makefile ]; then \				@@\
  			echo "	$(MV) Makefile Makefile.bak"; \		@@\
  			if [ "$$executeit" != "no" ]; then \		@@\
! 				$(MV) Makefile Makefile.bak; \		@@\
  			fi; \						@@\
  		fi; \							@@\
! 		if [ "$$executeit" != "no" ]; then \			@@\
! 			ImakeSubCmdHelper -DTOPDIR=$$imaketop -DCURDIR=$$curdir$$i; \ @@\
! 		fi; \							@@\
  		$(MAKE) $(MFLAGS) Makefiles; \				@@\
  		cd $$newtop; \						@@\
  	done
--- 2099,2113 ----
  		*) imaketop=$$newtop/$(TOP) \				@@\
  		   imakeprefix=$$newtop/ ;; \				@@\
  		esac; \							@@\
! 		RemoveFile($$i/Makefile.bak); \				@@\
! 		if [ -f $$i/Makefile ]; then \				@@\
  			echo "	$(MV) Makefile Makefile.bak"; \		@@\
  			if [ "$$executeit" != "no" ]; then \		@@\
! 				$(MV) $$i/Makefile $$i/Makefile.bak; \	@@\
  			fi; \						@@\
  		fi; \							@@\
! 		$(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \	@@\
! 		cd $$i;	\						@@\
  		$(MAKE) $(MFLAGS) Makefiles; \				@@\
  		cd $$newtop; \						@@\
  	done
***************
*** 1946,1952 ****
  #ifdef UseInstalled
  #define ImakeSubCmdHelper $(IMAKE_CMD)
  #else
! #define ImakeSubCmdHelper $$imakeprefix$(IMAKE) -I$$imakeprefix$(IRULESRC) $(IMAKE_DEFINES)
  #endif
  
  #endif /* MakeMakeSubdirs */
--- 2115,2121 ----
  #ifdef UseInstalled
  #define ImakeSubCmdHelper $(IMAKE_CMD)
  #else
! #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
  #endif
  
  #endif /* MakeMakeSubdirs */
***************
*** 1979,1984 ****
--- 2148,2154 ----
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
  	RemoveFile($@)							@@\
+ 	ClearmakeOSName							  \
  	$(CPP) defs <src | CppSedMagic >$@				@@\
  	chmod a+x $@							@@\
  									@@\
***************
*** 1988,1993 ****
--- 2158,2164 ----
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
  	RemoveFile($@)							@@\
+ 	ClearmakeOSName							  \
  	echo \: >$@							@@\
  	sed '1d' src | $(CPP) defs | CppSedMagic >>$@			@@\
  	chmod a+x $@							@@\
***************
*** 2011,2016 ****
--- 2182,2188 ----
  #define CppFileTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
  	RemoveFile($@)							@@\
+ 	ClearmakeOSName							  \
  	$(CPP) defs <src | CppSedMagic >$@				@@\
  									@@\
  clean::									@@\
***************
*** 2023,2029 ****
  #ifndef MakeDirectories
  #define MakeDirectories(step,dirs)					@@\
  step::									@@\
! 	@case '${MFLAGS}' in *[i]*) set +e;; esac;			@@\
  	DirFailPrefix@for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \	@@\
  		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi \	@@\
  	done
--- 2195,2201 ----
  #ifndef MakeDirectories
  #define MakeDirectories(step,dirs)					@@\
  step::									@@\
! 	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	DirFailPrefix@for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \	@@\
  		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi \	@@\
  	done
diff -cr /afs/dementia.org/src/motif/andrew/config/Imake.tmpl ./Imake.tmpl
*** /afs/dementia.org/src/motif/andrew/config/Imake.tmpl	Tue Nov 14 14:51:54 1995
--- ./Imake.tmpl	Thu Apr 11 14:11:56 1996
***************
*** 1,6 ****
  XCOMM ----------------------------------------------------------------------
  XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
! XCOMM $XConsortium: Imake.tmpl,v 1.224.1.1 95/06/19 17:51:01 gildea Exp $
  XCOMM
  
  /*
--- 1,6 ----
  XCOMM ----------------------------------------------------------------------
  XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
! XCOMM $XConsortium: Imake.tmpl /main/r61_main/3 1996/02/02 18:57:32 gildea $
  XCOMM
  
  /*
***************
*** 37,47 ****
  #define HasGcc HasGcc2
  #endif
  
! XCOMM -----------------------------------------------------------------------
  XCOMM platform-specific configuration parameters - edit MacroFile to change
  #include MacroIncludeFile
  
! XCOMM -----------------------------------------------------------------------
  XCOMM site-specific configuration parameters that go after
  XCOMM the platform-specific parameters - edit site.def to change
  #define AfterVendorCF
--- 37,87 ----
  #define HasGcc HasGcc2
  #endif
  
! #ifndef HasClearmake
! #define HasClearmake NO
! #endif
! 
! /*
!  * ClearmakeOSName - insert the current OS type into the clearmake
!  * build script, so .o files from different platforms cannot be winked in.
!  * If clearmake finds the build script for two .o files is the same, it
!  * will share the .o, even across different architectures.  Inserting the
!  * O/S name into the build script in a comment prevents unwanted sharing.
!  * Note the trailing double-@ in the macro: end a line using this macro
!  * with backslash without the double-@ usually used.
!  * Like this:
!  *
!  * #define SomeRule() @@\
!  *     something or other @@\
!  *     ClearmakeOSName \
!  *     something else @@\
!  *     and more
!  */
! #ifndef ClearmakeOSName
! #if HasClearmake
! #define ClearmakeOSName	@ XCOMM $(OSNAME) @@
! #else
! #define ClearmakeOSName /**/
! #endif
! #endif
! 
! #if HasClearmake
! #ifndef MakeCmd
! #define MakeCmd clearmake
! #endif
! #endif
! 
! #if HasClearmake
! XCOMM ----------------------------------------------------------------------
! .c.o:
! 	ClearmakeOSName	$(CC) -c $(CFLAGS) $*.c
! #endif
! 
! XCOMM ----------------------------------------------------------------------
  XCOMM platform-specific configuration parameters - edit MacroFile to change
  #include MacroIncludeFile
  
! XCOMM ----------------------------------------------------------------------
  XCOMM site-specific configuration parameters that go after
  XCOMM the platform-specific parameters - edit site.def to change
  #define AfterVendorCF
***************
*** 90,97 ****
  #endif
  #endif
  
  #include <Imake.rules>
- #include <Motif.rules>
  
  #ifndef HasSharedLibraries
  #define HasSharedLibraries NO
--- 130,144 ----
  #endif
  #endif
  
+ #ifndef HasMakefileSafeInclude	    /* -include or sinclude in a Makefile */
+ #if HasClearmake
+ #define HasMakefileSafeInclude YES
+ #else
+ #define HasMakefileSafeInclude NO   /* see also vendor-specific .cf files */
+ #endif
+ #endif
+ 
  #include <Imake.rules>
  
  #ifndef HasSharedLibraries
  #define HasSharedLibraries NO
***************
*** 109,120 ****
  #define AvoidNullMakeCommand NO
  #endif
  #if AvoidNullMakeCommand
  /*
   * An obscure bug in BSD4.3's original make causes it not to recognize a
   * macro definition if the macro name starts with a non-alpha and in
   * column one.
   */
!  _NULLCMD_ = @ echo -n
  #endif
  
  #ifndef CrossCompiling
--- 156,170 ----
  #define AvoidNullMakeCommand NO
  #endif
  #if AvoidNullMakeCommand
+ #ifndef NullMakeCommand
+ #define NullMakeCommand		@ echo -n
+ #endif
  /*
   * An obscure bug in BSD4.3's original make causes it not to recognize a
   * macro definition if the macro name starts with a non-alpha and in
   * column one.
   */
!  _NULLCMD_ = NullMakeCommand
  #endif
  
  #ifndef CrossCompiling
***************
*** 131,136 ****
--- 181,190 ----
  #endif
  #endif
  
+ #ifndef ConstructMAKEFLAGS		/* needed on old BSD-based? */
+ #define ConstructMAKEFLAGS	NO	/* build MAKEFLAGS from MFLAGS */
+ #endif
+ 
  #ifndef HasLargeTmp
  #define HasLargeTmp		NO	/* be paranoid */
  #endif
***************
*** 318,324 ****
  #if UseCCMakeDepend
  #define DependDir $(CONFIGSRC)/util
  #else
! #define DependDir makedepend
  #endif
  #endif
  #ifndef UNCOMPRESSPATH
--- 372,378 ----
  #if UseCCMakeDepend
  #define DependDir $(CONFIGSRC)/util
  #else
! #define DependDir $(CONFIGSRC)/makedepend
  #endif
  #endif
  #ifndef UNCOMPRESSPATH
***************
*** 367,373 ****
  #define InstBinFlags -m 0755
  #endif
  #ifndef InstUidFlags
! #define InstUidFlags -m 4755
  #endif
  #ifndef InstLibFlags
  #define InstLibFlags -m 0644
--- 421,427 ----
  #define InstBinFlags -m 0755
  #endif
  #ifndef InstUidFlags
! #define InstUidFlags -m 4711
  #endif
  #ifndef InstLibFlags
  #define InstLibFlags -m 0644
***************
*** 381,387 ****
  #ifndef InstDatFlags
  #define InstDatFlags -m 0444
  #endif
! #ifndef InstKmemFlags     /* put -g kmem -m 2755 in site.def... */
  #define InstKmemFlags InstUidFlags
  #endif
  #ifndef ArCmdBase
--- 435,441 ----
  #ifndef InstDatFlags
  #define InstDatFlags -m 0444
  #endif
! #ifndef InstKmemFlags     /* put -g kmem -m 2711 in site.def... */
  #define InstKmemFlags InstUidFlags
  #endif
  #ifndef ArCmdBase
***************
*** 661,684 ****
  #ifdef UseInstalled		/* assume BINDIR in path */
  #define DependCmd makedepend
  #else
! #define DependCmd makedepend
  #endif
  #endif
  #ifndef DependFlags
  #define DependFlags /**/
  #endif
! #ifndef IxxCmd
! #ifdef UseInstalled
! #define IxxCmd ixx		/* assume BINDIR in path */
! #else
! #define IxxCmd $(IXXSRC)/ixx
! #endif
! #endif
! #ifndef IxxFlags
! #define IxxFlags -s BaseObject -m TypeObj -r RequestObj -p Xf
! #endif
! #ifndef IxxIncludes
! #define IxxIncludes -i '<X11/Fresco/enter-scope.h>'
  #endif
  #ifndef MkdirHierCmd
  #ifdef UseInstalled		/* assume BINDIR in path */
--- 715,728 ----
  #ifdef UseInstalled		/* assume BINDIR in path */
  #define DependCmd makedepend
  #else
! #define DependCmd $(DEPENDSRC)/makedepend
  #endif
  #endif
  #ifndef DependFlags
  #define DependFlags /**/
  #endif
! #ifndef DependFileName
! #define DependFileName Makefile.dep
  #endif
  #ifndef MkdirHierCmd
  #ifdef UseInstalled		/* assume BINDIR in path */
***************
*** 690,704 ****
--- 734,760 ----
  #ifndef TroffCmd
  #define TroffCmd psroff
  #endif
+ #ifndef NroffCmd
+ #define NroffCmd nroff
+ #endif
  #ifndef MsMacros
  #define MsMacros -ms
  #endif
+ #ifndef ManMacros
+ #define ManMacros -man
+ #endif
  #ifndef TblCmd
  #define TblCmd tbl
  #endif
  #ifndef EqnCmd
  #define EqnCmd eqn
  #endif
+ #ifndef NeqnCmd
+ #define NeqnCmd neqn
+ #endif
+ #ifndef ColCmd
+ #define ColCmd col
+ #endif
  #ifndef DvipsCmd
  #define DvipsCmd dvips
  #endif
***************
*** 784,795 ****
             DEPEND = DependCmd
          MKDIRHIER = MkdirHierCmd
          CONFIGSRC = ConfigSrc
!          IMAKESRC = $(CONFIGSRC)
          DEPENDSRC = DependDir
-            IXXSRC = $(UNSUPPORTEDSRC)/programs/ixx
-               IXX = IxxCmd
-          IXXFLAGS = IxxFlags
-       IXXINCLUDES = IxxIncludes
  
            INCROOT = IncRoot		/* base of where to put header files */
          USRLIBDIR = UsrLibDir		/* nonshared libraries */
--- 840,847 ----
             DEPEND = DependCmd
          MKDIRHIER = MkdirHierCmd
          CONFIGSRC = ConfigSrc
!          IMAKESRC = $(CONFIGSRC)/imake
          DEPENDSRC = DependDir
  
            INCROOT = IncRoot		/* base of where to put header files */
          USRLIBDIR = UsrLibDir		/* nonshared libraries */
***************
*** 818,827 ****
      CXXDEBUGFLAGS = DefaultCplusplusDebugFlags
   CXXEXTRA_DEFINES = CplusplusExtraDefines
  CXXEXTRA_INCLUDES = CplusplusExtraIncludes
-   CXXIDL_INCLUDES = -I$(TOP)/include
     CXXSTD_DEFINES = CplusplusStandardDefines
         CXXOPTIONS = CplusplusOptions
!       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) $(CXXIDL_INCLUDES) 
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES)
           CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
  #endif
--- 870,878 ----
      CXXDEBUGFLAGS = DefaultCplusplusDebugFlags
   CXXEXTRA_DEFINES = CplusplusExtraDefines
  CXXEXTRA_INCLUDES = CplusplusExtraIncludes
     CXXSTD_DEFINES = CplusplusStandardDefines
         CXXOPTIONS = CplusplusOptions
!       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES)
           CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
  #endif
***************
*** 851,859 ****
--- 902,914 ----
       LIBMANSUFFIX = LibManSuffix	/* suffix for library man pages */
      FILEMANSUFFIX = FileManSuffix	/* suffix for config file man pages */
              TROFF = TroffCmd
+             NROFF = NroffCmd
           MSMACROS = MsMacros
+         MANMACROS = ManMacros
                TBL = TblCmd
                EQN = EqnCmd
+              NEQN = NeqnCmd
+               COL = ColCmd
  #if HasLatex
              DVIPS = DvipsCmd
              LATEX = LatexCmd
***************
*** 880,885 ****
--- 935,943 ----
  #if ConstructMFLAGS
             MFLAGS = -$(MAKEFLAGS)
  #endif
+ #if ConstructMAKEFLAGS
+         MAKEFLAGS = $(MFLAGS)
+ #endif
  #if HasSharedLibraries
      SHAREDCODEDEF = SharedCodeDef
           SHLIBDEF = SharedLibraryDef
***************
*** 990,1001 ****
--- 1048,1063 ----
       CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
  
             LDLIBS = $(LDPOSTLIB) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
+ #if HasBrokenCCForLink
+            CCLINK = LdCmd
+ #else
  #if AlternateUsrLibDir && HasLdRunPath
         CCENVSETUP = LD_RUN_PATH=$(USRLIBDIR)
             CCLINK = $(CCENVSETUP) $(CC)
  #else
             CCLINK = $(CC)
  #endif
+ #endif
  #if AlternateUsrLibDir && HasLdRunPath
        CXXENVSETUP = LD_RUN_PATH=$(USRLIBDIR)
            CXXLINK = $(CXXENVSETUP) $(CXX)
***************
*** 1011,1030 ****
  
      IMAKE_DEFINES = /* leave blank, for command line use only */
  #ifdef UseInstalled
- #ifdef UseInstalledMotif
- 	 IRULESRC = $(CONFIGDIR)	/* used in rules file */
-         IMAKE_CMD = $(IMAKE) -DUseInstalled -DUseInstalledMotif -I$(IRULESRC) $(IMAKE_DEFINES)
- #else
           IRULESRC = $(CONFIGDIR)	/* used in rules file */
          IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
- #endif
  #else
           IRULESRC = $(CONFIGSRC)/cf
          IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
  #endif
       ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl \
  			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \
  			SiteIConfigFiles $(EXTRA_ICONFIGFILES)
  
  #ifndef LocalRulesFile
  /* need this to make ANSI-style preprocessors happy */
--- 1073,1093 ----
  
      IMAKE_DEFINES = /* leave blank, for command line use only */
  #ifdef UseInstalled
           IRULESRC = $(CONFIGDIR)	/* used in rules file */
          IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
  #else
           IRULESRC = $(CONFIGSRC)/cf
          IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
  #endif
+ #if !HasClearmake
+      /* clearmake records relevant defines and flags in the build script,
+ 	so it knows when they change and we don't need this coarser-level
+ 	dependency.  We also don't want it, since it prevents sharing if
+ 	even one config file, say site.def or host.def, changes. */
       ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl \
  			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \
  			SiteIConfigFiles $(EXTRA_ICONFIGFILES)
+ #endif
  
  #ifndef LocalRulesFile
  /* need this to make ANSI-style preprocessors happy */
***************
*** 1036,1042 ****
   * get project-specific configuration and rules
   */
  #include <Project.tmpl>
- #include <Motif.tmpl>
  #ifndef LocalTmplFile
  /* need this to make ANSI-style preprocessors happy */
  #define LocalTmplFile <noop.rules>
--- 1099,1104 ----
***************
*** 1049,1060 ****
  
  /* ConfigDir comes from Project.tmpl */
          CONFIGDIR = ConfigDir		/* build configuration information */
  
! XCOMM -----------------------------------------------------------------------
  XCOMM start of Imakefile
  #include INCLUDE_IMAKEFILE
  
! XCOMM -----------------------------------------------------------------------
  XCOMM common rules for all Makefiles - do not edit
  
  .c.i:
--- 1111,1125 ----
  
  /* ConfigDir comes from Project.tmpl */
          CONFIGDIR = ConfigDir		/* build configuration information */
+ #if HasClearmake
+            OSNAME = OSName
+ #endif
  
! XCOMM ----------------------------------------------------------------------
  XCOMM start of Imakefile
  #include INCLUDE_IMAKEFILE
  
! XCOMM ----------------------------------------------------------------------
  XCOMM common rules for all Makefiles - do not edit
  
  .c.i:
***************
*** 1081,1088 ****
  
  CenterLoadTarget(debug_obj,$(OBJS),NullParameter,$(ALLDEFINES))
  
  #ifdef IHaveSubdirs
! XCOMM -----------------------------------------------------------------------
  XCOMM rules for building in SUBDIRS - do not edit
  
  InstallSubdirs($(SUBDIRS))
--- 1146,1155 ----
  
  CenterLoadTarget(debug_obj,$(OBJS),NullParameter,$(ALLDEFINES))
  
+ ManKeywordsTarget($(MANPATH))
+ 
  #ifdef IHaveSubdirs
! XCOMM ----------------------------------------------------------------------
  XCOMM rules for building in SUBDIRS - do not edit
  
  InstallSubdirs($(SUBDIRS))
***************
*** 1093,1100 ****
  MakefileSubdirs($(SUBDIRS))
  IncludesSubdirs($(SUBDIRS))
  
! #else
! XCOMM -----------------------------------------------------------------------
  XCOMM empty rules for directories that do not have SUBDIRS - do not edit
  
  install::
--- 1160,1174 ----
  MakefileSubdirs($(SUBDIRS))
  IncludesSubdirs($(SUBDIRS))
  
! #endif
! 
! /* must be after all install.man rules that install anything */
! #if MakeManKeywords		/* typically only at top level */
! install.man:: man_keywords
! #endif
! 
! #ifndef IHaveSubdirs
! XCOMM ----------------------------------------------------------------------
  XCOMM empty rules for directories that do not have SUBDIRS - do not edit
  
  install::
***************
*** 1114,1118 ****
  
  #endif /* if subdirectory rules are needed */
  
! XCOMM -----------------------------------------------------------------------
  XCOMM dependencies generated by makedepend
--- 1188,1193 ----
  
  #endif /* if subdirectory rules are needed */
  
! XCOMM ----------------------------------------------------------------------
  XCOMM dependencies generated by makedepend
+ IncludeMakefile(DependFileName)
Only in /afs/dementia.org/src/motif/andrew/config: Imakefile
diff -cr /afs/dementia.org/src/motif/andrew/config/Library.tmpl ./Library.tmpl
*** /afs/dementia.org/src/motif/andrew/config/Library.tmpl	Wed Sep 27 14:49:51 1995
--- ./Library.tmpl	Thu Apr 11 14:12:00 1996
***************
*** 9,15 ****
   * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir
   */
  
! XCOMM $XConsortium: Library.tmpl,v 1.34 95/06/16 17:44:51 gildea Exp $
  
  #ifndef LibraryCplusplusOptions
  #if DoSharedLib && defined(SharedLibraryCplusplusOptions)
--- 9,15 ----
   * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir
   */
  
! XCOMM $XConsortium: Library.tmpl /main/36 1995/12/05 16:41:16 mor $
  
  #ifndef LibraryCplusplusOptions
  #if DoSharedLib && defined(SharedLibraryCplusplusOptions)
***************
*** 232,246 ****
   * Headers are generated and named according to data in the 'source'
   * file.
   */
  
  #ifndef ToolkitMakeStrings
  #define ToolkitMakeStrings(files,source,options,depends,dest)		@@\
  MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
  									@@\
! $(MAKESTRS): $(MAKESTRS).c						@@\
! 	cd $(CONFIGSRC)/util && make makestrs				@@\
  									@@\
! files: $(MAKESTRS) source depends					@@\
  	RemoveFiles(files)						@@\
  	RunProgram(MAKESTRS,options < source > dest)			@@\
  									@@\
--- 232,257 ----
   * Headers are generated and named according to data in the 'source'
   * file.
   */
+ /*
+  * The NoCmpScript
+  * prevents clearmake from trying to remake makestrs if it exists.
+  * Including both $(MAKESTRS) and $(MAKESTRS).o as primary targets
+  * prevents clearmake from trying to recompile makestrs from here.
+  * We have includes, not files, depend on makestrs to try to get
+  * clearmake to wink in the files.  Bug in clearmake 2.0.2?
+  */
  
  #ifndef ToolkitMakeStrings
  #define ToolkitMakeStrings(files,source,options,depends,dest)		@@\
  MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
+ NoCmpScript(ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)		@@\
  									@@\
! ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf:			@@\
! 	cd $(CONFIGSRC)/util && $(MAKE) ProgramTargetName(makestrs)	@@\
  									@@\
! includes:: ProgramTargetName($(MAKESTRS)) 				@@\
! 									@@\
! files: source depends							@@\
  	RemoveFiles(files)						@@\
  	RunProgram(MAKESTRS,options < source > dest)			@@\
  									@@\
***************
*** 248,254 ****
  									@@\
  includes:: files							@@\
  									@@\
! depend:: files
  #endif /* ToolkitMakeStrings */
  
  #ifdef LibName
--- 259,269 ----
  									@@\
  includes:: files							@@\
  									@@\
! depend:: files								@@\
! 									@@\
! clean::									@@\
! 	RemoveFiles(files)
! 
  #endif /* ToolkitMakeStrings */
  
  #ifdef LibName
***************
*** 261,267 ****
--- 276,286 ----
  #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
  
  #if DoSharedLib
+ #if HugeLibrary && defined(SharedLibraryTarget3)
+ SharedLibraryTarget3($(LIBNAME),$(SoRev),$(OBJS1),$(OBJS2),$(OBJS3),.,.)
+ #else
  SharedLibraryTarget($(LIBNAME),$(SoRev),$(OBJS),.,.)
+ #endif
  InstallSharedLibrary($(LIBNAME),$(SoRev),$(SHLIBDIR))
  #if HasSharedData
  SharedLibraryDataTarget($(LIBNAME),$(SoRev),$(UNSHAREDOBJS))
Only in /afs/dementia.org/src/motif/andrew/config: Makefile.ini
diff -cr /afs/dementia.org/src/motif/andrew/config/Mips.cf ./Mips.cf
*** /afs/dementia.org/src/motif/andrew/config/Mips.cf	Thu Mar 24 15:24:44 1994
--- ./Mips.cf	Thu Apr 11 14:12:12 1996
***************
*** 5,15 ****
   * sure your path includes /bsd43/bin before /bin/ or /usr/bin.
   */
  
  #define OSName            RISCOS
  #define OSMajorVersion    4
  #define OSMinorVersion    50
  
! XCOMM platform:  $XConsortium: Mips.cf,v 1.14 94/03/24 15:24:34 gildea Exp $
  XCOMM operating system:  OSName
  
  /***************************************************************************
--- 5,21 ----
   * sure your path includes /bsd43/bin before /bin/ or /usr/bin.
   */
  
+ #ifndef OSName
  #define OSName            RISCOS
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    50
+ #endif
  
! XCOMM platform:  $XConsortium: Mips.cf /main/16 1996/02/02 18:59:26 gildea $
  XCOMM operating system:  OSName
  
  /***************************************************************************
***************
*** 63,66 ****
  #define ManDirectoryRoot /man/cat
  #define ManSourcePath $(MANPATH)/man
  
! #define InstKmemFlags -g sys -m 2755
--- 69,72 ----
  #define ManDirectoryRoot /man/cat
  #define ManSourcePath $(MANPATH)/man
  
! #define InstKmemFlags -g sys -m 2711
diff -cr /afs/dementia.org/src/motif/andrew/config/NetBSD.cf ./NetBSD.cf
*** /afs/dementia.org/src/motif/andrew/config/NetBSD.cf	Wed Sep 27 14:49:51 1995
--- ./NetBSD.cf	Thu Apr 11 14:12:13 1996
***************
*** 1,82 ****
! XCOMM platform:  $XConsortium: NetBSD.cf,v 1.5 95/04/07 19:42:55 kaleb Exp $
  
- #define OSName		NetBSD
- #define	OSVendor	/**/
- XCOMM operating system:  OSName
- #define OSMajorVersion    0
- #define OSMinorVersion    9
  
- #define HasPutenv       YES
- #define HasBSD44Sockets YES
  
- #define CppCmd          /usr/libexec/cpp -traditional
- #define PreProcessCmd   /usr/libexec/cpp -traditional
- #undef  InstallCmd
- #define InstallCmd /usr/bin/install
- #undef	TblCmd
- #define	TblCmd /usr/bin/tbl
- #undef	EqnCmd
- #define	EqnCmd /usr/bin/eqn -Tascii
-           COL = /usr/bin/col
-          NEQN = /usr/bin/neqn
-         NROFF = /usr/bin/nroff
- 
- #define UseGas		YES
- #ifndef GccUsesGas
- # define GccUsesGas	YES
- #endif
  
- #ifndef AsmDefines
- # define AsmDefines -DUSE_GAS
- #endif
  
! #if GccUsesGas
! # define GccGasOption -DGCCUSESGAS
! #else
! # define GccGasOption /**/
! #endif
  
! #ifndef HasGcc2
! # define HasGcc2 YES
  #endif
  
! #define CcCmd gcc
  #if UseInstalled
! #define DefaultCCOptions	/**/
  #else
! #define DefaultCCOptions	-ansi -Dasm=__asm
  #endif
  
  #ifdef i386Architecture
! #define OptimizedCDebugFlags	-m486 -O2
! #if OSMajorVersion < 1
! #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
! #else
! #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
! #endif
  #else
! #define OptimizedCDebugFlags	-O2
! # ifdef SparcArchitecture
! #  define ServerOSDefines	-DDDXOSINIT
  # else
! #  define ServerOSDefines	/**/
  # endif
  #endif
  #define ServerExtraDefines GccGasOption XFree86ServerDefines
  
  #define StandardDefines	-DCSRG_BASED
  #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  
! #define TroffCmd        groff -Tps
! #define SetTtyGroup     YES
! #define DBMLibrary	/**/
! #define HasNdbm         YES
! #define HasShm          YES
! #define HasWChar32      YES
  
! #define HasLibCrypt	YES
  
- #define AvoidNullMakeCommand YES
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
--- 1,176 ----
! XCOMM platform:  $XConsortium: NetBSD.cf /main/14 1996/01/28 07:42:14 kaleb $
  
  
  
  
  
! XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.30 1996/01/28 07:27:35 dawes Exp $
  
! #ifndef OSName
! #define OSName		NetBSD 1.1
! #endif
! #ifndef OSVendor
! #define	OSVendor	/**/
  #endif
+ XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
+ #define OSMajorVersion    1
+ #endif
+ #ifndef OSMinorVersion
+ #define OSMinorVersion    1
+ #endif
+ /* 1 = A, 2 = B, 3 = C */
+ #ifndef OSTeenyVersion
+ #define OSTeenyVersion	  0
+ #endif
+ 
+ /*
+  * C library features
+  */
+ 
+ #define HasNdbm         	YES
+ #define HasPutenv       	YES
+ #define HasBSD44Sockets 	YES
+ #define Malloc0ReturnsNull	NO
+ #define SetTtyGroup     	YES
+ #define DBMLibrary		/**/
+ #ifndef HasLibCrypt
+ # define HasLibCrypt		YES
+ #endif
+ #ifndef HasShm
+ # if OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2
+ /*
+  * Shm memory was removed in 0.9B because it was encumbered.
+  * A free version was added in 0.9C
+  */
+ #  define HasShm          	NO
+ # else
+ #  define HasShm          	YES
+ # endif
+ #endif
+ #define HasWChar32		YES
+ 
+ /*
+  * Compiler Features
+  */
+ #undef HasGcc
+ #define HasGcc			YES
+ #define HasGcc2			YES
+ #ifndef HasGcc2ForCplusplus
+ #define HasGcc2ForCplusplus	YES
+ #endif
+ #define GccUsesGas		YES
+ #define UseGas			YES
+ #define GnuCpp			YES
+ 
+ #define NeedConstPrototypes	YES
+ #define NeedFunctionPrototypes	YES
+ #define NeedNestedPrototypes	YES
+ #define NeedVarargsPrototypes	YES
+ #define NeedWidePrototypes	NO
+ 
+ #define MkdirHierCmd		mkdir -p
+ 
+ #define CppCmd          	/usr/libexec/cpp
+ #define StandardCppDefines	-traditional
+ #define PreProcessCmd   	CppCmd
  
! #undef CcCmd
! #define CcCmd 			gcc
  #if UseInstalled
! #define DefaultCCOptions 	/**/
  #else
! #define DefaultCCOptions 	-ansi -Dasm=__asm
  #endif
  
+ #define GccGasOption 		-DGCCUSESGAS
+ #define AsmDefines 		-DUSE_GAS
+ 
+ 
  #ifdef i386Architecture
! # define OptimizedCDebugFlags 	-m486 DefaultGcc2i386Opt
! # if OSMajorVersion < 1
! #  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
! # else
! #  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
! # endif
  #else
! # define OptimizedCDebugFlags 	-O2
! # if defined(SparcArchitecture)
! #  define ServerOSDefines 	-DDDXOSINIT
  # else
! #  define ServerOSDefines 	/**/
! # endif
! # ifndef XFree86ConsoleDefines
! #  define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
  # endif
  #endif
+ #ifdef i386Architecture
  #define ServerExtraDefines GccGasOption XFree86ServerDefines
+ #else
+ #define ServerExtraDefines GccGasOption
+ #endif
  
  #define StandardDefines	-DCSRG_BASED
  #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  
! #ifndef ExtraLibraries
! #define ExtraLibraries		/**/
! #endif
! #ifndef UseGnuMalloc
! #define UseGnuMalloc		YES
! #endif
! #ifndef GnuMallocLibrary
! #define GnuMallocLibrary	-lgnumalloc
! #endif
! 
! /*
!  * Make & install Features
!  */
! 
! #define AvoidNullMakeCommand 	YES
! #define StripInstalledPrograms	YES
! #define CompressAllFonts	YES
! #define DefaultUserPath		.:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
! #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
! 
! #ifdef  InstallCmd
! # undef  InstallCmd
! # define InstallCmd 		/usr/bin/install
! #endif
! 
! #ifndef ExtraFilesToClean
! # define ExtraFilesToClean 	*.core
! #endif
! 
! /*
!  * Documentation formatting
!  */
! #define	EqnCmd 			eqn -Tps
!           COL = col
!          NEQN = neqn
!         NROFF = nroff
! #define TroffCmd        	groff -Tps
! 
! /*
!  * To use the NetBSD Aperture driver
!  */
! #if defined(i386Architecture)
! #ifndef HasNetBSDApertureDrv
! #define HasNetBSDApertureDrv	NO
! #endif
! #endif
  
! /*
!  * ForceSubdirs - force make to build subdirectories
!  * 
!  * For BSD 4.4 make 
!  */
! #define ForceSubdirs(dirs)						@@\
! dirs:	.EXEC								@@\
! 	@cd $@ ; echo "making all in $(CURRENT_DIR)/$@..."; \		@@\
! 	$(MAKE) $(MFLAGS) PassCDebugFlags all
  
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
***************
*** 91,97 ****
  file.0:: file.man							@@\
  	@if [ -f file.man ]; \						@@\
  	then \								@@\
! 	cat file.man | $(NEQN) | $(TBL) | $(NROFF) -man | $(COL) >/tmp/$$$$.man; \	@@\
  	cp /tmp/$$$$.man file.0; \					@@\
  	$(RM) /tmp/$$$$.man; \						@@\
  	fi 								@@\
--- 185,191 ----
  file.0:: file.man							@@\
  	@if [ -f file.man ]; \						@@\
  	then \								@@\
! 	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
  	cp /tmp/$$$$.man file.0; \					@@\
  	$(RM) /tmp/$$$$.man; \						@@\
  	fi 								@@\
***************
*** 105,117 ****
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
  	fi
  
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
  	for i in list; do \                                             @@\
  	  (set -x; \							@@\
! 	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) -man | $(COL) >/tmp/$$$$.suff; \	@@\
  	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
  	  $(RM) /tmp/$$$$.suff); \						@@\
  	done
--- 199,214 ----
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
  	fi
  
+ #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ 	InstallManPageLong(file,destdir,dest)
+ 
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
  	for i in list; do \                                             @@\
  	  (set -x; \							@@\
! 	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
  	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
  	  $(RM) /tmp/$$$$.suff); \						@@\
  	done
***************
*** 124,138 ****
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  				@@\
! 		$(LN) destdir/file.0 $(DESTDIR)destdir/$$i.0;\  @@\
  		); \							@@\
  	done
  
! #define NetBSDArchitecture
  
  #include <bsdLib.rules>
  
  #ifdef SparcArchitecture
  #ifndef Xsun24Server
  #define Xsun24Server	NO
--- 221,239 ----
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
! 		(cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ 		@@\
  		); \							@@\
  	done
  
! #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
! 	InstallManPageAliases(file,destdir,aliases)
  
  #include <bsdLib.rules>
  
+ /*
+  * Definitions for the SUN server on NetBSD/sparc
+  */
  #ifdef SparcArchitecture
  #ifndef Xsun24Server
  #define Xsun24Server	NO
***************
*** 143,148 ****
--- 244,255 ----
  #ifndef XsunMonoServer
  #define XsunMonoServer	YES
  #endif
+ /*
+  * XFree86 uses its own (more portable) database routines to speed up 
+  * the RGB database lookups
+  * However, if you want to use ndbm anyway, you can set that to NO in 
+  * site.def
+  */
  #ifndef UseRgbTxt
  #define UseRgbTxt	YES
  #endif
***************
*** 151,153 ****
--- 258,261 ----
  #ifdef i386Architecture
  # include <xfree86.cf>
  #endif
+ 
diff -cr /afs/dementia.org/src/motif/andrew/config/Oki.cf ./Oki.cf
*** /afs/dementia.org/src/motif/andrew/config/Oki.cf	Wed Sep 27 14:49:52 1995
--- ./Oki.cf	Thu Apr 11 14:12:15 1996
***************
*** 1,10 ****
! XCOMM platform:  $XConsortium: Oki.cf,v 1.14 95/06/09 20:57:00 gildea Exp $
  
  #define OSName			Unix System V/860 Release 4.0 Version 3
  XCOMM operating system:  OSName
  #define OSMajorVersion		4
  #define OSMinorVersion		0
  #define OSTeenyVersion		3
  
  #define BootstrapCFlags		-DOki
  #define SystemV4		YES
--- 1,18 ----
! XCOMM platform:  $XConsortium: Oki.cf /main/15 1996/01/22 17:35:50 gildea $
  
+ #ifndef OSName
  #define OSName			Unix System V/860 Release 4.0 Version 3
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion		4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		0
+ #endif
+ #ifndef OSTeenyVersion
  #define OSTeenyVersion		3
+ #endif
  
  #define BootstrapCFlags		-DOki
  #define SystemV4		YES
diff -cr /afs/dementia.org/src/motif/andrew/config/Project.tmpl ./Project.tmpl
*** /afs/dementia.org/src/motif/andrew/config/Project.tmpl	Wed Sep 27 14:49:52 1995
--- ./Project.tmpl	Thu Apr 11 14:12:00 1996
***************
*** 1,6 ****
  XCOMM ----------------------------------------------------------------------
  XCOMM X Window System Build Parameters and Rules
! XCOMM $XConsortium: Project.tmpl,v 1.249 95/05/23 21:36:40 matt Exp $
  
  /***************************************************************************
   *                                                                         *
--- 1,6 ----
  XCOMM ----------------------------------------------------------------------
  XCOMM X Window System Build Parameters and Rules
! XCOMM $XConsortium: Project.tmpl /main/r61_main/6 1996/01/15 12:26:59 gildea $
  
  /***************************************************************************
   *                                                                         *
***************
*** 47,53 ****
  #define BuildFontServer		YES
  #endif
  #ifndef BuildFonts
! #define BuildFonts		BuildServer
  #endif
  #ifndef BuildPhigs
  #define BuildPhigs		NO
--- 47,53 ----
  #define BuildFontServer		YES
  #endif
  #ifndef BuildFonts
! #define BuildFonts		(BuildServer | BuildFontServer)
  #endif
  #ifndef BuildPhigs
  #define BuildPhigs		NO
***************
*** 65,77 ****
  #define BuildXIE		YES
  #endif
  #ifndef BuildXKB
! #define BuildXKB		NO
  #endif
  #ifndef BuildXKBlib
! #define BuildXKBlib		NO	/* not yet a standard part of Xlib */
  #endif
! #ifndef BuildFresco
! #define BuildFresco		NO	/* R6 snapshot is obsolete */
  #endif
  #ifndef InstallLibManPages
  #define InstallLibManPages	YES
--- 65,91 ----
  #define BuildXIE		YES
  #endif
  #ifndef BuildXKB
! #define BuildXKB		YES
  #endif
  #ifndef BuildXKBlib
! #define BuildXKBlib		YES
  #endif
! 	/*
! 	 * WARNING: Setting UseXKBInClients to YES cause incompatibilities
! 	 *          between many clients (such as xterm) and pre-XKB shared
! 	 *          libraries.
! 	 */
! #ifndef UseXKBInClients
! #define	UseXKBInClients		NO	/* use XKB in "normal" clients? */
! #endif
! #ifndef BuildDBE
! #define BuildDBE		YES
! #endif
! #ifndef BuildMultibuffer
! #define BuildMultibuffer	NO
! #endif
! #ifndef BuildRECORD
! #define BuildRECORD		YES
  #endif
  #ifndef InstallLibManPages
  #define InstallLibManPages	YES
***************
*** 199,229 ****
  #define XkbDefines /**/
  #endif
  #endif
! #ifndef LbxDefines
! #if BuildLBX
! #define LbxDefines -DLBX
  #else
! #define LbxDefines /**/
  #endif
  #endif
  #ifndef BigReqDefines
- #if !BuildLBX
  #define BigReqDefines -DBIGREQS
  #else
! #define BigReqDefines /**/	/* LBX doesn't work with BIG-REQUESTS yet */
  #endif
  #endif
  #ifndef SitePervasiveExtensionDefines
  #define SitePervasiveExtensionDefines /**/
  #endif
  #ifndef PervasiveExtensionDefines
! #define PervasiveExtensionDefines -DSHAPE XInputDefines XkbDefines LbxDefines SitePervasiveExtensionDefines
  #endif
  #ifndef SiteExtensionDefines
  #define SiteExtensionDefines /**/
  #endif
  #ifndef BaseExtensionDefines
! #define BaseExtensionDefines -DMULTIBUFFER -DMITMISC -DXTEST -DXSYNC -DXCMISC PexDefines ShmDefines XieDefines BigReqDefines SiteExtensionDefines
  #endif
  #define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
  #endif
--- 213,275 ----
  #define XkbDefines /**/
  #endif
  #endif
! #ifndef XkbClientDefines
! #if UseXKBInClients
! #define XkbClientDefines -DXKB
  #else
! #define XkbClientDefines /**/
! #endif
  #endif
+ #ifndef XkbServerDefines
+ #define XkbServerDefines /**/
  #endif
  #ifndef BigReqDefines
  #define BigReqDefines -DBIGREQS
+ #endif
+ 
+ #ifndef DBEDefines
+ #if BuildDBE
+ #define DBEDefines -DDBE
+ #else
+ #define DBEDefines /**/
+ #endif
+ #endif
+ 
+ #ifndef PervasiveDBEDefines
+ #define PervasiveDBEDefines /* -DNEED_DBE_BUF_BITS -DNEED_DBE_BUF_VALIDATE */
+ #endif
+ 
+ #ifndef MultibufferDefines
+ #if BuildMultibuffer
+ #define MultibufferDefines -DMULTIBUFFER
+ #else
+ #define MultibufferDefines /**/
+ #endif
+ #endif
+ 
+ #ifndef VidTuneExtensionDefines
+ #define VidTuneExtensionDefines /**/
+ #endif
+ 
+ #ifndef RECORDDefines
+ #if BuildRECORD
+ #define RECORDDefines -DXRECORD
  #else
! #define RECORDDefines /**/
  #endif
  #endif
+ 
  #ifndef SitePervasiveExtensionDefines
  #define SitePervasiveExtensionDefines /**/
  #endif
  #ifndef PervasiveExtensionDefines
! #define PervasiveExtensionDefines -DSHAPE XInputDefines XkbDefines PervasiveDBEDefines SitePervasiveExtensionDefines
  #endif
  #ifndef SiteExtensionDefines
  #define SiteExtensionDefines /**/
  #endif
  #ifndef BaseExtensionDefines
! #define BaseExtensionDefines MultibufferDefines -DMITMISC -DXTEST -DXSYNC -DXCMISC RECORDDefines PexDefines ShmDefines XieDefines BigReqDefines VidTuneExtensionDefines DBEDefines SiteExtensionDefines
  #endif
  #define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
  #endif
***************
*** 475,494 ****
            XLIBSRC = $(LIBSRC)/X11
  #if SharedLibX11
  #ifndef SharedX11Rev
! #define SharedX11Rev 6.0
  #endif
- #if BuildXKBlib
- SharedLibReferences(XONLY,X11kb,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
- #else
  SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
- #endif
- #else
- #if BuildXKBlib
- UnsharedLibReferences(XONLY,X11kb,$(XLIBSRC))
  #else
  UnsharedLibReferences(XONLY,X11,$(XLIBSRC))
  #endif
- #endif
           XLIBONLY = $(XONLYLIB)
  
  #ifndef SharedLibXext
--- 521,532 ----
            XLIBSRC = $(LIBSRC)/X11
  #if SharedLibX11
  #ifndef SharedX11Rev
! #define SharedX11Rev 6.1
  #endif
  SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
  #else
  UnsharedLibReferences(XONLY,X11,$(XLIBSRC))
  #endif
           XLIBONLY = $(XONLYLIB)
  
  #ifndef SharedLibXext
***************
*** 506,512 ****
        XEXTLIBSRC = $(LIBSRC)/Xext
  #if SharedLibXext
  #ifndef SharedXextRev
! #define SharedXextRev 6.0
  #endif
  SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
  #else
--- 544,550 ----
        XEXTLIBSRC = $(LIBSRC)/Xext
  #if SharedLibXext
  #ifndef SharedXextRev
! #define SharedXextRev 6.1
  #endif
  SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
  #else
***************
*** 645,701 ****
         AWIDGETSRC = $(LIBSRC)/Xaw
  #if SharedLibXaw
  #ifndef SharedXawRev
! #define SharedXawRev 6.0
  #endif
  SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
  #else
  UnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC))
  #endif
  
- #ifndef SharedLibXtf
- #define SharedLibXtf HasSharedLibraries
- #endif
- #ifndef NormalLibXtf
- #define NormalLibXtf (!SharedLibXtf | ForceNormalLib)
- #endif
- #ifndef DebugLibXtf
- #define DebugLibXtf		NO	/* debugged widget library */
- #endif
- #ifndef ProfileLibXtf
- #define ProfileLibXtf		NO	/* profiled widget library */
- #endif
-        XTFSRC = $(TOP)/workInProgress/Xtf
- #if SharedLibXtf
- #ifndef SharedXtfRev
- #define SharedXtfRev 0.7
- #endif
- SharedLibReferences(XTF,Xtf,$(XTFSRC),SOXTFREV,SharedXtfRev)
- #else
- UnsharedLibReferences(XTF,Xtf,$(XTFSRC))
- #endif
- 
- #ifndef SharedLibFresco
- #define SharedLibFresco HasSharedLibraries
- #endif
- #ifndef NormalLibFresco
- #define NormalLibFresco (!SharedLibFresco | ForceNormalLib)
- #endif
- #ifndef DebugLibFresco
- #define DebugLibFresco		NO	/* debugged widget library */
- #endif
- #ifndef ProfileLibFresco
- #define ProfileLibFresco	NO	/* profiled widget library */
- #endif
-        FRESCOSRC = $(TOP)/workInProgress/Fresco
- #if SharedLibFresco
- #ifndef SharedFrescoRev
- #define SharedFrescoRev 0.7
- #endif
- SharedLibReferences(FRESCO,Fresco,$(FRESCOSRC)/src,SOFRESCOREV,SharedFrescoRev)
- #else
- UnsharedLibReferences(FRESCO,Fresco,$(FRESCOSRC)/src)
- #endif
- 
  #ifndef SharedLibXi
  #define SharedLibXi HasSharedLibraries
  #endif
--- 683,695 ----
         AWIDGETSRC = $(LIBSRC)/Xaw
  #if SharedLibXaw
  #ifndef SharedXawRev
! #define SharedXawRev 6.1
  #endif
  SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
  #else
  UnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC))
  #endif
  
  #ifndef SharedLibXi
  #define SharedLibXi HasSharedLibraries
  #endif
***************
*** 733,739 ****
        XTESTLIBSRC = $(LIBSRC)/Xtst
  #if SharedLibXtst
  #ifndef SharedXtstRev
! #define SharedXtstRev 6.0
  #endif
  SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
  #else
--- 727,733 ----
        XTESTLIBSRC = $(LIBSRC)/Xtst
  #if SharedLibXtst
  #ifndef SharedXtstRev
! #define SharedXtstRev 6.1
  #endif
  SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
  #else
***************
*** 871,876 ****
--- 865,896 ----
           FONTLIBSRC = $(LIBSRC)/font
  UnsharedLibReferences(FONT,font,$(FONTLIBSRC))
  
+ #ifdef BuildXKBlib
+     XKBFILELIBSRC = $(LIBSRC)/xkbfile
+ UnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC))
+ #ifndef XkbClientDepLibs
+ #if UseXKBInClients
+ #define	XkbClientDepLibs $(DEPXKBFILELIB)
+ #else
+ #define	XkbClientDepLibs /**/
+ #endif
+ #endif
+ #ifndef XkbClientLibs
+ #if UseXKBInClients
+ #define	XkbClientLibs $(XKBFILELIB)
+ #else
+ #define	XkbClientLibs /**/
+ #endif
+ #endif
+ #else /* !BuildXKBlib */
+ #ifndef XkbClientDepLibs
+ #define	XkbClientDepLibs 
+ #endif
+ #ifndef XkbClientLibs
+ #define	XkbClientLibs
+ #endif
+ #endif /* BuildXKBlib */
+ 
  #ifndef XawClientDepLibs
  #define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
  #endif
***************
*** 878,890 ****
  #define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
  #endif
  
- #ifndef FrescoClientDepLibs
- #define FrescoClientDepLibs $(DEPFRESCOLIB) $(DEPXLIB)
- #endif
- #ifndef FrescoClientLibs
- #define FrescoClientLibs $(FRESCOLIB) $(XLIB) MathLibrary
- #endif
- 
  #ifndef NeedDefaultDepLibs
  #define NeedDefaultDepLibs YES
  #endif
--- 898,903 ----
***************
*** 905,932 ****
  
  
  /*
!  * InstallAppDefaults - generate rules to install appliation default files 
!  * if the InstallAppDefFiles configuration parameter is set.
   */
  #ifndef InstallAppDefaults
! #if InstallAppDefFiles
! #define	InstallAppDefaults(class)					@@\
! InstallNamedTarget(install,class.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
! #else
! #define	InstallAppDefaults(class)
! #endif /* InstallAppDefFiles */
  #endif /* InstallAppDefaults */
  
  /*
!  * InstallAppDefaultsLong - generate rules to install appliation default files 
   * if the InstallAppDefFiles configuration parameter is set.
   */
  #ifndef InstallAppDefaultsLong
  #if InstallAppDefFiles
! #define	InstallAppDefaultsLong(file,class)				@@\
  InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
  #else
! #define	InstallAppDefaultsLong(file,class)
  #endif /* InstallAppDefFiles */
  #endif /* InstallAppDefaultsLong */
  
--- 918,940 ----
  
  
  /*
!  * InstallAppDefaults - simple rules to install application default file
   */
  #ifndef InstallAppDefaults
! #define InstallAppDefaults(class) InstallAppDefaultsLong(class,class)
  #endif /* InstallAppDefaults */
  
  /*
!  * InstallAppDefaultsLong - general rule to install application default file
   * if the InstallAppDefFiles configuration parameter is set.
   */
  #ifndef InstallAppDefaultsLong
  #if InstallAppDefFiles
! #define InstallAppDefaultsLong(file,class)				@@\
  InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
  #else
! #define InstallAppDefaultsLong(file,class)				@@\
! InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
  #endif /* InstallAppDefFiles */
  #endif /* InstallAppDefaultsLong */
  
***************
*** 1029,1044 ****
  #define FontObj(basename) FontBaseObj(basename)
  #endif /* CompressAllFonts */
  
  #ifndef MakeSimpleDoc
  #define MakeSimpleDoc(file,srcs)					@@\
  all:: file.PS								@@\
  									@@\
! file.PS:								@@\
! 	$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > file.nPS \@@\
! 	&& $(MV) file.nPS $@						@@\
  									@@\
! file.txt:								@@\
! 	nroff $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > $@		@@\
  									@@\
  clean::									@@\
  	$(RM) index.raw file.nPS file.PS file.txt
--- 1037,1062 ----
  #define FontObj(basename) FontBaseObj(basename)
  #endif /* CompressAllFonts */
  
+ /*
+  * PostProcessTroffPS - by default moves the working output into place,
+  * but can be a hook for more complicated post-processing.
+  */
+ #ifndef PostProcessTroffPS
+ #define PostProcessTroffPS(temp,real) $(MV) temp real
+ #endif
+ 
  #ifndef MakeSimpleDoc
  #define MakeSimpleDoc(file,srcs)					@@\
  all:: file.PS								@@\
+ .PRECIOUS: file.PS							@@\
  									@@\
! file.PS: srcs								@@\
! 	-$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > file.nPS \@@\
! 	&& PostProcessTroffPS(file.nPS,$@)				@@\
! 	@if grep '^[^1-9.]' index.raw; then exit 1; else test $$? = 1; fi @@\
  									@@\
! file.txt: srcs								@@\
! 	$(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > $@	@@\
  									@@\
  clean::									@@\
  	$(RM) index.raw file.nPS file.PS file.txt
***************
*** 1047,1059 ****
  #ifndef MakeTblDoc
  #define MakeTblDoc(file,srcs)						@@\
  all:: file.PS								@@\
  									@@\
! file.PS:								@@\
! 	$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
! 	&& $(MV) file.nPS $@						@@\
  									@@\
! file.txt:								@@\
! 	$(TBL) $(XDOCMACROS) srcs | nroff $(MSMACROS) 2> index.raw | col > $@	@@\
  									@@\
  clean::									@@\
  	$(RM) index.raw file.nPS file.PS file.txt
--- 1065,1079 ----
  #ifndef MakeTblDoc
  #define MakeTblDoc(file,srcs)						@@\
  all:: file.PS								@@\
+ .PRECIOUS: file.PS							@@\
  									@@\
! file.PS: srcs								@@\
! 	-$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
! 	&& PostProcessTroffPS(file.nPS,$@)				@@\
! 	@if grep '^[^1-9.]' index.raw; then exit 1; else test $$? = 1; fi @@\
  									@@\
! file.txt: srcs								@@\
! 	$(TBL) $(XDOCMACROS) srcs | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) > $@	@@\
  									@@\
  clean::									@@\
  	$(RM) index.raw file.nPS file.PS file.txt
***************
*** 1062,1074 ****
  #ifndef MakeEqnDoc
  #define MakeEqnDoc(file,srcs)						@@\
  all:: file.PS								@@\
  									@@\
! file.PS:								@@\
! 	$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
! 	&& $(MV) file.nPS $@						@@\
  									@@\
! file.txt:								@@\
! 	$(TBL) $(XDOCMACROS) srcs | neqn | nroff $(MSMACROS) 2> index.raw | col > $@ @@\
  									@@\
  clean::									@@\
  	$(RM) index.raw file.nPS file.PS file.txt
--- 1082,1096 ----
  #ifndef MakeEqnDoc
  #define MakeEqnDoc(file,srcs)						@@\
  all:: file.PS								@@\
+ .PRECIOUS: file.PS							@@\
  									@@\
! file.PS: srcs								@@\
! 	-$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
! 	&& PostProcessTroffPS(file.nPS,$@)				@@\
! 	@if grep '^[^1-9.]' index.raw; then exit 1; else test $$? = 1; fi @@\
  									@@\
! file.txt: srcs								@@\
! 	$(TBL) $(XDOCMACROS) srcs | $(NEQN) | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) > $@ @@\
  									@@\
  clean::									@@\
  	$(RM) index.raw file.nPS file.PS file.txt
***************
*** 1078,1086 ****
  #define MakeDocIndex(file,srcs)						@@\
  all:: file.idx.PS							@@\
  									@@\
! file.idx.PS:								@@\
  	tail -1 index.raw > index.pageno				@@\
! 	grep -v '^.pn ' index.raw | sort -f '-t:' +1 -3 +0n -1n | awk -f $(DOCUTILSRC)/fixindex.awk | awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
  	cat srcs $(XIDXMACROS) index.troff | $(TROFF) -me > file.idx.nPS \@@\
  	&& $(MV) file.idx.nPS $@					@@\
  	$(RM) index.troff index.pageno					@@\
--- 1100,1108 ----
  #define MakeDocIndex(file,srcs)						@@\
  all:: file.idx.PS							@@\
  									@@\
! file.idx.PS: srcs index.raw						@@\
  	tail -1 index.raw > index.pageno				@@\
! 	grep '^[1-9]' index.raw | sort -f '-t:' +1 -3 +0n -1n | awk -f $(DOCUTILSRC)/fixindex.awk | awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
  	cat srcs $(XIDXMACROS) index.troff | $(TROFF) -me > file.idx.nPS \@@\
  	&& $(MV) file.idx.nPS $@					@@\
  	$(RM) index.troff index.pageno					@@\
Only in /afs/dementia.org/src/motif/andrew/config: Project.tmpl.orig
Only in /afs/dementia.org/src/motif/andrew/config: README
diff -cr /afs/dementia.org/src/motif/andrew/config/Threads.tmpl ./Threads.tmpl
*** /afs/dementia.org/src/motif/andrew/config/Threads.tmpl	Wed Mar 30 12:04:53 1994
--- ./Threads.tmpl	Thu Apr 11 14:12:02 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: Threads.tmpl,v 1.3 94/03/30 12:04:19 gildea Exp $
  
  /*
   * For a multi-threaded application or library,
--- 1,4 ----
! XCOMM $XConsortium: Threads.tmpl /main/8 1995/11/14 19:56:41 kaleb $
  
  /*
   * For a multi-threaded application or library,
***************
*** 33,38 ****
--- 33,54 ----
  #ifndef SystemMTDefines
  #define SystemMTDefines /**/
  #endif
+ #ifndef LibraryMTDefines
+ #define LibraryMTDefines /**/
+ #endif
+ #ifndef HasThreadSafeAPI		/* does it have getpwnam_r, etc. */
+ #define HasThreadSafeAPI YES
+ #endif
+ #ifndef MTSafeAPIDefines
+ #if HasThreadSafeAPI
+ #define MTSafeAPIDefines -DXUSE_MTSAFE_API
+ #else
+ #define MTSafeAPIDefines /**/
+ #endif
+ #endif
+ #ifndef ThreadPreStdAPIDefines
+ #define ThreadPreStdAPIDefines /* nominally for POSIX P1003.4a (Draft 4) API */
+ #endif
  #ifndef CplusplusSystemMTDefines
  #define CplusplusSystemMTDefines /**/
  #endif
***************
*** 58,69 ****
  
  #if LocalThreads
      THREADS_CFLAGS = ThreadsCompileFlags
!    THREADS_DEFINES = LocalThreadsDefines ThreadTypeDefines SystemMTDefines
     THREADS_LDFLAGS = ThreadsLoadFlags
        THREADS_LIBS = ThreadsLibraries
  
    THREADS_CXXFLAGS = ThreadsCplusplusCompileFlags
! THREADS_CXXDEFINES = LocalThreadsDefines ThreadTypeDefines CplusplusSystemMTDefines
  THREADS_CXXLDFLAGS = ThreadsCplusplusLoadFlags
     THREADS_CXXLIBS = ThreadsCplusplusLibraries
  #endif
--- 74,85 ----
  
  #if LocalThreads
      THREADS_CFLAGS = ThreadsCompileFlags
!    THREADS_DEFINES = LocalThreadsDefines ThreadTypeDefines SystemMTDefines MTSafeAPIDefines ThreadPreStdAPIDefines
     THREADS_LDFLAGS = ThreadsLoadFlags
        THREADS_LIBS = ThreadsLibraries
  
    THREADS_CXXFLAGS = ThreadsCplusplusCompileFlags
! THREADS_CXXDEFINES = LocalThreadsDefines ThreadTypeDefines CplusplusSystemMTDefines MTSafeAPIDefines ThreadPreStdAPIDefines
  THREADS_CXXLDFLAGS = ThreadsCplusplusLoadFlags
     THREADS_CXXLIBS = ThreadsCplusplusLibraries
  #endif
Only in .: Wc.tmpl
diff -cr /afs/dementia.org/src/motif/andrew/config/Win32.cf ./Win32.cf
*** /afs/dementia.org/src/motif/andrew/config/Win32.cf	Fri Apr  1 19:59:04 1994
--- ./Win32.cf	Thu Apr 11 14:12:16 1996
***************
*** 1,32 ****
! XCOMM platform:  $XConsortium: Win32.cf,v 1.38 94/04/01 19:58:56 kaleb Exp $
  
! #define OSName			Microsoft Windows NT 3.1
  XCOMM operating system:  OSName
  #define OSMajorVersion		3
! #define OSMinorVersion		1
  
  #define BootstrapCFlags		-DWIN32
  #ifdef _M_IX86
  #define CpuDefines -D_X86_
  #endif
  /* brain-damaged windows headers will not compile with -Za */
! #define StandardDefines -DWIN32 -D_DLL -D_MT -D__STDC__ CpuDefines
  #define DefaultCCOptions -nologo -batch -G4 -W2
  #define DebuggableCDebugFlags -Zi
  #define ThreadedX		YES
  #define CpCmd copy
  #define LnCmd copy
  #define MvCmd ren
  #define RmCmd del
  /* if you do not have deltree, substitute rd /s and suffer the prompts */
  #define RmTreeCmd deltree /y
  #define CcCmd cl
  #define HasCplusplus		YES
  #define CplusplusCmd cl
  #define PreProcessCmd CcCmd -nologo -batch -EP
  #define CppCmd  CcCmd -nologo -batch -E
  #define PatheticCpp		YES
  #define ArCmdBase lib32
  #define ArCmd ArCmdBase
  #define CplusplusCmd cl
  #define MkdirHierCmd mkdir
--- 1,53 ----
! XCOMM platform:  $XConsortium: Win32.cf /main/45 1996/01/19 15:18:37 kaleb $
  
! #ifndef OSName
! #define OSName			Microsoft Windows NT 3.5
! #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion		3
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion		5
! #endif
! #ifndef OSTeenyVersion
! #define OSTeenyVersion		0
! #endif
! 
! #ifndef CompilerMajorVersion
! #define CompilerMajorVersion	2	/* 0 == NT 3.1 Win32 SDK */
! #endif
  
  #define BootstrapCFlags		-DWIN32
  #ifdef _M_IX86
  #define CpuDefines -D_X86_
  #endif
  /* brain-damaged windows headers will not compile with -Za */
! #define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines
  #define DefaultCCOptions -nologo -batch -G4 -W2
  #define DebuggableCDebugFlags -Zi
  #define ThreadedX		YES
+ #define HasThreadSafeAPI	NO
  #define CpCmd copy
  #define LnCmd copy
  #define MvCmd ren
  #define RmCmd del
+ #ifndef RmTreeCmd
  /* if you do not have deltree, substitute rd /s and suffer the prompts */
  #define RmTreeCmd deltree /y
+ #endif
  #define CcCmd cl
  #define HasCplusplus		YES
  #define CplusplusCmd cl
  #define PreProcessCmd CcCmd -nologo -batch -EP
  #define CppCmd  CcCmd -nologo -batch -E
  #define PatheticCpp		YES
+ #define ConstructMFLAGS		YES
+ #if (CompilerMajorVersion == 0)
  #define ArCmdBase lib32
+ #else
+ #define ArCmdBase lib
+ #endif
  #define ArCmd ArCmdBase
  #define CplusplusCmd cl
  #define MkdirHierCmd mkdir
***************
*** 39,54 ****
  #define InstManFlags /**/
  #define InstDatFlags /**/
  #define InstallFlags /**/
  #define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
  #define MakeCmd nmake -nologo
  #define LdCmd link32
  #define MathLibrary
  #define HasSymLinks		NO
  #define HasPutenv		YES
  #define Osuf obj
  #define BuildServer		NO
  #define ConnectionFlags		-DTCPCONN
! #define StdIncDir /mstools/h
  #define LdPreLib /**/
  #define LdPostLib /**/
  #ifndef UseInstalled
--- 60,90 ----
  #define InstManFlags /**/
  #define InstDatFlags /**/
  #define InstallFlags /**/
+ #if (CompilerMajorVersion == 0)
  #define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
+ #else
+ #define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
+ #endif
  #define MakeCmd nmake -nologo
+ #if (CompilerMajorVersion == 0)
  #define LdCmd link32
+ #else
+ #define LdCmd link
+ #endif
  #define MathLibrary
  #define HasSymLinks		NO
  #define HasPutenv		YES
  #define Osuf obj
+ #ifndef CCsuf
+ #define CCsuf cxx
+ #endif
  #define BuildServer		NO
  #define ConnectionFlags		-DTCPCONN
! 
! /* override as necessary in site.def/host.def */
! #ifndef StdIncDir
! #define StdIncDir 		D:/MSVC20/INCLUDE
! #endif
  #define LdPreLib /**/
  #define LdPostLib /**/
  #ifndef UseInstalled
***************
*** 61,67 ****
  #define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S)
  
  #define BuildFonts		NO
- #define BuildFresco		NO
  #define XawI18nDefines		-DHAS_WCHAR_H
  
  #include <Win32.rules>
--- 97,102 ----
diff -cr /afs/dementia.org/src/motif/andrew/config/Win32.rules ./Win32.rules
*** /afs/dementia.org/src/motif/andrew/config/Win32.rules	Mon Mar 28 17:11:32 1994
--- ./Win32.rules	Thu Apr 11 14:11:47 1996
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: Win32.rules,v 1.40 94/03/28 17:11:24 matt Exp $
  
  #define HasSharedLibraries YES
  #define NeedLibInsideFlag YES
--- 1,4 ----
! XCOMM platform:  $XConsortium: Win32.rules /main/45 1996/01/19 15:26:44 kaleb $
  
  #define HasSharedLibraries YES
  #define NeedLibInsideFlag YES
***************
*** 53,59 ****
  	$(MV) $@ dir\$@
  
  #define BuildIncludesTop(srclist,dstsubdir,dstupdir)			@@\
! includes::								@@\
  	MakeDir($(BUILDINCDIR:/=\))					@@\
  	@$(MAKE) $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
--- 53,59 ----
  	$(MV) $@ dir\$@
  
  #define BuildIncludesTop(srclist,dstsubdir,dstupdir)			@@\
! includes:: srclist							@@\
  	MakeDir($(BUILDINCDIR:/=\))					@@\
  	@$(MAKE) $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
***************
*** 70,78 ****
  XVARdef0 = $(BUILDINCDIR)/dstsubdir					@@\
  XVARdef1 = $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)			@@\
  									@@\
! includes::								@@\
  	MakeDir($(XVARuse0:/=\))					@@\
! 	@$(MAKE) $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
  									@@\
  all: srclist								@@\
--- 70,78 ----
  XVARdef0 = $(BUILDINCDIR)/dstsubdir					@@\
  XVARdef1 = $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)			@@\
  									@@\
! includes:: srclist							@@\
  	MakeDir($(XVARuse0:/=\))					@@\
! 	@$(MAKE) -A $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
  									@@\
  all: srclist								@@\
***************
*** 91,97 ****
  step:: $(XVARuse2:/=\)							@@\
  	cd $(XVARuse0:/=\)						@@\
  	!RemoveFile($**)						@@\
! 	!$(LN) $(XVARuse1:/=\)\$** .
  
  #define LinkRule(program,options,objects,libraries) \
  $(CCLINK) Concat(-Fe,program) options objects libraries $(EXTRA_LOAD_FLAGS)
--- 91,97 ----
  step:: $(XVARuse2:/=\)							@@\
  	cd $(XVARuse0:/=\)						@@\
  	!RemoveFile($**)						@@\
! 	!$(LN) $(XVARuse1:/=\)\\$** .
  
  #define LinkRule(program,options,objects,libraries) \
  $(CCLINK) Concat(-Fe,program) options objects libraries $(EXTRA_LOAD_FLAGS)
***************
*** 305,311 ****
  XVARdef1 = $$								@@\
  									@@\
  target::								@@\
! 	@$(MAKE) $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
  									@@\
  all: $(XVARuse0:/=\)							@@\
--- 305,311 ----
  XVARdef1 = $$								@@\
  									@@\
  target::								@@\
! 	@$(MAKE) -A $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
  									@@\
  all: $(XVARuse0:/=\)							@@\
***************
*** 327,333 ****
  XVARdef1 = $$								@@\
  									@@\
  name::									@@\
! 	@$(MAKE) $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
  									@@\
  all: $(XVARuse0:/=\)							@@\
--- 327,333 ----
  XVARdef1 = $$								@@\
  									@@\
  name::									@@\
! 	@$(MAKE) -A $(MFLAGS) -f <<					@@\
  .SUFFIXES:								@@\
  									@@\
  all: $(XVARuse0:/=\)							@@\
***************
*** 379,389 ****
  	RemoveFiles(dst)
  
  #define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
! XVARdef0 = $(DESTDIR)dest/						@@\
  									@@\
  step:: srcname								@@\
  	MakeDir($(XVARuse0:/=\))					@@\
! 	$(INSTALL) $(INSTALLFLAGS) flags srcname $(XVARuse0:/=\)dstname
  
  
  #define	InstallLibrary(libname,dest)					@@\
--- 379,397 ----
  	RemoveFiles(dst)
  
  #define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
! XVARdef0 = $(DESTDIR)dest						@@\
! 									@@\
! step:: srcname								@@\
! 	MakeDir($(XVARuse0:/=\))					@@\
! 	$(INSTALL) $(INSTALLFLAGS) flags srcname $(XVARuse0:/=\)\\dstname
! 
! #define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname)	@@\
! XVARdef0 = $(DESTDIR)dest						@@\
  									@@\
  step:: srcname								@@\
  	MakeDir($(XVARuse0:/=\))					@@\
! 	@if exist $(XVARuse0:/=\)\\dstname echo Not overwriting existing $(XVARuse0:/=\)\\dstname @@\
! 	if not exist $(XVARuse0:/=\)\\dstname $(INSTALL) $(INSTALLFLAGS) flags srcname $(XVARuse0:/=\)\\dstname
  
  
  #define	InstallLibrary(libname,dest)					@@\
diff -cr /afs/dementia.org/src/motif/andrew/config/apollo.cf ./apollo.cf
*** /afs/dementia.org/src/motif/andrew/config/apollo.cf	Wed Oct 13 15:33:33 1993
--- ./apollo.cf	Thu Apr 11 14:12:16 1996
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: apollo.cf,v 1.31 93/08/07 11:24:47 rws Exp $
  
  /*
   * Minimally tested, and only in the bsd4.3 environment.  X_NOT_POSIX is not
--- 1,4 ----
! XCOMM platform:  $XConsortium: apollo.cf /main/33 1996/01/22 17:36:07 gildea $
  
  /*
   * Minimally tested, and only in the bsd4.3 environment.  X_NOT_POSIX is not
***************
*** 7,19 ****
--- 7,29 ----
   * POSIX is supported in sysv).
   */
  
+ #ifndef OSName
  #define OSName            Domain/OS SR10.3
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion    10
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    3
+ #endif
  
+ #ifndef CCompilerMajorVersion
  #define CCompilerMajorVersion 6
+ #endif
+ #ifndef CCompilerMinorVersion
  #define CCompilerMinorVersion 8
+ #endif
  
  #define StandardDefines -DX_NOT_POSIX
  #define BuildServer	NO
***************
*** 23,28 ****
  #define	InstallManPageLong(file,destdir,dest)				@@\
  install.man:: file.man							@@\
  	MakeDir($(DESTDIR)destdir)					@@\
! 	nroff -man file.man > file.mantxt				@@\
  	$(INSTALL) -c $(INSTMANFLAGS) file.mantxt $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
  	$(RM) file.mantxt
--- 33,38 ----
  #define	InstallManPageLong(file,destdir,dest)				@@\
  install.man:: file.man							@@\
  	MakeDir($(DESTDIR)destdir)					@@\
! 	$(NROFF) $(MANMACROS) file.man > file.mantxt				@@\
  	$(INSTALL) -c $(INSTMANFLAGS) file.mantxt $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
  	$(RM) file.mantxt
Only in /afs/dementia.org/src/motif/andrew/config: att.cf
diff -cr /afs/dementia.org/src/motif/andrew/config/bsd.cf ./bsd.cf
*** /afs/dementia.org/src/motif/andrew/config/bsd.cf	Mon Jan 30 18:41:22 1995
--- ./bsd.cf	Thu Apr 11 14:12:17 1996
***************
*** 1,9 ****
! XCOMM platform:  $XConsortium: bsd.cf,v 1.22 95/01/05 19:30:02 kaleb Exp $
  
  #define OSName            4.3bsd
  XCOMM operating system:  OSName
  #define OSMajorVersion    4
  #define OSMinorVersion    3
  
  #define BootstrapCFlags -DNOSTDHDRS
  #define StandardDefines -DNOSTDHDRS -DCSRG_BASED
--- 1,15 ----
! XCOMM platform:  $XConsortium: bsd.cf /main/23 1996/01/22 17:36:14 gildea $
  
+ #ifndef OSName
  #define OSName            4.3bsd
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion    4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    3
+ #endif
  
  #define BootstrapCFlags -DNOSTDHDRS
  #define StandardDefines -DNOSTDHDRS -DCSRG_BASED
diff -cr /afs/dementia.org/src/motif/andrew/config/bsdLib.rules ./bsdLib.rules
*** /afs/dementia.org/src/motif/andrew/config/bsdLib.rules	Tue Mar 29 15:34:40 1994
--- ./bsdLib.rules	Thu Apr 11 14:11:48 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: bsdLib.rules,v 1.1 94/03/29 15:34:45 gildea Exp $
  
  /*
   * NetBSD/FreeBSD shared library rules
--- 1,4 ----
! XCOMM $XConsortium: bsdLib.rules /main/2 1996/01/24 06:38:15 kaleb $
  
  /*
   * NetBSD/FreeBSD shared library rules
***************
*** 6,14 ****
  
  #ifndef HasSharedLibraries
  #define HasSharedLibraries YES
- #endif
- #ifndef ForceNormalLib
- #define ForceNormalLib YES
  #endif
  #ifndef SharedDataSeparation
  #define SharedDataSeparation NO
--- 6,11 ----
diff -cr /afs/dementia.org/src/motif/andrew/config/bsdi.cf ./bsdi.cf
*** /afs/dementia.org/src/motif/andrew/config/bsdi.cf	Mon Jan 30 18:41:22 1995
--- ./bsdi.cf	Thu Apr 11 14:12:17 1996
***************
*** 1,20 ****
! XCOMM platform:  $XConsortium: bsdi.cf,v 1.14 95/01/11 18:27:52 kaleb Exp $
  
! #define OSName            BSD/386 1.1
  #define OSVendor          BSDI
  XCOMM operating system:  OSName
! #define OSMajorVersion    1
! #define OSMinorVersion    1
  
  #define HasPutenv	YES
  #define HasBSD44Sockets	YES
! #if OSMinorVersion >= 1
! #define HasGcc2		YES
! #define HasGcc2ForCplusplus YES
! #define CcCmd		gcc2
  #endif
  #define CppCmd		/usr/bin/cpp
  #define TroffCmd	groff -Tps
  #define SetTtyGroup	YES
  #define HasNdbm		YES
  #define HasWChar32      YES
--- 1,53 ----
! XCOMM platform:  $XConsortium: bsdi.cf /main/21 1996/01/22 17:36:20 gildea $
! XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.19 1995/10/21 11:26:00 dawes Exp $
  
! #ifndef OSName
! #define OSName            BSD/OS 2.0
! #endif
! #ifndef OSVendor
  #define OSVendor          BSDI
+ #endif
  XCOMM operating system:  OSName
! #ifndef OSMajorVersion
! #define OSMajorVersion    2
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion    0
! #endif
  
  #define HasPutenv	YES
  #define HasBSD44Sockets	YES
! 
! XCOMM BSD/OS 2.0 comes with gcc 2.6.3 installed as gcc2 and gcc.
! XCOMM gcc 1.42 is installed as cc.
! XCOMM BSD/386 1.1 comes with gcc 2.5.8 installed as gcc2.
! XCOMM gcc 1.42 is installed as cc and gcc.
! XCOMM BSD/386 1.0 comes with gcc 1.40 as the only compiler.
! XCOMM The default is to use gcc2 on release 2.0 and 1.1 and gcc1 on 1.0
! XCOMM The defaults can be altered by defining "HasGcc2" as YES or NO in
! XCOMM xf86site.def
! 
! #ifndef HasGcc
! # define HasGcc			YES
! #endif
! #if OSMajorVersion > 1 || OSMinorVersion >= 1
! # ifndef HasGcc2
! #  define HasGcc2		YES
! # endif
! #endif
! #if HasGcc2
! # ifndef HasGcc2ForCplusplus
! #  define HasGcc2ForCplusplus	YES
! # endif
! # define CcCmd			gcc2
! # define OptimizedCDebugFlags	DefaultGcc2i386Opt -m486
! #else
! # define CcCmd			cc
! # define OptimizedCDebugFlags	-O
  #endif
  #define CppCmd		/usr/bin/cpp
  #define TroffCmd	groff -Tps
+ #define MkdirHierCmd	mkdir -p
  #define SetTtyGroup	YES
  #define HasNdbm		YES
  #define HasWChar32      YES
***************
*** 23,28 ****
--- 56,68 ----
  # ifndef GccUsesGas
  #  define GccUsesGas    YES
  # endif
+ #if HasGcc
+ #if UseInstalled
+ #define DefaultCCOptions	/**/
+ #else
+ #define DefaultCCOptions	-ansi
+ #endif
+ #endif
  
  #if GccUsesGas
  # define GccGasOption -DGCCUSESGAS
***************
*** 37,53 ****
  
  #define StandardDefines	-DCSRG_BASED
  
- #undef  InstallCmd
  #define InstallCmd /usr/bin/install
! #undef	TblCmd
! #define	TblCmd /usr/bin/tbl
! #undef	EqnCmd
! #define	EqnCmd /usr/bin/eqn -Tascii
!           COL = /usr/bin/col
!          NEQN = /usr/bin/eqn -Tascii
!         NROFF = /usr/bin/nroff
  
! #define OptimizedCDebugFlags	-O2 -m486
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
--- 77,90 ----
  
  #define StandardDefines	-DCSRG_BASED
  
  #define InstallCmd /usr/bin/install
! #define	EqnCmd eqn -Tps
!           COL = col
!          NEQN = eqn -Tascii
!         NROFF = nroff
  
! #define DefaultUserPath		:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
! #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
***************
*** 61,67 ****
  file.0:: file.man							@@\
  	@if [ -f file.man ]; \						@@\
  	then \								@@\
! 	cat file.man | $(NEQN) | $(TBL) | $(NROFF) -man | $(COL) >/tmp/$$$$.man; \	@@\
  	cp /tmp/$$$$.man file.0; \					@@\
  	$(RM) /tmp/$$$$.man; \						@@\
  	fi 								@@\
--- 98,104 ----
  file.0:: file.man							@@\
  	@if [ -f file.man ]; \						@@\
  	then \								@@\
! 	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
  	cp /tmp/$$$$.man file.0; \					@@\
  	$(RM) /tmp/$$$$.man; \						@@\
  	fi 								@@\
***************
*** 75,87 ****
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
  	fi
  
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
  	for i in list; do \                                             @@\
  	  (set -x; \							@@\
! 	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) -man | $(COL) >/tmp/$$$$.suff; \	@@\
  	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
  	  $(RM) /tmp/$$$$.suff); \						@@\
  	done
--- 112,127 ----
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
  	fi
  
+ #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ 	InstallManPageLong(file,destdir,dest)
+ 
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
  	for i in list; do \                                             @@\
  	  (set -x; \							@@\
! 	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
  	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
  	  $(RM) /tmp/$$$$.suff); \						@@\
  	done
***************
*** 94,103 ****
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  				@@\
! 		$(LN) destdir/file.0 $(DESTDIR)destdir/$$i.0;\  @@\
  		); \							@@\
  	done
  
  /*
   * These seem redundant, but leave them in for now.
--- 134,146 ----
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
! 		(cd $(DESTDIR)destdir; $(LN) file.0 $$i.0);\  		@@\
  		); \							@@\
  	done
+ 
+ #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ 	InstallManPageAliases(file,destdir,aliases)
  
  /*
   * These seem redundant, but leave them in for now.
Only in /afs/dementia.org/src/motif/andrew/config: ccimake
Only in /afs/dementia.org/src/motif/andrew/config: ccimake.c
diff -cr /afs/dementia.org/src/motif/andrew/config/convex.cf ./convex.cf
*** /afs/dementia.org/src/motif/andrew/config/convex.cf	Sat Apr  2 08:38:30 1994
--- ./convex.cf	Thu Apr 11 14:12:18 1996
***************
*** 1,10 ****
! XCOMM platform:  $XConsortium: convex.cf,v 1.1 91/07/29 10:31:44 rws Exp $
  
  #define OSName            	ConvexOS V9.0
  XCOMM operating system:  OSName
  #define OSMajorVersion		9
  #define OSMinorVersion		0 
  #define VersionNumber 		0.0.0.0
  
  #define BootstrapCFlags   	-tm c1
  #define SetTtyGroup		YES
--- 1,18 ----
! XCOMM platform:  $XConsortium: convex.cf /main/3 1996/02/02 18:59:38 gildea $
  
+ #ifndef OSName
  #define OSName            	ConvexOS V9.0
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion		9
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		0 
+ #endif
+ #ifndef VersionNumber
  #define VersionNumber 		0.0.0.0
+ #endif
  
  #define BootstrapCFlags   	-tm c1
  #define SetTtyGroup		YES
***************
*** 14,20 ****
  #define XdmDir			$(LIBDIR)/xdm-sample
  #define XdmServersType	fs	/* one tab here */
  #define HasXmWidgets		NO
! #define InstKmemFlags		-g kmem -m 2755 -v $(VERSION)
  #define InstScriptFlags		-m 0755 -g bin
  #define InstManFlags		-m 0444 -g bin
  #define DefaultCCOptions    	-fn -tm c1 
--- 22,28 ----
  #define XdmDir			$(LIBDIR)/xdm-sample
  #define XdmServersType	fs	/* one tab here */
  #define HasXmWidgets		NO
! #define InstKmemFlags		-g kmem -m 2711 -v $(VERSION)
  #define InstScriptFlags		-m 0755 -g bin
  #define InstManFlags		-m 0444 -g bin
  #define DefaultCCOptions    	-fn -tm c1 
diff -cr /afs/dementia.org/src/motif/andrew/config/cray.cf ./cray.cf
*** /afs/dementia.org/src/motif/andrew/config/cray.cf	Mon Apr  4 21:28:27 1994
--- ./cray.cf	Thu Apr 11 14:12:18 1996
***************
*** 1,9 ****
! XCOMM platform:  $XConsortium: cray.cf,v 1.49 94/04/04 21:28:10 rws Exp $
  
  #define OSName			UNICOS 8.0
  XCOMM operating system:  OSName
  #define OSMajorVersion		8
  #define OSMinorVersion		0
  
  #define SystemV			YES
  #define Malloc0ReturnsNull	YES
--- 1,15 ----
! XCOMM platform:  $XConsortium: cray.cf /main/50 1996/01/22 17:36:35 gildea $
  
+ #ifndef OSName
  #define OSName			UNICOS 8.0
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion		8
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		0
+ #endif
  
  #define SystemV			YES
  #define Malloc0ReturnsNull	YES
diff -cr /afs/dementia.org/src/motif/andrew/config/fujitsu.cf ./fujitsu.cf
*** /afs/dementia.org/src/motif/andrew/config/fujitsu.cf	Wed Sep 27 14:49:53 1995
--- ./fujitsu.cf	Thu Apr 11 14:12:19 1996
***************
*** 1,11 ****
! XCOMM platform:  $XConsortium: fujitsu.cf,v 1.5 95/06/19 02:56:37 gildea Exp $
  
  #ifdef SparcArchitecture
  
  #define OSName             FUJITSU UXP/DS V10L20
  XCOMM operating system:    OSName
  #define OSMajorVersion     10
  #define OSMinorVersion     20
  
  #define BootstrapCFlags    -D__uxp__
  #define StandardDefines    -D__uxp__ -DSVR4 -DANSICPP
--- 1,17 ----
! XCOMM platform:  $XConsortium: fujitsu.cf /main/6 1996/01/22 17:36:40 gildea $
  
  #ifdef SparcArchitecture
  
+ #ifndef OSName
  #define OSName             FUJITSU UXP/DS V10L20
+ #endif
  XCOMM operating system:    OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion     10
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion     20
+ #endif
  
  #define BootstrapCFlags    -D__uxp__
  #define StandardDefines    -D__uxp__ -DSVR4 -DANSICPP
***************
*** 25,34 ****
--- 31,46 ----
  #endif
  
  #ifdef mc68000Architecture
+ #ifndef OSName
  #define OSName             FUJITSU SX/G E17
+ #endif
  XCOMM operating system:    OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion     17
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion     10
+ #endif
  
  #define BootstrapCFlags    -D__sxg__
  #define StandardDefines    -D__sxg__ -DSYSV -DUSG -DNOSTDHDRS -I/usr/xwin/include
diff -cr /afs/dementia.org/src/motif/andrew/config/generic.cf ./generic.cf
*** /afs/dementia.org/src/motif/andrew/config/generic.cf	Wed Oct 13 15:34:17 1993
--- ./generic.cf	Thu Apr 11 14:12:20 1996
***************
*** 1,9 ****
! XCOMM platform:  $XConsortium: generic.cf,v 1.6 91/07/03 14:47:42 rws Exp $
  
  #define OSName            Unknown Operating System
  XCOMM operating system:  OSName
  #define OSMajorVersion    0
  #define OSMinorVersion    0
  
  #ifdef SYSV
  #define SystemV		YES
--- 1,15 ----
! XCOMM platform:  $XConsortium: generic.cf /main/7 1996/01/22 17:36:46 gildea $
  
+ #ifndef OSName
  #define OSName            Unknown Operating System
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion    0
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    0
+ #endif
  
  #ifdef SYSV
  #define SystemV		YES
Only in /afs/dementia.org/src/motif/andrew/config: host.def
diff -cr /afs/dementia.org/src/motif/andrew/config/hp.cf ./hp.cf
*** /afs/dementia.org/src/motif/andrew/config/hp.cf	Thu Oct  5 12:14:22 1995
--- ./hp.cf	Thu Apr 11 14:12:20 1996
***************
*** 1,11 ****
! XCOMM platform:  $XConsortium: hp.cf,v 1.70 94/10/28 20:47:55 dpw Exp $
  
! #define OSName                 HP-UX 9.1
  XCOMM operating system:  OSName
! #define OSMajorVersion         9
! #define OSMinorVersion         1
! #define OSTeenyVersion         0
! 
  
  /*
   * C++ compiler setup.  This file knows what options to use with 
--- 1,18 ----
! XCOMM platform:  $XConsortium: hp.cf /main/75 1996/01/09 14:52:42 gildea $
  
! #ifndef OSName
! #define OSName                 HP-UX 10.01
! #endif
  XCOMM operating system:  OSName
! #ifndef OSMajorVersion
! #define OSMajorVersion         10
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion         0
! #endif
! #ifndef OSTeenyVersion
! #define OSTeenyVersion         1
! #endif
  
  /*
   * C++ compiler setup.  This file knows what options to use with 
***************
*** 25,34 ****
  #define HasCplusplus YES
  #endif
  #ifndef DefaultCplusplusOptions
! #define DefaultCplusplusOptions -Aa
  #endif
  #ifndef CplusplusOptions
! #define CplusplusOptions -Aa
  #endif
  #ifndef CplusplusDependIncludes 
  #define CplusplusDependIncludes -I/usr/include/CC
--- 32,41 ----
  #define HasCplusplus YES
  #endif
  #ifndef DefaultCplusplusOptions
! #define DefaultCplusplusOptions -Aa -D_HPUX_SOURCE
  #endif
  #ifndef CplusplusOptions
! #define CplusplusOptions -Aa -D_HPUX_SOURCE
  #endif
  #ifndef CplusplusDependIncludes 
  #define CplusplusDependIncludes -I/usr/include/CC
***************
*** 52,70 ****
  #define Malloc0ReturnsNull     YES
  
  #ifdef __hp9000s800
- #if HasGcc2
- #define OptimizedCDebugFlags   -O
- #define SharedLibraryCCOptions -Aa
- #define StandardDefines        -Dhpux -DSYSV -D_HPUX_SOURCE
- #else
  #define OptimizedCDebugFlags   +O1
! #define DefaultCCOptions       -Aa +ESlit
! #define SharedLibraryCCOptions -Aa
! #define StandardDefines        -Dhpux -DSYSV -D_HPUX_SOURCE
! #endif
! #define ServerExtraDefines -DXOS -DBSTORE -DSOFTWARE_CURSOR -DNO_ALLOCA -DSCREEN_PIXMAPS -DMERGE_SAVE_UNDERS -DR5 -DHAS_IFREQ -DFORCE_SEPARATE_PRIVATE
  #include <hpLib.rules>
! #else
  #define StandardDefines        -Dhpux -DSYSV
  #if OSMajorVersion < 8
  #define DefaultCCOptions       -Wc,-Nd4000,-Ns4100,-Ne700,-Np200,-Nw300
--- 59,75 ----
  #define Malloc0ReturnsNull     YES
  
  #ifdef __hp9000s800
  #define OptimizedCDebugFlags   +O1
! #define DefaultCCOptions       -Ae +ESlit
! #define SharedLibraryCCOptions -Ae
! #define StandardDefines        -Dhpux -DSYSV
! #define ServerExtraDefines -DXOS -DBSTORE -DSOFTWARE_CURSOR -DNO_ALLOCA -DSCREEN_PIXMAPS -DMERGE_SAVE_UNDERS -DHAS_IFREQ -DFORCE_SEPARATE_PRIVATE
! 
! #if OSMajorVersion > 9
  #include <hpLib.rules>
! #endif
! 
! #else /* __hp9000s800 */
  #define StandardDefines        -Dhpux -DSYSV
  #if OSMajorVersion < 8
  #define DefaultCCOptions       -Wc,-Nd4000,-Ns4100,-Ne700,-Np200,-Nw300
***************
*** 94,100 ****
--- 99,107 ----
  #define BuildXInputExt         YES
  #endif
  #define HPFastScrolling        YES
+ #ifndef BuildServer
  #define BuildServer            __hp9000s700
+ #endif
  #define NeedBerklib            (BuildServer|BuildFontServer)
  #define XawI18nDefines	       -DHAS_WCHAR_H -DHAS_ISW_FUNCS
  
diff -cr /afs/dementia.org/src/motif/andrew/config/hpLib.rules ./hpLib.rules
*** /afs/dementia.org/src/motif/andrew/config/hpLib.rules	Thu Oct 26 10:49:20 1995
--- ./hpLib.rules	Thu Apr 11 14:11:48 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: hpLib.rules,v 1.4 93/09/11 17:57:18 rws Exp $
  
  /*
   * HP shared library rules
--- 1,4 ----
! XCOMM $XConsortium: hpLib.rules /main/10 1995/10/19 11:27:02 swick $
  
  /*
   * HP shared library rules
***************
*** 25,32 ****
  #ifndef PositionIndependentCFlags
  #define PositionIndependentCFlags +z
  #endif
  #ifndef UseInstalled
! #define ExtraLoadOptions -L$(USRLIBDIR)
  #endif
  
  /*
--- 25,36 ----
  #ifndef PositionIndependentCFlags
  #define PositionIndependentCFlags +z
  #endif
+ #ifndef InstLibFlags
+ #define InstLibFlags -m 0555
+ #endif
  #ifndef UseInstalled
! /* assert: LdPostLib pulls in -L$(USRLIBDIR), so it doesn't need to be here */
! #define ExtraLoadFlags -Wl,+s,+b,$(USRLIBDIR)
  #endif
  
  /*
***************
*** 36,44 ****
  #define	InstallSharedLibrary(libname,rev,dest)				@@\
  install:: Concat(lib,libname.sl.rev) 					@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sl.rev) $(DESTDIR)dest @@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.sl)			@@\
! 	$(LN) Concat(lib,libname.sl.rev) Concat($(DESTDIR)dest/lib,libname.sl)
  
  #endif /* InstallSharedLibrary */
  
--- 40,50 ----
  #define	InstallSharedLibrary(libname,rev,dest)				@@\
  install:: Concat(lib,libname.sl.rev) 					@@\
  	MakeDir($(DESTDIR)dest)						@@\
+ 	RMoveToBakFile(Concat($(DESTDIR)dest/lib,libname.sl.rev))	@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sl.rev) $(DESTDIR)dest @@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.sl)			@@\
! 	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.sl.rev) Concat(lib,libname.sl) @@\
! 	-RemoveFile(Concat(lib,libname.sl.rev.bak))
  
  #endif /* InstallSharedLibrary */
  
***************
*** 80,96 ****
  #ifndef SharedLibraryDataTarget
  #define SharedLibraryDataTarget(libname,rev,salist)
  #endif /* SharedLibraryTarget */
- 
- /*
-  * Magic to link with installed HP shlibs
-  */
- #if HasSharedLibraries
- #if !UseInstalled
- #define InstallProgramWithFlags(program,dest,flags)			@@\
- 	if [ program = "imake" ]; then exit 0; else $(RM) program; fi	@@\
- 	$(IMAKE_CMD) -DUseInstalled -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -eMakefile.install program	@@\
- 	MakeDir($(DESTDIR)dest)						@@\
- 	$(INSTALL) -c $(INSTPGMFLAGS) flags program $(DESTDIR)dest	@@\
- 	$(RM) Makefile.install
- #endif
- #endif
--- 86,88 ----
diff -cr /afs/dementia.org/src/motif/andrew/config/ibm.cf ./ibm.cf
*** /afs/dementia.org/src/motif/andrew/config/ibm.cf	Wed Sep 27 14:49:54 1995
--- ./ibm.cf	Thu Apr 11 14:12:21 1996
***************
*** 1,55 ****
! XCOMM platform:  $XConsortium: ibm.cf,v 1.55.1.1 95/06/30 14:22:43 kaleb Exp $
  
- #ifdef RsArchitecture
  #ifndef OSName
! #define OSName		AIX 3.2.5
  #endif
  #ifndef OSMajorVersion
! #define OSMajorVersion	3
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion	2
  #endif
  #ifndef OSTeenyVersion
! #define OSTeenyVersion	5
! #endif
! #else
! #ifdef RtArchitecture
! #ifdef AIXArchitecture
! #define OSName		AIX 2.2
! #define OSMajorVersion	2
! #define OSMinorVersion	2
! #else
! #define OSName		AOS 4.3
! #define OSMajorVersion	4
! #define OSMinorVersion	3
! #endif
! #else
! #define OSName		AIX 1.2.1
! #define OSMajorVersion	1
! #define OSMinorVersion	2
! #define OSTeenyVersion	1
! #endif
  #endif
  XCOMM operating system:  OSName
  
- #ifdef RsArchitecture
- 
  #if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 2)
  #define HasBSD44Sockets		YES
  #define HasPutenv		YES
  /*
   * If you do not have threads support installed, put
!  * #define HasPosixThreads NO
   * in the BeforeVendorCF section of your site.def.
   */
  #if !defined(HasPosixThreads) && ((OSMajorVersion == 3 && (OSMinorVersion > 2 || (OSMinorVersion == 2 && OSTeenyVersion > 4))) || (OSMajorVersion == 4 && (OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1))))
  #define HasPosixThreads		YES
  #endif
  #if HasPosixThreads
! #define SystemMTDefines -D_THREAD_SAFE
  #define ThreadedX		YES
! #define ThreadsLibraries -lpthreads -lc_r
  #endif
  #endif /* OS > 3.2 */
  
--- 1,34 ----
! XCOMM platform:  $XConsortium: ibm.cf /main/70 1996/01/03 21:31:26 kaleb $
  
  #ifndef OSName
! #define OSName			AIX 4.1.4
  #endif
  #ifndef OSMajorVersion
! #define OSMajorVersion		4
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion		1
  #endif
  #ifndef OSTeenyVersion
! #define OSTeenyVersion		4
  #endif
  XCOMM operating system:  OSName
  
  #if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 2)
  #define HasBSD44Sockets		YES
  #define HasPutenv		YES
  /*
   * If you do not have threads support installed, put
!  * #define HasPosixThreads	NO
   * in the BeforeVendorCF section of your site.def.
   */
  #if !defined(HasPosixThreads) && ((OSMajorVersion == 3 && (OSMinorVersion > 2 || (OSMinorVersion == 2 && OSTeenyVersion > 4))) || (OSMajorVersion == 4 && (OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1))))
  #define HasPosixThreads		YES
  #endif
  #if HasPosixThreads
! #ifndef ThreadedX
  #define ThreadedX		YES
! #endif
  #endif
  #endif /* OS > 3.2 */
  
***************
*** 57,71 ****
  /*
   * For IBM platforms, we must define both the location of the compiler
   * and the location of its standard C++ library.  The library location
!  * is needed to resolve dependent library symbols when we build our own
!  * C++ shared libraries like libFresco
   */
  
  #ifndef CplusplusCmd
! #define CplusplusCmd xlC
  #endif
  #ifndef CplusplusLibC
! #define CplusplusLibC /usr/lpp/xlC/lib/libC.a
  #endif
  #ifndef CplusplusDependIncludes
  #define CplusplusDependIncludes -I/usr/lpp/xlC/include
--- 36,50 ----
  /*
   * For IBM platforms, we must define both the location of the compiler
   * and the location of its standard C++ library.  The library location
!  * is needed to resolve dependent library symbols if we build our own
!  * C++ shared libraries.
   */
  
  #ifndef CplusplusCmd
! #define CplusplusCmd		xlC
  #endif
  #ifndef CplusplusLibC
! #define CplusplusLibC		/usr/lpp/xlC/lib/libC.a
  #endif
  #ifndef CplusplusDependIncludes
  #define CplusplusDependIncludes -I/usr/lpp/xlC/include
***************
*** 98,114 ****
  #define Malloc0ReturnsNull	YES
  #define CppCmd			/usr/lpp/X11/Xamples/util/cpp/cpp
  #define ExpandManNames		YES
! #define ExtensionOSDefines -DXTESTEXT1
! #define StandardDefines         -DSYSV -DAIXV3 -D_ALL_SOURCE
! #if OSMajorVersion >= 4
! #define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
! #define CcCmd c89		/* full conforming ANSI C w/ ANSI headers */
!  _NULLCMD_ = @ echo
! #else
! #define XibmServer 		YES
  #define ibmIncludeSKYWAY	YES
! #define CcCmd xlc
! #endif
  #define OPERATING_SYSTEM 	AIX /* directory name under server/ddx/ibm/ */
  #define InstallCmd              /usr/ucb/install
  #include <ibmLib.rules>
--- 77,113 ----
  #define Malloc0ReturnsNull	YES
  #define CppCmd			/usr/lpp/X11/Xamples/util/cpp/cpp
  #define ExpandManNames		YES
! #define ExtensionOSDefines	-DXTESTEXT1
! #define XibmServer		YES
  #define ibmIncludeSKYWAY	YES
! 
! #if OSMajorVersion > 3
! #define StandardDefines		-DSYSV -DAIXV3 -DAIXV4 -D_ALL_SOURCE
! #define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
! #define ServerExtraDefines	-D_IBM_LFT
! #if ThreadedX
! #define CcCmd			xlc_r
! #else
! #define CcCmd			xlc
! #endif
! #define ServerCcCmd		xlc
! #define SystemMTDefines		/* xlc_r defines -D_THREAD_SAFE */
! #define ThreadsLibraries	-lpthreads /* xlc_r does -lc_r */
! #define AvoidNullMakeCommand	YES
! #define NullMakeCommand		@ echo
! /* AIX 4 appends all MAKEFLAGS (even dups), so cannot pass on command line. */
! #define ConstructMFLAGS		NO
! #define LdPreLib		_Use(Concat(-L,$(USRLIBDIR)),/**/)
! #define ExtraFilesToClean	*.inp
! #else 	/* OSMajorVersion < 4 */
! #define StandardDefines         -DSYSV -DAIXV3 -D_ALL_SOURCE
! #define ServerExtraDefines	-D_IBM_HFT
! #define CcCmd			xlc
! #define ThreadPreStdAPIDefines	-DXPRE_STANDARD_API
! #define SystemMTDefines		-D_THREAD_SAFE
! #define ThreadsLibraries	-lpthreads -lc_r
! #endif	/* OSMajorVersion */
! 
  #define OPERATING_SYSTEM 	AIX /* directory name under server/ddx/ibm/ */
  #define InstallCmd              /usr/ucb/install
  #include <ibmLib.rules>
***************
*** 119,320 ****
  	/usr/lib/makewhatis $(DESTDIR)manpath
  #endif
  
- 
- #else /* end of RsArchitecture */
- 
- 
- #define UnixCpp /**/
- #define cppdefs -DUNIXCPP
- 
- #ifdef ATHENA
- #define ibmAthenaDefs -DATHENA
- #else
- #define ibmAthenaDefs /**/
- #endif
- 
- #ifdef AIXArchitecture
- #define SystemV YES
- #ifdef RtArchitecture
- #define BootstrapCFlags -Daix
- #define OSDefines -DAIX -DAIXrt -DNO_FUNCTION_PROTOTYPES -DIBM_OS_HAS_HFT
- #else
- #define ExecableScripts		YES
- #define ExpandManNames		YES
- #define InstallCmd              /usr/ucb/install
- #define OSDefines -DAIX386 -DIBM_OS_HAS_HFT
- #define	NeedFunctionPrototypes	YES
- #define	NeedNestedPrototypes	YES
- #define	NeedConstPrototypes	YES
- #define	NeedVarargsPrototypes	YES
- #define LdCombineFlags -r /* PS/2 doesn't do ld -X */
- #endif
- #define OPERATING_SYSTEM AIX /* directory name under server/ddx/ibm/ */
- 
- #ifdef USE_PCC
- #define CcCmd i386cc
- #define ibmosdefs -DHCVERSION=HCRevision
- #else
- #ifdef RtArchitecture
- #define CcCmd cc -Nd4000 -Nn3000 -DBSD_INCLUDES
- #define ibmosdefs -DSYSV -Nd4000 -Nn3000
- #define ibmlibdefs -Hcpp
- #else
- #define ibmosdefs -DSYSV
- #endif
- #endif /* USE_PCC */
- 
- #else /* else AOS - warning: AOS is going away... */
- #define HasNdbm YES
- #define CcCmd hc
- #define ibmosdefs -DHCVERSION=HCRevision
- #define OSDefines -DBSDrt
- #define OPERATING_SYSTEM BSDrt
- #define BootstrapCFlags -Dibm
- #if OSMajorVersion >= 4 && OSMinorVersion >= 3
- #define SetTtyGroup YES
- #endif
- #endif /* AIXArchitecture */
- 
- #define HasVoidSignalReturn    NO
- 
- #ifdef RtArchitecture
- /*
-  * These define the screens the server will allow
-  * affected:    .../server/ddx/ibm/Makefile
-  *              .../server/ddx/ibm/common/Makefile
-  * Also, be sure to remove .../server/ddx/ibm/common/ibmscreen.o
-  */
- #define ibmInclude8514  NO /* YES */
- #define ibmIncludeAED   NO
- #define ibmIncludeAPA16 YES
- #define ibmIncludeAPA8c NO
- #define ibmIncludeEGA   NO /* YES */
- #define ibmIncludeMPEL  NO
- #define ibmIncludeVGA   NO /* YES */
- #define ibmIncludeGEN   NO
- #endif /* RtArchitecture */
- 
- #ifdef PS2Architecture
- /*
-  * These define the screens the server will allow
-  * affected:    .../server/ddx/ibm/Makefile
-  *              .../server/ddx/ibm/common/Makefile
-  * Also, be sure to remove .../server/ddx/ibm/common/ibmscreen.o
-  * 
-  *                                        PS2, Rt, ...
-  */
- #define ibmInclude8514  YES
- #define ibmIncludeAED   NO
- #define ibmIncludeAPA16 NO
- #define ibmIncludeAPA8c NO
- #define ibmIncludeEGA   NO
- #define ibmIncludeMPEL  NO
- #define ibmIncludeVGA   YES
- #define ibmIncludeGEN   NO
- #endif /* PS2Architecture */
- 
- /*
-  * These define the screens the server will allow
-  * affected:    .../server/ddx/ibm/Makefile
-  *              .../server/ddx/ibm/common/Makefile
-  * Also, be sure to remove .../server/ddx/ibm/common/ibmscreen.o
-  * 
-  *                                        PS2, Rt, ...
-  */
- #ifndef ibmosdefs
- #define ibmosdefs /**/
- #endif
- #ifndef ibmarchdefs
- #define ibmarchdefs /**/
- #endif
- #ifndef ibmlibdefs
- #define ibmlibdefs /**/
- #endif
- 
- 
- #define StandardDefines -Dibm ibmosdefs ibmarchdefs
- #define LintOpts -ax -Dibm ibmosdefs ibmarchdefs
- 
- /* 
-  * This defines the name of server you want.
-  * affected: .../X11/server/Makefile
-  */
- #define XibmServer YES
- 
- /*****************************************************************************
-  *                        Platform-specfic parameters                        *
-  *****************************************************************************/
- 
- 	/*
- 	 * affected:	.../server/ddx/ibm/common/Makefile
- 	 *		.../server/os/4.2bsd/Makefile
- 	 * remove:	.../server/ddx/ibm/common/ibminit.o
- 	 *		.../server/ddx/ibm/common/ibmio.o
- 	 *		.../server/ddx/ibm/common/ibmutils.o
- 	 *		.../server/os/4.2bsd/utils.o
- 	 */
- 
- /* Need This Also For our IBM Imakefiles */
- #define	SpecialMalloc		NO
- #define	ibmSpecialMalloc	NO
- 
-             PCC = pcc
- 
- #ifndef AIXArchitecture				/* AOS-specific */
- /*
-  * It's real useful to know the version of hc we're using, but hc doesn't
-  * identify itself in the pre-processor, so we have to do it by hand.
-  *
-  * To determine which version of hc you have, compile (DON'T link) some simple 
-  * program ("hello world" leaps to mind) and look in the .o (with "nm") for a 
-  * symbol named ".oVhc[0-9].[0-9][a-z]" -- this symbol is included in all 
-  * .o's by hc, and identifies the compiler release.
-  * 
-  * To Calculate HCRevision, multiply the version number by 1000 and add the
-  * index of the release letter.
-  * For example, if nm reports:
-  *	00000000 A .oVhc2.1d
-  * The HCRevision is ((2.1 * 1000)+('d'-'a'+1)) == 21004
-  * Another popular version of hc is:
-  *	00000000 A .oVhc1.4r
-  * Whose HCRevision is ((1.4 * 1000)+('r'-'a'+1)) == 14018
-  *
-  * A good clue that HCRevision is defined incorrectly is the undefined symbol
-  * '_Alloca' at load time.
-  */
- 
- #define	HCRevision	21025
- 
- /*
-  * hc revision 1.4r won't compile parts of Xt and some clients.
-  */
- #if HCRevision == 14018
- #define BandAidCompiler "rtcchack.bac"
- #undef MacroFile
- #define MacroFile ibm.cf $(IRULESRC)/rtcchack.bac
- #endif
- #endif /* AOS */
- 
- 
- /* 
-  * define this as you like for server compilation 
-  * affected: all makefiles in .../X11/server
-  */
- #define ServerExtraDefines  cppdefs -DNOSTDHDRS OSDefines
- 
- 
- #define FontOSDefines StandardDefines
- /* define this as you like for server font support */
- #ifdef AIXArchitecture
- #define FontFilters BDFTOSNFFILT SHELLPATH
- #endif
- 
- /* define the following line for easily debuggable servers, the */
- /* second line for especially speedy servers.			*/
- /* #define ServerCDebugFlags	-O -DDEBUG -DTRACE_X */
- #define	ServerCDebugFlags -O ibmAthenaDefs
- 
- /* define this as you like for normal library compilation */
- #define LibraryDefines cppdefs ibmlibdefs StandardDefines
- 
- #endif /* non RsArchitecture */
--- 118,120 ----
diff -cr /afs/dementia.org/src/motif/andrew/config/ibmLib.rules ./ibmLib.rules
*** /afs/dementia.org/src/motif/andrew/config/ibmLib.rules	Fri Dec 24 11:28:21 1993
--- ./ibmLib.rules	Thu Apr 11 14:11:49 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: ibmLib.rules,v 1.9 93/12/24 11:28:07 rws Exp $
  
  /*
   * AIX shared library rules
--- 1,4 ----
! XCOMM $XConsortium: ibmLib.rules /main/12 1995/12/04 11:59:16 kaleb $
  
  /*
   * AIX shared library rules
***************
*** 35,42 ****
  #endif
  
  /*
!  * SharedLibReferences - variables for shared libraries
   */
  #ifndef SharedLibReferences
  #define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
  Concat3(DEP,varname,LIB) = /**/						@@\
--- 35,44 ----
  #endif
  
  /*
!  * SharedDSLibReferences - variables for shared libraries
   */
+ #if OSMajorVersion < 4
+ 
  #ifndef SharedLibReferences
  #define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
  Concat3(DEP,varname,LIB) = /**/						@@\
***************
*** 44,49 ****
--- 46,62 ----
  LintLibReferences(varname,libname,libsource)
  #endif
  
+ #else
+ 
+ #ifndef SharedLibReferences
+ #define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+ Concat3(DEP,varname,LIB) = /**/						@@\
+ Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR),/libname.imp) Concat3($(BUILDLIBDIR),/lib,libname.a)) @@\
+ LintLibReferences(varname,libname,libsource)
+ #endif
+ 
+ #endif
+ 
  /*
   * SharedDSLibReferences - variables for shared libraries
   */
***************
*** 52,57 ****
--- 65,83 ----
  SharedLibReferences(varname,libname,libsource,revname,rev)
  #endif
  
+ #if OSMajorVersion == 4
+ /*
+  * UnsharedLibReferences - variables for unshared libraries
+  */
+ #ifndef UnsharedLibReferences
+ #define UnsharedLibReferences(varname,libname,libsource)		@@\
+ Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/lib,$(BUILDLIBDIR)/lib,libname.a)	@@\
+ Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR)/lib,libname.a))	@@\
+ LintLibReferences(varname,libname,libsource)
+ #endif
+ #endif
+ 
+ 
  /*
   * InstallSharedLibrary - generate rules to install the shared library.
   */
***************
*** 72,77 ****
--- 98,105 ----
   * build it into a different name so that the we do not hose people by having
   * the library gone for long periods.
   */
+ #if OSMajorVersion < 4
+ 
  #ifndef SharedLibraryTarget
  #define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
  AllTarget(Concat(lib,libname.a))					@@\
***************
*** 89,96 ****
--- 117,149 ----
  									@@\
  clean::									@@\
  	$(RM) Concat(lib,libname.a)
+ #endif /* SharedLibraryTarget */
+ 
+ #else /* OSMajorVersion == 4 */
  
+ #ifndef SharedLibraryTarget
+ #define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+ AllTarget(Concat(lib,libname.a))					@@\
+ 									@@\
+ Concat(lib,libname.a):  solist $(UNSHAREDOBJS)				@@\
+ 	$(RM) $@~ shr.o							@@\
+ 	(cd down; $(AR) up/$@~ solist)					@@\
+ 	echo "#! $@ (shr.o)" > libname.inp				@@\
+ 	dump -g $@~ | sed -n -e 's/^[ 	]*[0-9][0-9]*[	 ]*\([^	 .][^	 ]*\)$$/\1/p' >> libname.inp	@@\
+ 	$(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:libname.inp -bnoentry $(REQUIREDLIBS) BaseShLibReqs -L$(USRLIBDIR)	@@\
+ 	$(RM) $@~							@@\
+ 	$(AR) $@~ shr.o $(UNSHAREDOBJS)					@@\
+ 	$(RM) $@							@@\
+ 	$(MV) $@~ $@							@@\
+ 	LinkBuildLibrary($@)						@@\
+ 	RemoveFile($(BUILDLIBDIR)/libname.imp)				@@\
+ 	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/libname.inp libname.imp @@\
+ 									@@\
+ clean::									@@\
+ 	$(RM) Concat(lib,libname.a)
  #endif /* SharedLibraryTarget */
+ 
+ #endif
  
  /*
   * SharedLibraryDataTarget - generate rules to create shlib data file;
diff -cr /afs/dementia.org/src/motif/andrew/config/ibmLib.tmpl ./ibmLib.tmpl
*** /afs/dementia.org/src/motif/andrew/config/ibmLib.tmpl	Wed Mar  9 11:18:19 1994
--- ./ibmLib.tmpl	Thu Apr 11 14:12:04 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: ibmLib.tmpl,v 1.16 94/03/09 11:16:26 matt Exp $
  
  /*
   * AIX shared library template
--- 1,4 ----
! XCOMM $XConsortium: ibmLib.tmpl /main/18 1995/12/14 15:31:05 matt $
  
  /*
   * AIX shared library template
***************
*** 7,12 ****
--- 7,13 ----
  #if ThreadedX
  #define SharedX11Reqs -lpthreads
  #endif
+ 
  #define SharedXextReqs $(XLIBONLY)
  #define SharedXmuReqs $(XTOOLLIB) $(XLIB)
  #define SharedOldXReqs $(XLIBONLY)
***************
*** 21,28 ****
  #define SharedPexReqs $(XLIBONLY)
  #define SharedXieReqs $(XLIBONLY)
  #define SharedSMReqs $(ICELIB)
- #define SharedFrescoReqs $(XLIBONLY) CplusplusLibC
- #define SharedXtfReqs $(FRESCOLIB) $(XTOOLLIB) $(XLIB) CplusplusLibC
  
  #ifndef FixupLibReferences
  #define FixupLibReferences()						@@\
--- 22,27 ----
Only in /afs/dementia.org/src/motif/andrew/config: imake.c
Only in /afs/dementia.org/src/motif/andrew/config: imake.man
Only in /afs/dementia.org/src/motif/andrew/config: imakemdep.h
diff -cr /afs/dementia.org/src/motif/andrew/config/linux.cf ./linux.cf
*** /afs/dementia.org/src/motif/andrew/config/linux.cf	Mon Jan 30 18:41:24 1995
--- ./linux.cf	Thu Apr 11 14:12:22 1996
***************
*** 1,14 ****
! XCOMM platform:  $XConsortium: linux.cf,v 1.11 95/01/23 18:32:03 kaleb Exp $
  
  #define OSName			Linux
! #define OSVendor		/**/
  #define OSMajorVersion		1
! #define OSMinorVersion		0
! #define OSTeenyVersion		0
  
  #ifndef UseElfFormat
  #define UseElfFormat		NO
  #endif
  #define HasGcc			YES
  #define HasGcc2			YES
  #define HasGcc2ForCplusplus	YES
--- 1,28 ----
! XCOMM platform:  $XConsortium: linux.cf /main/18 1996/02/02 18:59:31 gildea $
  
+ #ifndef OSName
  #define OSName			Linux
! #endif
! #ifndef OSVendor
! #define OSVendor		Slackware 2.3.0 ELF
! #endif
! #ifndef OSMajorVersion
  #define OSMajorVersion		1
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion		2
! #endif
! #ifndef OSTeenyVersion
! #define OSTeenyVersion		11
! #endif
  
  #ifndef UseElfFormat
+ #if OSMinorVersion > 1
+ #define UseElfFormat		YES
+ #else
  #define UseElfFormat		NO
  #endif
+ #endif
  #define HasGcc			YES
  #define HasGcc2			YES
  #define HasGcc2ForCplusplus	YES
***************
*** 32,50 ****
  #define NeedNestedPrototypes	YES
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
  #if UseElfFormat
  #define CcCmd			gcc -b i486-linuxelf
  #define AsCmd			/usr/i486-linuxelf/bin/as
  #define LdCmd			ld -m elf_i386
  #define AsmDefines		-D__ELF__
  #define CplusplusCmd		g++ -b i486-linuxelf
  #else
  #define CcCmd			gcc
  #define AsCmd			as
  #define LdCmd			ld
! #define AsmDefines		-DUSE_GAS
  #endif
  #define CppCmd			/lib/cpp
  #define YaccCmd			bison -y
  #define LexCmd			flex -l
--- 46,77 ----
  #define NeedNestedPrototypes	YES
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
+ #define SetTtyGroup		YES
  
  #if UseElfFormat
+ #if OSMinorVersion > 1
+ #define CcCmd			gcc
+ #define AsCmd			as
+ #define LdCmd			ld
+ #else
  #define CcCmd			gcc -b i486-linuxelf
  #define AsCmd			/usr/i486-linuxelf/bin/as
  #define LdCmd			ld -m elf_i386
+ #endif
  #define AsmDefines		-D__ELF__
  #define CplusplusCmd		g++ -b i486-linuxelf
  #else
  #define CcCmd			gcc
+ #if OSMinorVersion < 2
  #define AsCmd			as
  #define LdCmd			ld
! #else
! #define AsCmd			/usr/i486-linuxaout/bin/as
! #define LdCmd			ld -m i386linux
! #endif
! #define AsmDefines		-DUSE_GAS -U__ELF__
  #endif
+ #define MkdirHierCmd		mkdir -p
  #define CppCmd			/lib/cpp
  #define YaccCmd			bison -y
  #define LexCmd			flex -l
***************
*** 62,68 ****
  #define ExtensionOSDefines	-DXTESTEXT1
  #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
  #define ConnectionFlags		-DUNIXCONN -DTCPCONN
! #define InstUidFlags		-s -m 4755
  
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
--- 89,95 ----
  #define ExtensionOSDefines	-DXTESTEXT1
  #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
  #define ConnectionFlags		-DUNIXCONN -DTCPCONN
! #define InstUidFlags		-s -m 4711
  
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
diff -cr /afs/dementia.org/src/motif/andrew/config/lnxLib.rules ./lnxLib.rules
*** /afs/dementia.org/src/motif/andrew/config/lnxLib.rules	Mon Jan 30 18:41:25 1995
--- ./lnxLib.rules	Thu Apr 11 14:11:50 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: lnxLib.rules,v 1.8 95/01/16 21:11:00 kaleb Exp $
  
  /*
   * Linux shared library rules (DLL & ELF versions)
--- 1,4 ----
! XCOMM $XConsortium: lnxLib.rules /main/12 1996/01/03 14:51:18 kaleb $
  
  /*
   * Linux shared library rules (DLL & ELF versions)
***************
*** 27,33 ****
  #define ShLibIncludeFile <lnxLib.tmpl>
  #endif
  #ifndef SharedLibraryLoadFlags
! #define SharedLibraryLoadFlags --shared
  #endif
  #ifndef PositionIndependentCFlags
  #define PositionIndependentCFlags -fPIC
--- 27,33 ----
  #define ShLibIncludeFile <lnxLib.tmpl>
  #endif
  #ifndef SharedLibraryLoadFlags
! #define SharedLibraryLoadFlags -shared
  #endif
  #ifndef PositionIndependentCFlags
  #define PositionIndependentCFlags -fPIC
***************
*** 35,40 ****
--- 35,43 ----
  #ifndef PositionIndependentCplusplusFlags
  #define PositionIndependentCplusplusFlags -fPIC
  #endif
+ #ifndef ExtraLoadFlags
+ #define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIR)
+ #endif
  
  /*
   * InstallSharedLibrary - generate rules to install the shared library.
***************
*** 71,77 ****
  Concat(lib,libname.so.rev):  solist					@@\
  	$(RM) $@~							@@\
  	(cd down; T=`echo $@ | sed 's/\.[^\.]*$$//'`; \
! 		$(LD) -o up/$@~ $(SHLIBLDFLAGS) --soname $$T solist $(REQUIREDLIBS))	@@\
  	$(RM) $@ 							@@\
  	$(MV) $@~ $@							@@\
  	$(RM) Concat(lib,libname.so)					@@\
--- 74,80 ----
  Concat(lib,libname.so.rev):  solist					@@\
  	$(RM) $@~							@@\
  	(cd down; T=`echo $@ | sed 's/\.[^\.]*$$//'`; \
! 		$(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$T solist $(REQUIREDLIBS))	@@\
  	$(RM) $@ 							@@\
  	$(MV) $@~ $@							@@\
  	$(RM) Concat(lib,libname.so)					@@\
***************
*** 160,165 ****
--- 163,176 ----
  #ifndef UseInstalled
  XCOMM These are only needed to build the server
  
+ #if LinuxElfDefault
+ LIBC_SA = /usr/i486-linuxaout/lib/libc.sa
+ LIBM_SA = /usr/i486-linuxaout/lib/libm.sa
+ #else
+ LIBC_SA = /usr/lib/libc.sa
+ LIBM_SA = /usr/lib/libm.sa
+ #endif
+ 
  JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc
  
  XCOMM libX11.so (X11, SM, ICE)
***************
*** 177,183 ****
  JUMP_JUMPTABLESIZE_X11 = 0x4000
  JUMP_GOTSIZE_X11 = 4096
  JUMP_STUBNAMES_X11 = libX11 libSM libICE
! JUMP_STUBS_IMPORT_X11 = /usr/lib/libc.sa
  JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~
  JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc)
  
--- 188,194 ----
  JUMP_JUMPTABLESIZE_X11 = 0x4000
  JUMP_GOTSIZE_X11 = 4096
  JUMP_STUBNAMES_X11 = libX11 libSM libICE
! JUMP_STUBS_IMPORT_X11 = $(LIBC_SA)
  JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~
  JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc)
  
***************
*** 274,280 ****
  JUMP_JUMPTABLESIZE_PEX5 = 0x4000
  JUMP_GOTSIZE_PEX5 = 4096
  JUMP_STUBNAMES_PEX5 = libPEX5
! JUMP_STUBS_IMPORT_PEX5 = $(JUMP_STUBS_IMPORT_X11) /usr/lib/libm.sa
  JUMP_LDLIBS_PEX5 = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
  
  # libXIE.so (XIE)
--- 285,291 ----
  JUMP_JUMPTABLESIZE_PEX5 = 0x4000
  JUMP_GOTSIZE_PEX5 = 4096
  JUMP_STUBNAMES_PEX5 = libPEX5
! JUMP_STUBS_IMPORT_PEX5 = $(JUMP_STUBS_IMPORT_X11) $(LIBM_SA)
  JUMP_LDLIBS_PEX5 = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
  
  # libXIE.so (XIE)
***************
*** 292,327 ****
  JUMP_JUMPTABLESIZE_XIE = 0x4000
  JUMP_GOTSIZE_XIE = 4096
  JUMP_STUBNAMES_XIE = libXIE
! JUMP_STUBS_IMPORT_XIE = $(JUMP_STUBS_IMPORT_X11) /usr/lib/libm.sa
  JUMP_LDLIBS_XIE = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
  
- XCOMM libFresco.so (Fresco, Xtf)
- JUMP_ROOT_Fresco = $(FRESCOSRC)/src
- JUMP_IS_HOST_Fresco = YES
- JUMP_STUBLIBS_Fresco = libFresco.sa libXtf.sa
- JUMP_SUBDIRS_Fresco = $(JUMP_ROOT_X11)
- JUMP_SIBDIRS_Fresco = $(JUMP_ROOT_Xtf)
- JUMP_DIR_Fresco = $(JUMP_ROOT_Fresco)/shared
- JUMP_VARS_Fresco = $(JUMP_ROOT_Fresco)/jump_vars
- JUMP_FUNCS_Fresco = $(JUMP_ROOT_Fresco)/jump_funcs
- JUMP_IGNORE_Fresco = $(JUMP_ROOT_Fresco)/jump_ignore
- JUMP_EXPORT_Fresco = $(JUMP_DIR_Fresco)/jump.vars
- JUMP_IMPORT_Fresco = $(JUMP_EXPORT_X11)
- JUMP_ADDRESS_Fresco = 0x60bc0000
- JUMP_JUMPTABLESIZE_Fresco = 0x4000
- JUMP_GOTSIZE_Fresco = 4096
- JUMP_STUBNAMES_Fresco = libFresco libXtf
- JUMP_STUBS_IMPORT_Fresco = $(JUMP_STUBS_IMPORT_X11)
- JUMP_SIBARS_Fresco = jump/libXtf.a~
- JUMP_LDLIBS_Fresco = $(JUMP_SIBARS_Fresco) $(JUMP_ROOT_X11)/libX11.sa \
- 	$(JUMP_LDLIBS_libc)
- 
- XCOMM libXtf (part of libFresco.so)
- JUMP_ROOT_Xtf = $(XTFSRC)
- JUMP_IS_HOST_Xtf = NO
- JUMP_HOST_Xtf = $(JUMP_ROOT_Fresco)
- JUMP_DIR_Xtf = $(JUMP_DIR_Fresco)
- 
  #endif /* !UseInstalled */
  
  /*
--- 303,311 ----
  JUMP_JUMPTABLESIZE_XIE = 0x4000
  JUMP_GOTSIZE_XIE = 4096
  JUMP_STUBNAMES_XIE = libXIE
! JUMP_STUBS_IMPORT_XIE = $(JUMP_STUBS_IMPORT_X11) $(LIBM_SA)
  JUMP_LDLIBS_XIE = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
  
  #endif /* !UseInstalled */
  
  /*
***************
*** 411,417 ****
  mk_JUMP_SIBDIRS:							@@\
  	@for d in $(Concat(JUMP_SIBDIRS_,libname)); do \
  		echo checking ar library in $$d...; \
! 		(cd $$d ; $(MAKE) $(MFLAGS) fastdo_JUMP_AR) || edit 1; \
  		echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\
  									@@\
  fastdo_JUMP_AR: $(JUMP_DIR) down/mk_JUMP_AR				@@\
--- 395,401 ----
  mk_JUMP_SIBDIRS:							@@\
  	@for d in $(Concat(JUMP_SIBDIRS_,libname)); do \
  		echo checking ar library in $$d...; \
! 		(cd $$d ; $(MAKE) $(MFLAGS) fastdo_JUMP_AR) || exit 1; \
  		echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\
  									@@\
  fastdo_JUMP_AR: $(JUMP_DIR) down/mk_JUMP_AR				@@\
diff -cr /afs/dementia.org/src/motif/andrew/config/luna.cf ./luna.cf
*** /afs/dementia.org/src/motif/andrew/config/luna.cf	Sat Apr  2 09:18:33 1994
--- ./luna.cf	Thu Apr 11 14:12:22 1996
***************
*** 1,34 ****
! XCOMM platform:  $XConsortium: luna.cf,v 1.30 94/04/01 19:59:08 kaleb Exp $
  /*
   *	Please set the values for OSMajorVerion and OSMinorVersion
   *	before making makefiles.	 
   */
  
  #ifdef Mc68000Architecture
  # ifdef luna2
  #define OSName            Mach 2.5 Vers 1.40
  #define OSMajorVersion    1
  #define OSMinorVersion    40
  # else 
  #define OSName            UNIOS-B 4.3BSD UNIX: 2.00
  #define OSMajorVersion    2
  #define OSMinorVersion    0
  #define DirFailPrefix -
  # endif
  #else  /* Mc88000Architecture */
  #define OSName            Mach 2.5 Vers 2.00.1
  #define OSMajorVersion    2
  #define OSMinorVersion    0
  #define OSTeenyVersion    1
  #endif
  XCOMM operating system:  OSName
  
  #define HasBsearch		NO
  #define HasVoidSignalReturn	NO
  #define HasGcc			YES
  #define HasCThreads		YES
  #define Malloc0ReturnsNull	HasCThreads    /* -lthreads fails, -lc works */
  #define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
  
  #define ThreadsLibraries -lthreads -lmach
  
--- 1,60 ----
! XCOMM platform:  $XConsortium: luna.cf /main/34 1996/01/22 17:37:00 gildea $
  /*
   *	Please set the values for OSMajorVerion and OSMinorVersion
   *	before making makefiles.	 
+  *
+  *	The Luna version of the make program doesn't define the standard
+  *	macro MAKE, so you must run it as "make MAKE=make" at top level,
+  *	e.g., "make MAKE=make World"
   */
  
  #ifdef Mc68000Architecture
  # ifdef luna2
+ #ifndef OSName
  #define OSName            Mach 2.5 Vers 1.40
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    1
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    40
+ #endif
  # else 
+ #ifndef OSName
  #define OSName            UNIOS-B 4.3BSD UNIX: 2.00
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    2
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    0
+ #endif
  #define DirFailPrefix -
  # endif
  #else  /* Mc88000Architecture */
+ #ifndef OSName
  #define OSName            Mach 2.5 Vers 2.00.1
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    2
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    0
+ #endif
+ #ifndef OSTeenyVersion
  #define OSTeenyVersion    1
  #endif
+ #endif
  XCOMM operating system:  OSName
  
  #define HasBsearch		NO
  #define HasVoidSignalReturn	NO
  #define HasGcc			YES
  #define HasCThreads		YES
+ #define HasThreadSafeAPI	NO
  #define Malloc0ReturnsNull	HasCThreads    /* -lthreads fails, -lc works */
  #define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
+ #define BootstrapCFlags		-DUSE_CC_E -DNFS_STDOUT_BUG
  
  #define ThreadsLibraries -lthreads -lmach
  
diff -cr /afs/dementia.org/src/motif/andrew/config/macII.cf ./macII.cf
*** /afs/dementia.org/src/motif/andrew/config/macII.cf	Mon Jan 30 17:48:04 1995
--- ./macII.cf	Thu Apr 11 14:12:23 1996
***************
*** 1,9 ****
! XCOMM platform:  $XConsortium: macII.cf,v 1.47 94/07/05 11:09:07 kaleb Exp $
  
  #define OSName            A/UX 3.0.1
  #define OSMajorVersion    3
  #define OSMinorVersion    0
  #define OSTeenyVersion    1
  XCOMM operating system:  OSName
  
  #if HasGcc
--- 1,17 ----
! XCOMM platform:  $XConsortium: macII.cf /main/49 1996/02/02 18:59:43 gildea $
  
+ #ifndef OSName
  #define OSName            A/UX 3.0.1
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    3
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    0
+ #endif
+ #ifndef OSTeenyVersion
  #define OSTeenyVersion    1
+ #endif
  XCOMM operating system:  OSName
  
  #if HasGcc
***************
*** 29,35 ****
  #if OSMajorVersion <= 2
  #define ServerExtraDefines  -DSUPPORT_2_0
  #endif
! #define InstKmemFlags	    -g sys -m 2755
  #define ExtensionOSDefines  -DXTESTEXT1
  
  #if !HasGcc
--- 37,43 ----
  #if OSMajorVersion <= 2
  #define ServerExtraDefines  -DSUPPORT_2_0
  #endif
! #define InstKmemFlags	    -g sys -m 2711
  #define ExtensionOSDefines  -DXTESTEXT1
  
  #if !HasGcc
diff -cr /afs/dementia.org/src/motif/andrew/config/moto.cf ./moto.cf
*** /afs/dementia.org/src/motif/andrew/config/moto.cf	Tue Apr  5 18:19:55 1994
--- ./moto.cf	Thu Apr 11 14:12:23 1996
***************
*** 1,10 ****
! XCOMM platform:  $XConsortium: moto.cf,v 1.14 94/04/05 18:19:38 converse Exp $
  
  #if defined(MotoR3Architecture)
  
  #define OSName                 Motorola R32V2/R3V6.2
  #define OSMajorVersion         3
  #define OSMinorVersion         2
  
  #define SystemV			YES
  #define BootstrapCFlags		-DSYSV -DMOTOROLA
--- 1,16 ----
! XCOMM platform:  $XConsortium: moto.cf /main/15 1996/01/22 17:37:14 gildea $
  
  #if defined(MotoR3Architecture)
  
+ #ifndef OSName
  #define OSName                 Motorola R32V2/R3V6.2
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion         3
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion         2
+ #endif
  
  #define SystemV			YES
  #define BootstrapCFlags		-DSYSV -DMOTOROLA
***************
*** 22,30 ****
--- 28,42 ----
  
  #if defined(MotoR4Architecture)
  
+ #ifndef OSName
  #define OSName			Motorola R40V4
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion		4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		4
+ #endif
  
  #define SystemV4		YES
  #define BootstrapCFlags		-DSVR4 -DMOTOROLA
diff -cr /afs/dementia.org/src/motif/andrew/config/ncr.cf ./ncr.cf
*** /afs/dementia.org/src/motif/andrew/config/ncr.cf	Wed Sep 27 14:49:53 1995
--- ./ncr.cf	Thu Apr 11 14:12:24 1996
***************
*** 1,6 ****
! XCOMM platform:  $XConsortium: ncr.cf,v 1.21 95/06/09 20:57:00 gildea Exp $
  #define OSName			Unix System V Release 4/MP-RAS
  #define OSVendor		NCR
  XCOMM operating system:  OSName
  
  #define BootstrapCFlags		-DNCR
--- 1,11 ----
! XCOMM platform:  $XConsortium: ncr.cf /main/27 1996/02/02 18:59:47 gildea $
! 
! #ifndef OSName
  #define OSName			Unix System V Release 4/MP-RAS
+ #endif
+ #ifndef OSVendor
  #define OSVendor		NCR
+ #endif
  XCOMM operating system:  OSName
  
  #define BootstrapCFlags		-DNCR
***************
*** 9,15 ****
  
  /* Build Flags */
  
! #define StandardDefines		-DSVR4 -DNCR -Di386 -DXML -DXI18N
  #define DefaultCCOptions	-Xa -Hnocopyr -W0,-asm
  #define DefaultCDebugFlags	-O3
  #define AllocateLocalDefines	-DINCLUDE_ALLOCA_H
--- 14,20 ----
  
  /* Build Flags */
  
! #define StandardDefines		-DSVR4 -DNCR -Di386
  #define DefaultCCOptions	-Xa -Hnocopyr -W0,-asm
  #define DefaultCDebugFlags	-O3
  #define AllocateLocalDefines	-DINCLUDE_ALLOCA_H
***************
*** 25,33 ****
  /* Setup proper ownership of installed files */
  
  #define StripInstalledPrograms	YES
! #define InstPgmFlags		-s -m 0755 -o bin -g bin
  #define InstBinFlags		-m 0755 -o bin -g bin
! #define InstUidFlags		-m 4755 -o root -g bin
  #define InstLibFlags		-m 0644 -o bin -g bin
  #define InstIncFlags		-m 0444 -o bin -g bin
  #define InstManFlags		-m 0444 -o bin -g bin
--- 30,38 ----
  /* Setup proper ownership of installed files */
  
  #define StripInstalledPrograms	YES
! #define InstPgmFlags		-s -m 0711 -o bin -g bin
  #define InstBinFlags		-m 0755 -o bin -g bin
! #define InstUidFlags		-m 4711 -o root -g bin
  #define InstLibFlags		-m 0644 -o bin -g bin
  #define InstIncFlags		-m 0444 -o bin -g bin
  #define InstManFlags		-m 0444 -o bin -g bin
***************
*** 49,61 ****
  #define ManSourcePath		$(MANPATH)/g
  #define XmanSearchPath		/usr/catman
  
- #undef	TblCmd
  #define	TblCmd /usr/ucb/tbl
- #undef	EqnCmd
  #define	EqnCmd /usr/ucb/eqn
!           COL = /usr/bin/col
!          NEQN = /usr/ucb/neqn
!         NROFF = /usr/ucb/nroff -Tlp
  
  /*
   * Man pages need to be formatted when installed, so override the default
--- 54,64 ----
  #define ManSourcePath		$(MANPATH)/g
  #define XmanSearchPath		/usr/catman
  
  #define	TblCmd /usr/ucb/tbl
  #define	EqnCmd /usr/ucb/eqn
! #define ColCmd /usr/bin/col
! #define NeqnCmd /usr/ucb/neqn
! #define NroffCmd /usr/ucb/nroff -Tlp
  
  /*
   * Man pages need to be formatted when installed, so override the default
***************
*** 67,73 ****
  file.z:: file.man							@@\
  	@if [ -f file.man ]; \						@@\
  	then \								@@\
! 	cat file.man | $(NEQN) | $(TBL) | $(NROFF) -man | $(COL) >/tmp/$$$$.man; \	@@\
  	$(RM) /tmp/$$$$.man.z; \					@@\
  	pack -f /tmp/$$$$.man; \					@@\
  	cp /tmp/$$$$.man.z file.z; \					@@\
--- 70,76 ----
  file.z:: file.man							@@\
  	@if [ -f file.man ]; \						@@\
  	then \								@@\
! 	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
  	$(RM) /tmp/$$$$.man.z; \					@@\
  	pack -f /tmp/$$$$.man; \					@@\
  	cp /tmp/$$$$.man.z file.z; \					@@\
***************
*** 86,95 ****
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
! 	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
  	for i in list; do \                                             @@\
  	  (set -x; \							@@\
! 	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) -man | $(COL) >/tmp/$$$$.suff; \	@@\
  	  pack -f /tmp/$$$$.suff; \					@@\
  	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff.z $(DESTDIR)dest/$$i.z; \	@@\
  	  $(RM) /tmp/$$$$.suff.z); \						@@\
--- 89,98 ----
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
! 	MakeFlagsToShellFlags(i,set +e); \				@@\
  	for i in list; do \                                             @@\
  	  (set -x; \							@@\
! 	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
  	  pack -f /tmp/$$$$.suff; \					@@\
  	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff.z $(DESTDIR)dest/$$i.z; \	@@\
  	  $(RM) /tmp/$$$$.suff.z); \						@@\
***************
*** 100,106 ****
  
  #define InstallManPageAliases(file,destdir,aliases)                     @@\
  install.man:: 								@@\
! 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
  		$(RM) $(DESTDIR)destdir/$$i.z;\  			@@\
--- 103,109 ----
  
  #define InstallManPageAliases(file,destdir,aliases)                     @@\
  install.man:: 								@@\
! 	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
  		$(RM) $(DESTDIR)destdir/$$i.z;\  			@@\
diff -cr /afs/dementia.org/src/motif/andrew/config/nec.cf ./nec.cf
*** /afs/dementia.org/src/motif/andrew/config/nec.cf	Mon Apr 11 21:18:36 1994
--- ./nec.cf	Thu Apr 11 14:12:24 1996
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: nec.cf,v 1.2 94/04/11 21:18:22 rws Exp $
  
  #ifdef nec_ews_svr2
  # define NecCISCArchitecture
--- 1,4 ----
! XCOMM platform:  $XConsortium: nec.cf /main/3 1996/01/22 17:37:28 gildea $
  
  #ifdef nec_ews_svr2
  # define NecCISCArchitecture
***************
*** 21,29 ****
--- 21,35 ----
  #endif /* !defined(nec_ews_svr2) */
  
  #ifdef NecCISCArchitecture
+ #ifndef OSName
  #define OSName            	EWS-UX/V
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    	10
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    	1
+ #endif
  #define HasSharedLibraries	NO
  #define HasVoidSignalReturn	NO
  #define HasSockets		YES
***************
*** 36,48 ****
--- 42,66 ----
  
  #ifdef NecRISCArchitecture
  # ifdef _nec_up
+ #ifndef OSName
  #define OSName            	UP-UX/V
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    	5
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    	1
+ #endif
  # else
+ #ifndef OSName
  #define OSName            	EWS-UX/V\(Rel4.2\)
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion    	9
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion    	1
+ #endif
  # endif
  #define HasSharedLibraries	YES
  #define HasVoidSignalReturn 	YES
***************
*** 51,68 ****
--- 69,98 ----
  #endif
  
  #ifdef NecSX3Architecture
+ #ifndef OSName
  #define OSName		 	SUPER-UX
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion	 	3
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		1
+ #endif
  #define SystemV			YES
  #define HasSharedLibraries 	NO
  #define HasVoidSignalReturn	YES
  #endif
  
  #ifdef NecFaultTolerantArchitecture
+ #ifndef OSName
  #define OSName			FT-UX/V
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion		5
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		1
+ #endif
  #define HasSharedLibraries	YES
  #define HasVoidSignalReturn	YES
  #define SystemV4		YES
***************
*** 70,78 ****
--- 100,114 ----
  #endif
  
  #ifdef NecPCArchitecture
+ #ifndef OSName
  #define OSName			PC-UX/V
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion		3
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		1
+ #endif
  #define HasSharedLibraries	NO
  #define HasVoidSignalReturn	NO
  #define SystemV			YES
diff -cr /afs/dementia.org/src/motif/andrew/config/necLib.rules ./necLib.rules
*** /afs/dementia.org/src/motif/andrew/config/necLib.rules	Mon Apr 11 21:17:26 1994
--- ./necLib.rules	Thu Apr 11 14:11:50 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: necLib.rules,v 1.2 94/04/11 21:17:09 rws Exp $
  
  /*
   * NECOS shared library rules
--- 1,4 ----
! XCOMM $XConsortium: necLib.rules,v 1.3 95/01/16 19:50:38 kaleb Exp $
  
  /*
   * NECOS shared library rules
***************
*** 41,47 ****
  install:: Concat(lib,libname.so.rev) 					@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
! 	$(LN) $(DESTDIR)dest/Concat(lib,libname.so.rev) $(DESTDIR)dest/Concat(lib,libname.so)	@@\
  
  #endif /* InstallSharedLibrary */
  
--- 41,47 ----
  install:: Concat(lib,libname.so.rev) 					@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
! 	cd $(DESTDIR)/dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)	@@\
  
  #endif /* InstallSharedLibrary */
  
diff -cr /afs/dementia.org/src/motif/andrew/config/osf1.cf ./osf1.cf
*** /afs/dementia.org/src/motif/andrew/config/osf1.cf	Mon Jan 30 17:51:38 1995
--- ./osf1.cf	Thu Apr 11 14:12:25 1996
***************
*** 1,29 ****
! XCOMM platform:  $XConsortium: osf1.cf,v 1.42.1.1 94/09/15 20:41:35 kaleb Exp $
  /* only tested with Digital OSF/1 */
  
  #ifdef AlphaArchitecture
! #define OSName			OSF/1 1.3
  XCOMM operating system:  OSName
! #define OSMajorVersion		1
! #define OSMinorVersion		3
  #else
  #define OSName			OSF/1 1.0
  XCOMM operating system:  OSName
  #define OSMajorVersion		1
  #define OSMinorVersion		0
  #endif
  
  #define HasPutenv		YES
  #define Malloc0ReturnsNull	YES
  #define HasNdbm			YES
  #define HasShm			YES
  #define AvoidNullMakeCommand	YES
  #define HasPosixThreads		YES
  #define SystemMTDefines -D_REENTRANT
  #define HasPoll			YES
  #define HasVFork                NO
! #define InstallCmd installbsd
! #define RanlibCmd ranlib -t
  #if OSMajorVersion > 1 || OSMinorVersion > 0
  #define ModernOSF1		YES
  #else
--- 1,42 ----
! XCOMM platform:  $XConsortium: osf1.cf /main/68 1996/01/22 17:37:35 gildea $
  /* only tested with Digital OSF/1 */
  
  #ifdef AlphaArchitecture
! #ifndef OSName
! #define OSName			OSF/1 3.2
! #endif
  XCOMM operating system:  OSName
! #ifndef OSMajorVersion
! #define OSMajorVersion		3
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion		2
! #endif
  #else
+ #ifndef OSName
  #define OSName			OSF/1 1.0
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion		1
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		0
  #endif
+ #endif
  
  #define HasPutenv		YES
  #define Malloc0ReturnsNull	YES
  #define HasNdbm			YES
  #define HasShm			YES
  #define AvoidNullMakeCommand	YES
+ #define NullMakeCommand		@ echo
  #define HasPosixThreads		YES
  #define SystemMTDefines -D_REENTRANT
  #define HasPoll			YES
  #define HasVFork                NO
! #define InstallCmd		installbsd
! #define RanlibCmd		ranlib -t
  #if OSMajorVersion > 1 || OSMinorVersion > 0
  #define ModernOSF1		YES
  #else
***************
*** 34,40 ****
--- 47,83 ----
  #define ThreadedX		ModernOSF1
  
  #if ThreadedX
+ #if OSMajorVersion < 4
  #define ThreadsLibraries -lpthreads -lmach -lc_r
+ #define ThreadPreStdAPIDefines	-DXPRE_STANDARD_API
+ #else
+ #define ThreadsLibraries -lpthread -lmach -lexc -lc
+ #define LibraryMTDefines	-DUSE_TIS_SUPPORT
+ #endif
+ #endif
+ 
+ #if ModernOSF1
+ #define OptimizedCDebugFlags	-O2
+ #ifndef ExtraLoadFlags
+ /*
+  * In OSF/1 3.0 Digital has shared libXdmcp and libXau. What's more,
+  * the link editor has different search semantics, i.e. it will search
+  * for shared libraries first, then, if it can't find a shared lib, it
+  * will use a static lib. By using -oldstyle_liblookup the linker will
+  * follow "normal" semantics for linking libraries and will get the
+  * static libraries we really want. By 3.2 they no longer have libXdmcp 
+  * and libXau as shared libraries and we can omit -oldstyle_liblookup. 
+  * (What did they have in 3.1?)
+  */
+ #if OSMajorVersion == 3 && OSMinorVersion == 0
+ #define ExtraLoadFlags		-Wl,-rpath,$(USRLIBDIR),-oldstyle_liblookup
+ #else
+ #define ExtraLoadFlags 		-Wl,-rpath,$(USRLIBDIR)
+ #endif
+ #endif
+ #if OSMajorVersion > 3
+ #define TermcapLibrary		-lcurses
+ #endif
  #endif
  
  /*
***************
*** 42,69 ****
   * DEC C++ compiler, and may learn about other compilers in the future.
   * 
   * For DEC C++, define HasDECCplusplus to YES in site.def.  
   * For other compilers, define HasCplusplus to YES in site.def, and 
   *    check to see if you need to provide values for CplusplusOptions
   *    and/or DefaultCplusplusOptions.
   *
   * In any case, you may also need to set CplusplusDependIncludes.
   *
!  * NOTE:  For DEC C++ version 1.3, we want to set ForceNormalLib 
!  * 	  to YES because no one has managed to get the C++ compiler 
!  *	  to either build or link with shared libraries, and DEC has
!  *        not been able to tell us how to do it.
   */
  
  #if HasDECCplusplus
  #ifndef HasCplusplus 
  #define HasCplusplus YES
  #endif
- #ifndef SharedLibFresco
- #define SharedLibFresco NO
- #endif
- #ifndef SharedLibXtf
- #define SharedLibXtf NO
- #endif
  #ifndef CplusplusCmd
  #define CplusplusCmd /usr/bin/cxx
  #endif
--- 85,111 ----
   * DEC C++ compiler, and may learn about other compilers in the future.
   * 
   * For DEC C++, define HasDECCplusplus to YES in site.def.  
+  *
+  * For g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def.
+  *
   * For other compilers, define HasCplusplus to YES in site.def, and 
   *    check to see if you need to provide values for CplusplusOptions
   *    and/or DefaultCplusplusOptions.
   *
   * In any case, you may also need to set CplusplusDependIncludes.
   *
!  * Note: For DEC C++, the -call_shared option really only needs to 
!  * appear when linking C++ executables, not when actually compiling
!  * the C++ sources.  But since there's no imake variable that lets
!  * us insert flags only into the C++ link stage, we use -call_shared
!  * on all compilations when building executables.  This could be 
!  * considered a deficiency in the current imake configuration
   */
  
  #if HasDECCplusplus
  #ifndef HasCplusplus 
  #define HasCplusplus YES
  #endif
  #ifndef CplusplusCmd
  #define CplusplusCmd /usr/bin/cxx
  #endif
***************
*** 73,99 ****
  #ifndef CplusplusLibC
  #define CplusplusLibC -L/usr/lib/cmplrs/cxx -lcxx
  #endif
! #ifndef ForceNormalLib
! #define ForceNormalLib YES
  #endif
  #endif /* HasDECCplusplus */
  
  #include <osfLib.rules>
  #define NoRConst		YES
  
  #ifdef AlphaArchitecture
  #define HasWChar32		YES
  #define DefaultCCOptions	-std1
  #define XawI18nDefines		-DHAS_WCHAR_H
  #define BuildServer		NO
  #endif
  #ifdef MipsArchitecture
! #define DefaultCCOptions	-Xc
  #define XdecServer YES
  #define ServerOSDefines -DDDXTIME
! #define PexCCOptions -Xc -Wf,-XNp15000,-XNd15000
! #define NormalLibObjCompile(options) $(RM) $@ $*.os \			@@\
  	&& $(CC) -c options $(CFLAGS) $*.c \				@@\
  	&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \			@@\
  	&& $(MV) $*.os $@
  #endif
--- 115,175 ----
  #ifndef CplusplusLibC
  #define CplusplusLibC -L/usr/lib/cmplrs/cxx -lcxx
  #endif
! #ifndef CplusplusOptions
! #define CplusplusOptions -call_shared
  #endif
  #endif /* HasDECCplusplus */
  
+ 
+ #if HasGcc2ForCplusplus
+ #ifndef CplusplusLibC
+ #define CplusplusLibC `$(CXX) -print-libgcc-file-name`
+ #endif 
+ #endif /* HasGcc2ForCplusplus */
+ 
  #include <osfLib.rules>
  #define NoRConst		YES
  
  #ifdef AlphaArchitecture
+ #ifndef HasWChar32
  #define HasWChar32		YES
+ #endif
+ #define ServerExtraDefines	-D_XSERVER64
+ #define ServerOSDefines		-DDDXTIME
+ #ifndef DefaultCCOptions
  #define DefaultCCOptions	-std1
+ #endif
+ #ifndef XawI18nDefines
  #define XawI18nDefines		-DHAS_WCHAR_H
+ #endif
+ #ifndef BuildServer
  #define BuildServer		NO
  #endif
+ #endif
+ 
  #ifdef MipsArchitecture
! #define DefaultCCOptions	-Xa
  #define XdecServer YES
  #define ServerOSDefines -DDDXTIME
! #define PexCCOptions -Xa -Wf,-XNp15000,-XNd15000
! #define NormalLibObjCompile(options) 	ClearmakeOSName			  \
! 	$(RM) $@ $*.os \						@@\
  	&& $(CC) -c options $(CFLAGS) $*.c \				@@\
  	&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \			@@\
  	&& $(MV) $*.os $@
+ #endif
+ 
+ #if !HasClearmake
+ #ifndef HasMakefileSafeInclude
+ #define HasMakefileSafeInclude YES
+ #endif
+ #ifndef IncludeMakefile
+ #define IncludeMakefile(file) @@-include file
+ #endif
+ #endif
+ 
+ #ifndef ManKeywordsTarget
+ #define ManKeywordsTarget(manpath)					@@\
+ man_keywords::								@@\
+ 	catman -M $(DESTDIR)manpath -w
  #endif
diff -cr /afs/dementia.org/src/motif/andrew/config/osfLib.rules ./osfLib.rules
*** /afs/dementia.org/src/motif/andrew/config/osfLib.rules	Tue Jan 18 14:59:02 1994
--- ./osfLib.rules	Thu Apr 11 14:11:53 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: osfLib.rules,v 1.9 94/01/18 14:58:49 rws Exp $
  
  /*
   * OSF/1 shared library rules
--- 1,4 ----
! XCOMM $XConsortium: osfLib.rules /main/15 1995/11/13 18:31:07 kaleb $
  
  /*
   * OSF/1 shared library rules
***************
*** 23,34 ****
  #define ShLibIncludeFile <osfLib.tmpl>
  #endif
  #ifndef SharedLibraryLoadFlags
- #if ModernOSF1
- #define SharedLibraryLoadFlags -shared -no_archive -rpath $(USRLIBDIR)
- #else
  #define SharedLibraryLoadFlags -shared -no_archive
  #endif
! #endif
  #ifndef PositionIndependentCFlags
  #define PositionIndependentCFlags /**/
  #endif
--- 23,31 ----
  #define ShLibIncludeFile <osfLib.tmpl>
  #endif
  #ifndef SharedLibraryLoadFlags
  #define SharedLibraryLoadFlags -shared -no_archive
  #endif
! 
  #ifndef PositionIndependentCFlags
  #define PositionIndependentCFlags /**/
  #endif
***************
*** 42,48 ****
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
! 	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
  
  #endif /* InstallSharedLibrary */
  
--- 39,45 ----
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
! 	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)
  
  #endif /* InstallSharedLibrary */
  
***************
*** 56,66 ****
  #ifndef PackageName(libname)
  #if ModernOSF1
  #define PackageName(libname) /**/
  #else
  #define PackageName(libname) -package libname
  #endif
  #endif
! #if ThreadedX && ModernOSF1
  #define BaseShLibReqs -lc_r -lc
  #else
  #define BaseShLibReqs -lc
--- 53,65 ----
  #ifndef PackageName(libname)
  #if ModernOSF1
  #define PackageName(libname) /**/
+ #define Objects(objlist) -all objlist -none 
  #else
  #define PackageName(libname) -package libname
+ #define Objects(objlist) objlist
  #endif
  #endif
! #if ThreadedX && ModernOSF1 && OSMajorVersion < 4
  #define BaseShLibReqs -lc_r -lc
  #else
  #define BaseShLibReqs -lc
***************
*** 78,84 ****
  									@@\
  Concat(lib,libname.so.rev):  solist					@@\
  	$(RM) $@~							@@\
! 	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) PackageName($@) -soname $@ solist $(REQUIREDLIBS) BaseShLibReqs) @@\
  	$(RM) $@ 							@@\
  	$(MV) $@~ $@							@@\
  	$(RM) Concat(lib,libname.so)					@@\
--- 77,85 ----
  									@@\
  Concat(lib,libname.so.rev):  solist					@@\
  	$(RM) $@~							@@\
! 	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) PackageName($@) \	@@\
! 		-soname $@ Objects(solist) \				@@\
! 		$(REQUIREDLIBS) BaseShLibReqs) 				@@\
  	$(RM) $@ 							@@\
  	$(MV) $@~ $@							@@\
  	$(RM) Concat(lib,libname.so)					@@\
***************
*** 94,100 ****
  									@@\
  Concat(lib,libname.so.rev):  solist					@@\
  	$(RM) $@~							@@\
! 	$(LD) -o $@~ $(SHLIBLDFLAGS) PackageName($@) -soname $@ solist $(REQUIREDLIBS) BaseShLibReqs @@\
  	$(RM) $@ 							@@\
  	$(MV) $@~ $@							@@\
  	$(RM) Concat(lib,libname.so)					@@\
--- 95,103 ----
  									@@\
  Concat(lib,libname.so.rev):  solist					@@\
  	$(RM) $@~							@@\
! 	$(LD) -o $@~ $(SHLIBLDFLAGS) PackageName($@) \			@@\
! 		-soname $@ Objects(solist) \				@@\
! 		$(REQUIREDLIBS) BaseShLibReqs 				@@\
  	$(RM) $@ 							@@\
  	$(MV) $@~ $@							@@\
  	$(RM) Concat(lib,libname.so)					@@\
diff -cr /afs/dementia.org/src/motif/andrew/config/osfLib.tmpl ./osfLib.tmpl
*** /afs/dementia.org/src/motif/andrew/config/osfLib.tmpl	Wed Jul 13 17:48:51 1994
--- ./osfLib.tmpl	Thu Apr 11 14:12:05 1996
***************
*** 1,20 ****
! XCOMM $XConsortium: osfLib.tmpl,v 1.18 94/06/03 21:38:46 matt Exp $
  
  /*
   * OSF/1 shared library template
   */
  
  #if ThreadedX && ModernOSF1
  #define SharedX11Reqs -lpthreads -lmach
  #endif
  #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
  
! #if ThreadedX && ModernOSF1
  #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lpthreads -lmach
  #else
  #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
  #endif
  #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -init _XawFixupVendorShell
  #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
  #define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
  #define SharedXiReqs $(LDPRELIB) $(XLIB)
--- 1,26 ----
! XCOMM $XConsortium: osfLib.tmpl /main/21 1995/12/14 15:31:29 matt $
  
  /*
   * OSF/1 shared library template
   */
  
  #if ThreadedX && ModernOSF1
+ #if OSMajorVersion < 4
  #define SharedX11Reqs -lpthreads -lmach
  #endif
+ #endif
  #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
  
! #if ThreadedX && ModernOSF1 && OSMajorVersion < 4
  #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lpthreads -lmach
  #else
  #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
  #endif
+ #if ModernOSF1
+ #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+ #else
  #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -init _XawFixupVendorShell
+ #endif
  #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
  #define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
  #define SharedXiReqs $(LDPRELIB) $(XLIB)
***************
*** 23,33 ****
  #define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
  #define SharedSMReqs $(LDPRELIB) $(ICELIB)
  
- #if ThreadedX && ModernOSF1
- #define FrescoSysLibs  -lpthreads -lmach CplusplusLibC MathLibrary
- #else
- #define FrescoSysLibs  CplusplusLibC MathLibrary
- #endif
- 
- #define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs
- #define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs
--- 29,31 ----
diff -cr /afs/dementia.org/src/motif/andrew/config/pegasus.cf ./pegasus.cf
*** /afs/dementia.org/src/motif/andrew/config/pegasus.cf	Thu Feb 10 12:16:30 1994
--- ./pegasus.cf	Thu Apr 11 14:12:26 1996
***************
*** 1,9 ****
! XCOMM platform:  $XConsortium: pegasus.cf,v 1.36 94/02/10 12:16:24 rws Exp $
  
  #define OSName             UTek 4.0
  XCOMM operating system:  OSName
  #define OSMajorVersion     4
  #define OSMinorVersion     0
  
  #define HasNdbm		   YES
  #define HasVoidSignalReturn NO
--- 1,15 ----
! XCOMM platform:  $XConsortium: pegasus.cf /main/37 1996/01/22 17:37:42 gildea $
  
+ #ifndef OSName
  #define OSName             UTek 4.0
+ #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion     4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion     0
+ #endif
  
  #define HasNdbm		   YES
  #define HasVoidSignalReturn NO
Only in .: sco.cf
diff -cr /afs/dementia.org/src/motif/andrew/config/sequent.cf ./sequent.cf
*** /afs/dementia.org/src/motif/andrew/config/sequent.cf	Fri Feb  4 21:35:32 1994
--- ./sequent.cf	Thu Apr 11 14:12:27 1996
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: sequent.cf,v 1.1 94/02/04 21:35:31 rws Exp $
  /*
   * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install
   * util/scripts/bsdinstall.sh before doing a "make install"
--- 1,4 ----
! XCOMM platform:  $XConsortium: sequent.cf /main/2 1996/01/22 17:37:49 gildea $
  /*
   * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install
   * util/scripts/bsdinstall.sh before doing a "make install"
***************
*** 6,14 ****
--- 6,20 ----
  
  #if defined(DynixPtxArchitecture) || defined(_SEQUENT_)
  
+ #ifndef OSName
  #define OSName			Dynix/ptx
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion		2
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		0
+ #endif
  
  #define SystemV			YES
  #define SymbolTableFlags
***************
*** 46,54 ****
--- 52,66 ----
  
  #if defined(Dynix3Architecture) || defined(sequent)
  
+ #ifndef OSName
  #define OSName			Dynix 3
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion		3
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		2
+ #endif
  
  #define SymbolTableFlags	-W0,-Nn7500 -W0,-Nd10000
  #define DefaultCCOptions	SymbolTableFlags
diff -cr /afs/dementia.org/src/motif/andrew/config/sgi.cf ./sgi.cf
*** /afs/dementia.org/src/motif/andrew/config/sgi.cf	Wed Jul 13 17:48:51 1994
--- ./sgi.cf	Thu Apr 11 14:12:28 1996
***************
*** 1,30 ****
! XCOMM platform:  $XConsortium: sgi.cf,v 1.43 94/06/03 21:38:45 matt Exp $
  
! #define OSName			IRIX 5.2
  XCOMM operating system:  OSName
  #define OSMajorVersion		5
! #define OSMinorVersion		2
  #define OSTeenyVersion          0
  
  #if OSMajorVersion < 4
  /* We do not guarantee this will work */
! #define BootstrapCFlags   -DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
! #define StandardDefines   -DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
  #endif
  
  #define SystemV			YES
! #define HasPutenv		YES
! #define ExecableScripts		YES
! #if OSMajorVersion > 3
! #define SetTtyGroup		YES
  #else
! #define SetTtyGroup		NO
  #endif
  #define HasNdbm			YES
  #define HasPoll                 YES
- #define Malloc0ReturnsNull	YES
  #define ExpandManNames          YES
  #define BuildXInputExt		YES
  
  #if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
  #define NeedVarargsPrototypes	YES
--- 1,58 ----
! XCOMM platform:  $XConsortium: sgi.cf /main/23 1996/02/02 18:59:52 gildea $
  
! #ifndef OSName
! #define OSName			IRIX 5.3
! #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion		5
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion		3
! #endif
! #ifndef OSTeenyVersion
  #define OSTeenyVersion          0
+ #endif
  
  #if OSMajorVersion < 4
  /* We do not guarantee this will work */
! #define BootstrapCFlags		-DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
! #define StandardDefines		-DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
! #define SetTtyGroup		NO
! #else
! #define SetTtyGroup		YES
! #define ExtraFilesToClean	so_locations
  #endif
  
+ #if OSMajorVersion < 5
  #define SystemV			YES
! #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #else
! #define BootstrapCFlags		-DSVR4
! #define StandardDefines		-DSVR4
! #define SystemV4		YES
! #define HasWChar32              YES
! #define HasVFork		NO
! #define XawI18nDefines		-DHAS_WCTYPE_H -DHAS_ISW_FUNCS
! #define AllocateLocalDefines	-DINCLUDE_ALLOCA_H
! #ifndef ExtraLoadFlags
! #define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIR)
! #endif
! #endif
! 
! #if OSMajorVersion == 6
! #define Mips64Architecture
  #endif
+ 
+ #define Malloc0ReturnsNull	YES	/* IRIX 5.x -lmalloc needs this */
+ #define HasPutenv		YES
+ #define ExecableScripts		YES
  #define HasNdbm			YES
  #define HasPoll                 YES
  #define ExpandManNames          YES
+ #ifndef BuildXInputExt
  #define BuildXInputExt		YES
+ #endif
  
  #if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
  #define NeedVarargsPrototypes	YES
***************
*** 32,53 ****
  #define NeedWidePrototypes	NO
  #endif
  
! #if OSMajorVersion > 4
! #define HasWChar32              YES
! #define XawI18nDefines		-DHAS_WCTYPE_H
! #endif
! 
! /* Extra libraries provide : yp, sysV malloc, shared libc, and widechar */
! #define ExtraLibraries -lsun -lmalloc -lc_s -lw
! 
! /* #include <sgiLib.rules> */
  
  #define SymbolTables -Wf,-XNp9000,-XNd8000,-XNh2000
  #define PexSymbolTables -Wf,-XNp15000,-XNd15000,-XNh2000
  #define ServerSymbolTables -Wf,-XNp8000,-XNh2000,-XNd8000
  
  /* this is for floating point, ANSI cpp */
  #define sgiCCOptions -xansi -D__STDC__=1 -float
  #define DefaultCCOptions sgiCCOptions SymbolTables
  #define PexCCOptions sgiCCOptions PexSymbolTables
  #define ServerCCOptions sgiCCOptions ServerSymbolTables
--- 60,88 ----
  #define NeedWidePrototypes	NO
  #endif
  
! #include <sgiLib.rules>
  
+ #if OSMajorVersion < 5
  #define SymbolTables -Wf,-XNp9000,-XNd8000,-XNh2000
  #define PexSymbolTables -Wf,-XNp15000,-XNd15000,-XNh2000
  #define ServerSymbolTables -Wf,-XNp8000,-XNh2000,-XNd8000
+ #else
+ #define SymbolTables
+ #define PexSymbolTables 
+ #define ServerSymbolTables
+ #endif
  
  /* this is for floating point, ANSI cpp */
+ #if OSMajorVersion < 5
+ /* Extra libraries provide : yp, sysV malloc, shared libc, and widechar */
+ #define ExtraLibraries -lsun -lmalloc -lc_s -lw
  #define sgiCCOptions -xansi -D__STDC__=1 -float
+ #else
+ #define sgiCCOptions -xansi
+ /* SGI's -lsocket -lnsl is broken, at least in 5.2, so override here */
+ #define ExtraLibraries /**/
+ #endif
+ 
  #define DefaultCCOptions sgiCCOptions SymbolTables
  #define PexCCOptions sgiCCOptions PexSymbolTables
  #define ServerCCOptions sgiCCOptions ServerSymbolTables
***************
*** 70,76 ****
  #define LdCombineFlags -r
  
  /* Installation Build Parameters */
! #define InstKmemFlags -m 2755 -g sys
  
  #define ArCmd ar scq
  
--- 105,111 ----
  #define LdCombineFlags -r
  
  /* Installation Build Parameters */
! #define InstKmemFlags -m 2711 -g sys
  
  #define ArCmd ar scq
  
***************
*** 79,98 ****
  #define DefaultSystemPath /usr/sbin:/usr/bsd:/bin:/etc:/usr/bin:/usr/etc:$(BINDIR)
  
  #define BuildServer             NO
! #define ServerOSDefines -DDDXTIME
  /* only need this for binary compatibility with their ddx */
! #define ServerExtraDefines -DNEED_LINEHELPER
  
  /* Changed to a single shell command for pmake/smake */
  /*
   * NormalLibObjCompile - compile fragment for a library object file
   * 	do ld -x to remove line number symbols for libraries
   */
! #define	NormalLibObjCompile(options) $(RM) $@ $*.os \			@@\
  	&& $(CC) -c options $(CFLAGS) $*.c \				@@\
  	&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \			@@\
  	&& $(MV) $*.os $@
  
! #define	LibObjCompile(dir,options) $(RM) $@ dir/$@ \			@@\
  	&& $(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c \		@@\
  	&& $(MV) $@ dir/$@
--- 114,151 ----
  #define DefaultSystemPath /usr/sbin:/usr/bsd:/bin:/etc:/usr/bin:/usr/etc:$(BINDIR)
  
  #define BuildServer             NO
! #define ServerOSDefines		-DDDXTIME 
  /* only need this for binary compatibility with their ddx */
! #define ServerExtraDefines	-DNEED_LINEHELPER AllocateLocalDefines
  
  /* Changed to a single shell command for pmake/smake */
+ #if OSMajorVersion < 5
  /*
   * NormalLibObjCompile - compile fragment for a library object file
   * 	do ld -x to remove line number symbols for libraries
   */
! #define NormalLibObjCompile(options) 	ClearmakeOSName			  \
! 	$(RM) $@ $*.os \						@@\
  	&& $(CC) -c options $(CFLAGS) $*.c \				@@\
  	&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \			@@\
  	&& $(MV) $*.os $@
+ #endif
  
! #define LibObjCompile(dir,options) ClearmakeOSName			  \
! 	$(RM) $@ dir/$@ \						@@\
  	&& $(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c \		@@\
  	&& $(MV) $@ dir/$@
+ 
+ #ifndef HasMakefileSafeInclude
+ #define HasMakefileSafeInclude YES
+ #endif
+ #ifndef IncludeMakefile
+ #define IncludeMakefile(file) @@sinclude file
+ #endif
+ 
+ /* needs to find nroff on the system to work */
+ #ifndef ManKeywordsTarget
+ #define ManKeywordsTarget(manpath)					@@\
+ man_keywords::								@@\
+ 	/usr/lib/makewhatis -M $(DESTDIR)manpath $(DESTDIR)manpath/whatis
+ #endif
diff -cr /afs/dementia.org/src/motif/andrew/config/sgiLib.rules ./sgiLib.rules
*** /afs/dementia.org/src/motif/andrew/config/sgiLib.rules	Sat Sep 11 17:59:39 1993
--- ./sgiLib.rules	Thu Apr 11 14:11:54 1996
***************
*** 1,8 ****
! XCOMM $XConsortium: sgiLib.rules,v 1.8 93/09/11 17:59:30 rws Exp $
  
  #ifndef HasSharedLibraries
  #define HasSharedLibraries YES
  #endif
  #ifndef SharedDataSeparation
  #define SharedDataSeparation YES
  #endif
--- 1,9 ----
! XCOMM $XConsortium: sgiLib.rules /main/14 1995/10/16 18:46:30 gildea $
  
  #ifndef HasSharedLibraries
  #define HasSharedLibraries YES
  #endif
+ #if OSMajorVersion < 5
  #ifndef SharedDataSeparation
  #define SharedDataSeparation YES
  #endif
***************
*** 47,49 ****
--- 48,158 ----
   */
  #define	InstallSharedLibraryData(libname,rev,dest)			@@\
  InstallTarget(install,Concat3(lib,libname,_s.a),$(INSTLIBFLAGS),dest)
+ 
+ #else /* OSMajorVersion >= 5 */
+ 
+ #ifndef SharedDataSeparation
+ #define SharedDataSeparation NO
+ #endif
+ #ifndef SharedCodeDef
+ #define SharedCodeDef /**/
+ #endif
+ #ifndef SharedLibraryDef
+ #define SharedLibraryDef /**/
+ #endif
+ #ifndef ShLibIncludeFile
+ #define ShLibIncludeFile <sgiLib.tmpl>
+ #endif
+ #ifndef SharedLibraryLoadFlags
+ #define SharedLibraryLoadFlags -shared
+ #endif
+ /* -KPIC is redundant, PIC is always used unless you specify -non_shared */
+ #ifndef PositionIndependentCFlags
+ #define PositionIndependentCFlags -KPIC
+ #endif
+ #ifndef PositionIndependentCplusplusFlags
+ #define PositionIndependentCplusplusFlags -KPIC
+ #endif
+ 
+ /*
+  * SGI's cc passes an undocumented flag to ld that causes it to look for
+  * -lX11 and force use of libX11.so.1.  And it can't be turned off.  Sigh.
+  * So we install one of those, too, in the shared library install target.
+  */
+ 
+ /*
+  * InstallSharedLibrary - generate rules to install the shared library.
+  */
+ #ifndef InstallSharedLibrary
+ #define	InstallSharedLibrary(libname,rev,dest)				@@\
+ install:: Concat(lib,libname.so.rev) 					@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+ 	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
+ 	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@\
+ 	if [ "libname" = X11 ]; then \					@@\
+ 	    RemoveFile(Concat($(DESTDIR)dest/lib,libname.so.1)); \	@@\
+ 	    cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so.1);\ @@\
+ 	fi
+ 
+ #endif /* InstallSharedLibrary */
+ 
+ /*
+  * InstallSharedLibraryData - generate rules to install the shared library data
+  */
+ #ifndef InstallSharedLibraryData
+ #define	InstallSharedLibraryData(libname,rev,dest)
+ #endif /* InstallSharedLibraryData */
+ 
+ 
+ /*
+  * SharedLibraryTarget - generate rules to create a shared library;
+  * build it into a different name so that we do not hose people by having
+  * the library gone for long periods.
+  */
+ 
+ /*
+  * SGI's cc passes an undocumented flag to ld that causes it to look for
+  * -lX11 and force use of libX11.so.1.  Sigh.  So we make one of those, too,
+  * in the shared library build target.
+  */
+ 
+ #ifndef sgiX11soHack
+ #ifdef UseInstalled
+ #define sgiX11soHack(libname) /**/
+ #else
+ #define sgiX11soHack(libname) if [ "libname" = X11 ]; then \		@@\
+ 	    RemoveFile($(BUILDLIBDIR)/Concat(lib,libname.so.1)); \	@@\
+ 	    cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$@ Concat(lib,libname.so.1); \ @@\
+ 	fi
+ #endif
+ #endif /* sgiX11soHack */
+ 
+ #ifndef SharedLibraryTarget
+ #define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+ AllTarget(Concat(lib,libname.so.rev))					@@\
+ 									@@\
+ Concat(lib,libname.so.rev):  solist					@@\
+ 	$(RM) $@~ 							@@\
+ 	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $@ solist $(REQUIREDLIBS))	@@\
+ 	$(RM) $@							@@\
+ 	$(MV) $@~ $@							@@\
+ 	$(RM) Concat(lib,libname.so)					@@\
+ 	$(LN) $@ Concat(lib,libname.so)					@@\
+ 	LinkBuildLibrary($@)						@@\
+ 	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+ 	sgiX11soHack(libname)						@@\
+ 									@@\
+ clean::									@@\
+ 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) so_locations
+ 
+ #endif /* SharedLibraryTarget */
+ 
+ /*
+  * SharedLibraryDataTarget - generate rules to create shlib data file;
+  */
+ #ifndef SharedLibraryDataTarget
+ #define SharedLibraryDataTarget(libname,rev,salist)
+ #endif /* SharedLibraryTarget */
+ 
+ #endif /* OsMajorVersion < 5 else */
Only in .: sgiLib.tmpl
diff -cr /afs/dementia.org/src/motif/andrew/config/site.def ./site.def
*** /afs/dementia.org/src/motif/andrew/config/site.def	Mon Dec 11 17:05:24 1995
--- ./site.def	Thu Apr 11 14:12:09 1996
***************
*** 1,25 ****
! XCOMM site:  $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $
  
! /*****************************************************************************
!  *                                                                           *
!  *			   SITE-SPECIFIC DEFINITIONS                         *
!  *                                                                           *
!  * This file contains two halves, one included before the vendor-specific    *
!  * configuration file (.cf file), and one included after the .cf file.       *
!  * The before-half should be protected by #ifdef BeforeVendorCF, and the     *
!  * after-half should be protected by #ifdef AfterVendorCF.                   *
!  *                                                                           *
!  * The before-half should only set things that the .cf file depends on.      *
!  * For the .cf files shipped in this release, the main variables in this     *
!  * category are HasGcc and HasGcc2.                                          *
!  *                                                                           *
!  * The after-half should contain all other definitions.  For example,        *
!  * place your ProjectRoot definition here.                                   *
!  *                                                                           *
!  * OS Major and Minor version numbers should be changed directly in the .cf  *
!  * file, not overridden in site.def.                                         *
!  *                                                                           *
!  *****************************************************************************/
  
  /* if you want host-specific customization, this is one way to do it */
  /*
--- 1,25 ----
! XCOMM site:  $XConsortium: site.sample /main/19 1995/12/14 13:03:29 matt $
  
! /***************************************************************************
!  *                                                                         *
!  *			   SITE-SPECIFIC DEFINITIONS                       *
!  *                                                                         *
!  * This file contains two halves, one included before the vendor-specific  *
!  * configuration file (.cf file), and one included after the .cf file.     *
!  * The before-half should be protected by #ifdef BeforeVendorCF, and the   *
!  * after-half should be protected by #ifdef AfterVendorCF.                 *
!  *                                                                         *
!  * The before-half should only set things that the .cf file depends on.    *
!  * For the .cf files shipped in this release, the main variables in this   *
!  * category are HasGcc, HasGcc2, and HasCplusplus 			   *
!  *                                                                         *
!  * The after-half should contain all other definitions.  For example,      *
!  * place your ProjectRoot definition here.                                 *
!  *                                                                         *
!  * OS Major and Minor version numbers should be changed directly in the    *
!  * .cf file, not overridden in site.def.                                   *
!  *                                                                         *
!  ***************************************************************************/
  
  /* if you want host-specific customization, this is one way to do it */
  /*
***************
*** 27,56 ****
  #define SiteIConfigFiles $(IRULESRC)/host.def
  #define LocalConfigFiles host.def
  #endif
- 
  */
  
  
  #ifdef BeforeVendorCF
  
! /* This makes libX11 not require libthreads. The genius who wrote these
!    config files but didn't bother to put in provisions for Solaris 2.4
!    should be shot */
! #if defined(SVR4Architecture) && defined(SparcArchitecture)
! #define OSMajorVersion    5
! #define OSMinorVersion    4
! #define OSTeenyVersion    0
! #endif
  
- /*
- #include <host.def>
- */
  
- /*
  #ifndef HasGcc2
  #define HasGcc2 YES
  #endif
! */
  
  #endif /* BeforeVendorCF */
  
--- 27,44 ----
  #define SiteIConfigFiles $(IRULESRC)/host.def
  #define LocalConfigFiles host.def
  #endif
  */
  
  
  #ifdef BeforeVendorCF
  
! /* #include <host.def> */
  
  
  #ifndef HasGcc2
  #define HasGcc2 YES
  #endif
! 
  
  #endif /* BeforeVendorCF */
  
***************
*** 58,73 ****
  
  #define ProjectRoot /usr/local
  
! #define HasXdmAuth YES 
  
! /* #define BuildXKB YES */
! 
! /* #define PreIncDir /usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3/2.5.8/include */
  
  /*
  #if defined(SunArchitecture) && defined(SparcArchitecture)
  #define HasCodeCenter	YES
! #ifndef SVR4
  #define HasTestCenter	YES
  #endif
  #endif
--- 46,60 ----
  
  #define ProjectRoot /usr/local
  
! /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
! #define HasXdmAuth YES
  
! /* #define PreIncDir /usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3/2.6.0/include */
  
  /*
  #if defined(SunArchitecture) && defined(SparcArchitecture)
  #define HasCodeCenter	YES
! #ifndef SVR4Architecture
  #define HasTestCenter	YES
  #endif
  #endif
***************
*** 80,86 ****
  */
  
  /*
! #if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4)
  #define HasPurify	YES
  #endif
  */
--- 67,73 ----
  */
  
  /*
! #if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture)
  #define HasPurify	YES
  #endif
  */
***************
*** 90,118 ****
  */
  
  /*
! #if XsvgaServer
! #define SvgaConfig vga.pmi:1024x768
! #endif
  */
  
  /* You do NOT need SetUID if you only run the server under xdm */
  /* You MAY need SetUID if users run the server by hand or under xinit */
  /* Consult your system administrator before making the X server setuid */
! /*
  #if defined(SunArchitecture) && OSMajorVersion > 4
  #define InstallXserverSetUID YES
  #endif
- */
  
- /* You do NOT need SetUID if you only run the server under xdm */
- /* You MAY need SetUID if users run the server by hand or under xinit */
- /* Consult your system administrator before making the X server setuid */
- /*
- #if XsvgaServer
- #define SvgaConfig vga.pmi:1024x768
- #define InstallXserverSetUID YES
- #endif
- */
  
  /* You do NOT need SetUID if you only run the server under xdm */
  /* You MAY need SetUID if users run the server by hand or under xinit */
--- 77,95 ----
  */
  
  /*
! #undef DefaultUserPath
! #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
  */
  
+ 
  /* You do NOT need SetUID if you only run the server under xdm */
  /* You MAY need SetUID if users run the server by hand or under xinit */
  /* Consult your system administrator before making the X server setuid */
! 
  #if defined(SunArchitecture) && OSMajorVersion > 4
  #define InstallXserverSetUID YES
  #endif
  
  
  /* You do NOT need SetUID if you only run the server under xdm */
  /* You MAY need SetUID if users run the server by hand or under xinit */
***************
*** 123,145 ****
  #endif
  */
  
! /*
! #include <host.def>
! */
! 
! /* we won't be using the R6 X server */
! #ifdef BuildServer
! #undef BuildServer
! #endif
! #define BuildServer NO
! 
! #define ForceNormalLib YES
! 
! #ifdef HasShadowPasswd
! #undef HasShadowPasswd
! #endif
! 
! #define StripInstalledPrograms YES
! #define InstallCmd /usr/local/bin/install
  
  #endif /* AfterVendorCF */
--- 100,105 ----
  #endif
  */
  
! /* #include <host.def> */
  
  #endif /* AfterVendorCF */
Only in /afs/dementia.org/src/motif/andrew/config: site.sample
diff -cr /afs/dementia.org/src/motif/andrew/config/sony.cf ./sony.cf
*** /afs/dementia.org/src/motif/andrew/config/sony.cf	Sat Apr  2 08:41:00 1994
--- ./sony.cf	Thu Apr 11 14:12:28 1996
***************
*** 1,16 ****
! XCOMM platform:  $XConsortium: sony.cf,v 1.57 94/04/02 08:40:51 kaleb Exp $
  
  #ifdef SonyBsdArchitecture
  
  #define OSName                  NEWS-OS 4.2.1C
  #define OSMajorVersion          4
  #define OSMinorVersion          2
  #define OSTeenyVersion          1
  #define SetTtyGroup             YES
  #define HasVoidSignalReturn     NO
  #define HasNdbm                 YES
  #define DirFailPrefix -
! #define InstKmemFlags		-g kmem -m 2755
  #define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
  #define DefaultSystemPath /etc:/usr/etc:/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
  #ifdef MipsArchitecture
--- 1,24 ----
! XCOMM platform:  $XConsortium: sony.cf /main/67 1996/02/02 19:00:08 gildea $
  
  #ifdef SonyBsdArchitecture
  
+ #ifndef OSName
  #define OSName                  NEWS-OS 4.2.1C
+ #endif
+ #ifndef OSMajorVersion
  #define OSMajorVersion          4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion          2
+ #endif
+ #ifndef OSTeenyVersion
  #define OSTeenyVersion          1
+ #endif
  #define SetTtyGroup             YES
  #define HasVoidSignalReturn     NO
  #define HasNdbm                 YES
  #define DirFailPrefix -
! #define InstKmemFlags		-g kmem -m 2711
  #define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
  #define DefaultSystemPath /etc:/usr/etc:/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
  #ifdef MipsArchitecture
***************
*** 39,57 ****
  
  #else
  
! #define OSName			NEWS-OS 6.0
  #define OSMajorVersion		6
! #define OSMinorVersion		0
  #define BootstrapCFlags		-Dsony
  #define SystemV4		YES
  #define CcCmd			/usr/bin/cc
  #if OSMajorVersion >= 6
! #define DefaultCCOptions	-Xc -Wf,-XNp9000,-XNd6000
! #define PexCCOptions		-Xc -Wf,-XNp15000,-XNd15000
  #define SharedLibraryLoadFlags -G -rpath $(USRLIBDIR)
  #define PositionIndependentCFlags -K PIC -Wx,-G 0
  #define PositionIndependentCplusplusFlags -K PIC -Wx,-G 0
! #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB)
  #define FixupLibReferences() /**/
  #include <sv4Lib.rules>
  #else
--- 47,76 ----
  
  #else
  
! #ifndef OSName
! #define OSName			NEWS-OS 6.1.1
! #endif
! #ifndef OSMajorVersion
  #define OSMajorVersion		6
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion		1
! #endif
! #ifndef OSTeenyVersion
! #define OSTeenyVersion		1
! #endif
  #define BootstrapCFlags		-Dsony
  #define SystemV4		YES
+ #define HasVFork		NO
  #define CcCmd			/usr/bin/cc
+ #define LdCmd			/usr/bin/ld
  #if OSMajorVersion >= 6
! #define DefaultCCOptions	-Xa -Wf,-XNp9000,-XNd6000
! #define PexCCOptions		-Xa -Wf,-XNp15000,-XNd15000
  #define SharedLibraryLoadFlags -G -rpath $(USRLIBDIR)
  #define PositionIndependentCFlags -K PIC -Wx,-G 0
  #define PositionIndependentCplusplusFlags -K PIC -Wx,-G 0
! #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
  #define FixupLibReferences() /**/
  #include <sv4Lib.rules>
  #else
***************
*** 77,80 ****
--- 96,101 ----
  
  XCOMM operating system:  OSName
  
+ #ifndef BuildServer
  #define BuildServer             NO
+ #endif
diff -cr /afs/dementia.org/src/motif/andrew/config/sun.cf ./sun.cf
*** /afs/dementia.org/src/motif/andrew/config/sun.cf	Tue Dec 12 15:31:46 1995
--- ./sun.cf	Thu Apr 11 14:12:29 1996
***************
*** 1,30 ****
! XCOMM platform:  $XConsortium: sun.cf,v 1.139.1.1 95/06/19 18:22:21 gildea Exp $
  
  #ifdef SVR4Architecture
  #ifdef i386Architecture
  #ifndef OSName
! #define OSName            SunOS 5.1 x86
  #endif
  XCOMM operating system:  OSName
  #ifndef OSMajorVersion
  #define OSMajorVersion    5
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion    1
  #endif
  #ifndef	OSTeenyVersion
  #define OSTeenyVersion    0
  #endif
  #else
  #ifndef OSName
! #define OSName            SunOS 5.3
  #endif
  XCOMM operating system:  OSName
  #ifndef OSMajorVersion
  #define OSMajorVersion    5
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion    3
  #endif
  #ifndef	OSTeenyVersion
  #define OSTeenyVersion    0
--- 1,30 ----
! XCOMM platform:  $XConsortium: sun.cf /main/151 1996/02/02 18:59:56 gildea $
  
  #ifdef SVR4Architecture
  #ifdef i386Architecture
  #ifndef OSName
! #define OSName            SunOS 5.4 x86
  #endif
  XCOMM operating system:  OSName
  #ifndef OSMajorVersion
  #define OSMajorVersion    5
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion    4
  #endif
  #ifndef	OSTeenyVersion
  #define OSTeenyVersion    0
  #endif
  #else
  #ifndef OSName
! #define OSName            SunOS 5.4
  #endif
  XCOMM operating system:  OSName
  #ifndef OSMajorVersion
  #define OSMajorVersion    5
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion    4
  #endif
  #ifndef	OSTeenyVersion
  #define OSTeenyVersion    0
***************
*** 127,144 ****
  #endif
  #endif
  
- /*
-  * Gnu g++ 2.6.0 cannot build working C++ shared libraries under Solaris 2
-  */
- #if HasGcc2ForCplusplus && OSMajorVersion > 4
- #ifndef SharedLibFresco
- #define SharedLibFresco NO
- #endif
- #ifndef SharedLibXtf
- #define SharedLibXtf NO
- #endif
- #endif
- 
  #if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1)
  /* We do not guarantee this will work */
  #define BootstrapCFlags   -DNOSTDHDRS
--- 127,132 ----
***************
*** 156,171 ****
  #endif
  #endif
  
- #if OSMajorVersion > 4
- #ifndef MotifDefines
- #define MotifDefines -DSTRINGS_ALIGNED -DNO_ISDIR -DBOGUS_MB_MAX -DNO_CONST -DSYSV -DNO_ALLOCA
- #endif
- #else
- #ifndef MotifDefines
- #define MotifDefines -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR -DUSE_RE_COMP -DNO_REGCOMP -DNO_MEMMOVE -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST -DUSE_GETWD
- #endif
- #endif
- 
  #ifdef i386Architecture
  #if OSMajorVersion > 4
  #define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines
--- 144,149 ----
***************
*** 179,186 ****
  #define ServerOSDefines   -DDDXOSINIT
  #endif
  
  #if OSMajorVersion > 4
! #define BootstrapCFlags	  -DSVR4 -I/usr/local/include/X11
  #ifndef XawI18nDefines
  #define XawI18nDefines    -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
  #endif
--- 157,166 ----
  #define ServerOSDefines   -DDDXOSINIT
  #endif
  
+ #define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
+ 
  #if OSMajorVersion > 4
! #define BootstrapCFlags	  /* none needed */
  #ifndef XawI18nDefines
  #define XawI18nDefines    -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
  #endif
***************
*** 208,214 ****
  #endif
  #endif 		/* OSMinorVersion > 1 */
  #define HasVFork          NO
! #define InstKmemFlags	  -g sys -m 2755
  #define ShLibIncludeFile <sunLib.tmpl>
  /*
   * Set flags for position independent code before including sv4Lib.rules
--- 188,194 ----
  #endif
  #endif 		/* OSMinorVersion > 1 */
  #define HasVFork          NO
! #define InstKmemFlags	  -g sys -m 2711
  #define ShLibIncludeFile <sunLib.tmpl>
  /*
   * Set flags for position independent code before including sv4Lib.rules
***************
*** 220,229 ****
  #if HasSunCplusplus || HasCenterLineCplusplus
  #define PositionIndependentCplusplusFlags -pic
  #endif
! #else
! #define InstKmemFlags	  -g kmem -m 2755
  #include <sunLib.rules>
! #endif
  
  #define HasNdbm		  YES
  #define HasShm		  YES
--- 200,209 ----
  #if HasSunCplusplus || HasCenterLineCplusplus
  #define PositionIndependentCplusplusFlags -pic
  #endif
! #else /* not OSMajorVersion > 4 */
! #define InstKmemFlags	  -g kmem -m 2711
  #include <sunLib.rules>
! #endif /* OSMajorVersion > 4 (else) */
  
  #define HasNdbm		  YES
  #define HasShm		  YES
***************
*** 249,274 ****
  #endif
  
  #if HasGcc
! #if OSMajorVersion > 4 && defined(i386Architecture)
! #ifndef DefaultCCOptions
! #if OSMinorVersion == 1
! #define DefaultCCOptions -DNO_ASM
! #else
! #define DefaultCCOptions -ansi -DNO_ASM
! #endif
! #endif
! #endif
! #if HasGcc2
! #define OptimizedCDebugFlags -O2
! #else
! #define SharedLibraryCcCmd cc
! #define ExtraLoadFlags -B/usr/bin/
! #define AllocateLocalDefines /**/
  
  .c.o:
! 	$(CC) -c $(CFLAGS) $*.c
  
! #endif /* HasGcc2 (else) */
  #else /* not HasGcc */
  
  #define AllocateLocalDefines -DINCLUDE_ALLOCA_H
--- 229,258 ----
  #endif
  
  #if HasGcc
! # if OSMajorVersion > 4 && defined(i386Architecture)
! #  ifndef DefaultCCOptions
! #   if OSMinorVersion == 1
! #    define DefaultCCOptions -DNO_ASM
! #   else
! #    define DefaultCCOptions -ansi -DNO_ASM
! #   endif
! #  endif
! # endif
! # if HasGcc2
! #  ifdef i386Architecture
! #   define OptimizedCDebugFlags -m486 -O2 -fno-strength-reduce
! #  else
! #   define OptimizedCDebugFlags -O2
! #  endif
! # else
! #  define SharedLibraryCcCmd cc
! #  define ExtraLoadFlags -B/usr/bin/
! #  define AllocateLocalDefines /**/
  
  .c.o:
! 	ClearmakeOSName	$(CC) -c $(CFLAGS) $*.c
  
! # endif /* HasGcc2 (else) */
  #else /* not HasGcc */
  
  #define AllocateLocalDefines -DINCLUDE_ALLOCA_H
***************
*** 287,293 ****
  #endif
  #else	/* OSMajorVersion >= 5*/
  #ifndef DefaultCCOptions
! #define DefaultCCOptions -Xc /*-Xa*/
  #endif
  #endif	
  #endif	
--- 271,277 ----
  #endif
  #else	/* OSMajorVersion >= 5*/
  #ifndef DefaultCCOptions
! #define DefaultCCOptions -Xa
  #endif
  #endif	
  #endif	
***************
*** 318,325 ****
  #if OSMajorVersion < 5
  #define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
  #define LibraryCCOptions /* don't want special floating point */
! #endif
  
  #if OSMajorVersion > 4
  #include <svr4.cf>
  #endif
--- 302,315 ----
  #if OSMajorVersion < 5
  #define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
  #define LibraryCCOptions /* don't want special floating point */
! #endif /* OSMajorVersion < 5 */
  
  #if OSMajorVersion > 4
  #include <svr4.cf>
+ #endif
+ 
+ #ifndef ManKeywordsTarget
+ #define ManKeywordsTarget(manpath)					@@\
+ man_keywords::								@@\
+ 	catman -M $(DESTDIR)manpath -w
  #endif
Only in /afs/dementia.org/src/motif/andrew/config: sun.cf.orig
diff -cr /afs/dementia.org/src/motif/andrew/config/sunLib.tmpl ./sunLib.tmpl
*** /afs/dementia.org/src/motif/andrew/config/sunLib.tmpl	Wed Sep 27 14:49:57 1995
--- ./sunLib.tmpl	Thu Apr 11 14:12:08 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: sunLib.tmpl,v 1.38 95/07/06 14:06:11 kaleb Exp $
  
  /*
   * SunOS shared library template
--- 1,4 ----
! XCOMM $XConsortium: sunLib.tmpl /main/40 1995/12/18 17:47:03 gildea $
  
  /*
   * SunOS shared library template
***************
*** 11,17 ****
  #endif
  
  #ifndef SharedX11Rev
! #define SharedX11Rev 4.20
  #endif
  #ifndef SharedOldXRev
  #define SharedOldXRev 4.20
--- 11,17 ----
  #endif
  
  #ifndef SharedX11Rev
! #define SharedX11Rev 4.30
  #endif
  #ifndef SharedOldXRev
  #define SharedOldXRev 4.20
***************
*** 19,35 ****
  #ifndef SharedXtRev
  #define SharedXtRev 4.20
  #endif
  #ifndef SharedXmuRev
  #define SharedXmuRev 4.20
  #endif
  #ifndef SharedXextRev
! #define SharedXextRev 4.20
  #endif
  #ifndef SharedXiRev
  #define SharedXiRev 4.20
  #endif
  #ifndef SharedXtstRev
! #define SharedXtstRev 1.10
  #endif
  #ifndef SharedPexRev
  #define SharedPexRev 1.10
--- 19,38 ----
  #ifndef SharedXtRev
  #define SharedXtRev 4.20
  #endif
+ #ifndef SharedXawRev
+ #define SharedXawRev 6.10
+ #endif
  #ifndef SharedXmuRev
  #define SharedXmuRev 4.20
  #endif
  #ifndef SharedXextRev
! #define SharedXextRev 4.30
  #endif
  #ifndef SharedXiRev
  #define SharedXiRev 4.20
  #endif
  #ifndef SharedXtstRev
! #define SharedXtstRev 1.20
  #endif
  #ifndef SharedPexRev
  #define SharedPexRev 1.10
diff -cr /afs/dementia.org/src/motif/andrew/config/sv4Lib.rules ./sv4Lib.rules
*** /afs/dementia.org/src/motif/andrew/config/sv4Lib.rules	Sat Apr  9 12:00:41 1994
--- ./sv4Lib.rules	Thu Apr 11 14:11:55 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: sv4Lib.rules,v 1.14 94/04/09 12:00:10 rws Exp $
  
  /*
   * SVR4 shared library rules
--- 1,4 ----
! XCOMM $XConsortium: sv4Lib.rules /main/17 1995/12/01 18:31:40 kaleb $
  
  /*
   * SVR4 shared library rules
***************
*** 46,52 ****
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
! 	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
  
  #endif /* InstallSharedLibrary */
  
--- 46,52 ----
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
! 	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)
  
  #endif /* InstallSharedLibrary */
  
Only in /afs/dementia.org/src/motif/andrew/config: sv4Lib.rules.orig
diff -cr /afs/dementia.org/src/motif/andrew/config/svr4.cf ./svr4.cf
*** /afs/dementia.org/src/motif/andrew/config/svr4.cf	Wed Sep 27 14:49:58 1995
--- ./svr4.cf	Thu Apr 11 14:12:30 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: svr4.cf,v 1.14 95/06/30 18:21:43 kaleb Exp $
  /*
   * A default OS name
   */
--- 1,4 ----
! XCOMM $XConsortium: svr4.cf /main/15 1995/10/03 17:31:30 kaleb $
  /*
   * A default OS name
   */
***************
*** 103,109 ****
--- 103,113 ----
  #endif
  #ifndef DefaultCDebugFlags
  #if HasGcc2
+ #ifdef i386Architecture
+ #define DefaultCDebugFlags -m486 -O2 -fno-strength-reduce
+ #else
  #define DefaultCDebugFlags -O2
+ #endif
  #else
  #define DefaultCDebugFlags -O
  #endif
diff -cr /afs/dementia.org/src/motif/andrew/config/ultrix.cf ./ultrix.cf
*** /afs/dementia.org/src/motif/andrew/config/ultrix.cf	Thu Oct 26 10:54:24 1995
--- ./ultrix.cf	Thu Apr 11 14:12:32 1996
***************
*** 1,12 ****
! XCOMM platform:  $XConsortium: ultrix.cf,v 1.64 94/04/09 20:44:15 rws Exp $
  
! #define OSName            Ultrix-32 4.3
  XCOMM operating system:  OSName
  #define OSMajorVersion    4
! #define OSMinorVersion    3
! 
! #ifndef MotifDefines
! #define MotifDefines -DSTRINGS_ALIGNED -DNO_REGEX -DNO_REGCOMP -DNO_CONST
  #endif
  
  #define HasNdbm YES
--- 1,14 ----
! XCOMM platform:  $XConsortium: ultrix.cf /main/67 1995/12/15 22:49:02 gildea $
  
! #ifndef OSName
! #define OSName            Ultrix-32 4.4
! #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion    4
! #endif
! #ifndef OSMinorVersion
! #define OSMinorVersion    4
  #endif
  
  #define HasNdbm YES
***************
*** 21,28 ****
  
  #if ThreadedX
  /* if you want to experiment, turn this on, but no guarantees */
! #define HasPosixThreads YES
! #define ExtraLibraries -lpthreads -li
  #endif
  
  #ifdef VaxArchitecture
--- 23,32 ----
  
  #if ThreadedX
  /* if you want to experiment, turn this on, but no guarantees */
! #define HasThreadSafeAPI	NO
! #define HasPosixThreads		YES
! #define ThreadPreStdAPIDefines	-DXPRE_STANDARD_API
! #define ExtraLibraries		-lpthreads -li
  #endif
  
  #ifdef VaxArchitecture
Only in /afs/dementia.org/src/motif/andrew/config: ultrix.cf.4.2
diff -cr /afs/dementia.org/src/motif/andrew/config/usl.cf ./usl.cf
*** /afs/dementia.org/src/motif/andrew/config/usl.cf	Wed Sep 27 14:49:58 1995
--- ./usl.cf	Thu Apr 11 14:12:33 1996
***************
*** 1,12 ****
! XCOMM platform:  $XConsortium: usl.cf,v 1.37 95/06/30 18:11:39 kaleb Exp $
  
! #define OSName			UNIX System V/386 Release 4.2 Version 1.1.1
  XCOMM operating system:  OSName
  #define OSMajorVersion		4
  #define OSMinorVersion		2
! #define OSTeenyVersion		1
! 
! #define BootstrapCFlags		-DUSL
  #define StandardDefines		-DUSL -DSVR4 -Di386
  #define NeedWidePrototypes	NO	/* experimental */
  #define ServerExtraDefines	-D__USLC__ XFree86ServerDefines
--- 1,22 ----
! XCOMM platform:  $XConsortium: usl.cf /main/42 1996/01/22 17:37:55 gildea $
  
! #ifndef OSName
! #define OSName			UNIX System V/386 Release 4.2 Version 2.0
! #endif
  XCOMM operating system:  OSName
+ #ifndef OSMajorVersion
  #define OSMajorVersion		4
+ #endif
+ #ifndef OSMinorVersion
  #define OSMinorVersion		2
! #endif
! #ifndef OSTeenyVersion
! #define OSTeenyVersion		2
! #endif
! #ifndef CcCmd
! #define CcCmd			/usr/ccs/bin/cc
! #endif
! #define BootstrapCFlags		/* none needed */
  #define StandardDefines		-DUSL -DSVR4 -Di386
  #define NeedWidePrototypes	NO	/* experimental */
  #define ServerExtraDefines	-D__USLC__ XFree86ServerDefines
***************
*** 16,21 ****
--- 26,32 ----
  #if OSTeenyVersion > 1
  #define ExtraLibraries		-lsocket -lnsl -lgen
  #define ThreadedX		YES
+ #define HasThreadSafeAPI	NO
  #define SystemMTDefines		-D_REENTRANT
  #define ThreadsLibraries	-lthread
  #endif
diff -cr /afs/dementia.org/src/motif/andrew/config/x386.cf ./x386.cf
*** /afs/dementia.org/src/motif/andrew/config/x386.cf	Wed Sep 27 14:49:59 1995
--- ./x386.cf	Thu Apr 11 14:12:34 1996
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: x386.cf,v 1.12 95/06/09 21:28:51 gildea Exp $
  
  /*****************************************************************************
   *			  Site-specfic parameters                            *
--- 1,4 ----
! XCOMM platform:  $XConsortium: x386.cf /main/14 1995/10/26 20:50:16 gildea $
  
  /*****************************************************************************
   *			  Site-specfic parameters                            *
***************
*** 99,115 ****
  #define InstallManPageLong(file,destdir,dest)                           @@\
  install.man:: file.man                                                  @@\
  	$(RM) destdir/dest.$(MANSUFFIX)					@@\
! 	cat file.man | neqn | nroff -man >/tmp/file.man  		@@\
  	$(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man destdir/dest.$(MANSUFFIX) @@\
  	$(RM) /tmp/file.man
  
  #define InstallMultipleMan(list,dest)                                   @@\
  install.man:: list                                                      @@\
! 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in list; do \                                             @@\
  		(set -x; \						@@\
  		$(RM) dest/$$i; \					@@\
! 		cat $$i | neqn | nroff -man >/tmp/$$i; \  		@@\
  		$(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i dest/$$i; \	@@\
  		$(RM) /tmp/$$i); \					@@\
  	done
--- 99,115 ----
  #define InstallManPageLong(file,destdir,dest)                           @@\
  install.man:: file.man                                                  @@\
  	$(RM) destdir/dest.$(MANSUFFIX)					@@\
! 	cat file.man | $(NEQN) | $(NROFF) $(MANMACROS) >/tmp/file.man	@@\
  	$(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man destdir/dest.$(MANSUFFIX) @@\
  	$(RM) /tmp/file.man
  
  #define InstallMultipleMan(list,dest)                                   @@\
  install.man:: list                                                      @@\
! 	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	for i in list; do \                                             @@\
  		(set -x; \						@@\
  		$(RM) dest/$$i; \					@@\
! 		cat $$i | $(NEQN) | $(NROFF) $(MANMACROS) >/tmp/$$i; \	@@\
  		$(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i dest/$$i; \	@@\
  		$(RM) /tmp/$$i); \					@@\
  	done
diff -cr /afs/dementia.org/src/motif/andrew/config/xfree86.cf ./xfree86.cf
*** /afs/dementia.org/src/motif/andrew/config/xfree86.cf	Mon Jan 30 18:41:26 1995
--- ./xfree86.cf	Thu Apr 11 14:12:34 1996
***************
*** 1,4 ****
! XCOMM $XConsortium: xfree86.cf,v 1.9 95/01/25 16:42:40 kaleb Exp $
  /*
   * This configuration file contains all of the configuration
   * information for the XFree86 based X Servers.
--- 1,4 ----
! XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.76 1996/01/03 02:12:02 dawes Exp $
  /*
   * This configuration file contains all of the configuration
   * information for the XFree86 based X Servers.
***************
*** 6,11 ****
--- 6,12 ----
   * Most of these settings can be overridden in a vendor.cf or the
   * BeforeVendor part of the site.def file.
   */
+ XCOMM $XConsortium: xfree86.cf /main/17 1996/01/03 14:50:55 kaleb $
  
  /*
   * Default settings for which X Servers to build.
***************
*** 60,65 ****
--- 61,70 ----
  # define XF86W32Server		NO
  #endif
  
+ #ifndef XF86I128Server
+ # define XF86I128Server		NO
+ #endif
+ 
  #if XF86S3Server
  # define XF86S3Dir		s3
  #else
***************
*** 108,139 ****
  # define XF86W32Dir		/**/
  #endif
  
  #undef XF86AccelServerDirs
! #define XF86AccelServerDirs   XF86S3Dir XF86I8514Dir XF86Mach8Dir XF86Mach32Dir XF86Mach64Dir XF86P9000Dir XF86AGXDir XF86W32Dir
  
  #undef XF86AccelServer
! #if XF86S3Server || XF86I8514Server || XF86Mach8Server || XF86Mach32Server || XF86Mach64Server || XF86P9000Server || XF86AGXServer || XF86W32Server
  # define XF86AccelServer	YES
  #else
  # define XF86AccelServer	NO
  #endif
  
  /*
   * Driver list for several of the X Servers.
   */
  #ifndef XF86SvgaDrivers
  # define XF86SvgaDrivers	et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
  				ncr77c22 compaq oak mx al2101 ali cl64xx \
! 				video7 chips generic
  #endif
  
  #ifndef XF86Vga16Drivers
! # define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl64xx generic
  #endif
  
  #ifndef XF86Vga2Drivers
  # define XF86Vga2Drivers	et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
! 				ncr77c22 compaq oak cl64xx generic
  #endif
  
  #ifndef XF86Vga2Banked
--- 113,223 ----
  # define XF86W32Dir		/**/
  #endif
  
+ #if XF86I128Server
+ # define XF86I128Dir		i128
+ #else
+ # define XF86I128Dir		/**/
+ #endif
+ 
+ #ifndef XF98GANBWAPServer
+ # define XF98GANBWAPServer	NO	
+ #endif
+ 
+ #ifndef XF98NEC480Server
+ # define XF98NEC480Server	NO
+ #endif
+ 
+ #ifndef XF98NKVNECServer
+ # define XF98NKVNECServer	NO
+ #endif
+ 
+ #ifndef XF98WABSServer
+ # define XF98WABSServer		NO	
+ #endif
+ 
+ #ifndef XF98SVGAServer
+ # define XF98SVGAServer		NO	
+ #endif
+ 
+ #ifndef XF98EGCServer
+ # define XF98EGCServer		NO
+ #endif
+ 
+ #ifndef XF98NECS3Server
+ # define XF98NECS3Server	NO	
+ #endif
+ 
+ #ifndef XF98PWSKBServer
+ # define XF98PWSKBServer	NO
+ #endif
+ 
+ #ifndef XF98PWLBServer
+ #define XF98PWLBServer		NO
+ #endif
+ 
+ #if XF98NECS3Server
+ # define XF98NECS3Dir		s3nec
+ #else
+ # define XF98NECS3Dir		/**/
+ #endif
+ 
+ #if XF98PWSKBServer
+ # define XF98PWSKBDir		s3pwskb
+ #else
+ # define XF98PWSKBDir		/**/
+ #endif
+ 
+ #if XF98PWLBServer
+ # define XF98PWLBDir		s3pwlb
+ #else
+ # define XF98PWLBDir		/**/
+ #endif
+ 
  #undef XF86AccelServerDirs
! #define XF86AccelServerDirs   XF86S3Dir XF86I8514Dir XF86Mach8Dir XF86Mach32Dir XF86Mach64Dir XF86P9000Dir XF86AGXDir XF86W32Dir XF86I128Dir
  
  #undef XF86AccelServer
! #if XF86S3Server || XF86I8514Server || XF86Mach8Server || XF86Mach32Server || XF86Mach64Server || XF86P9000Server || XF86AGXServer || XF86W32Server || XF86I128Server
  # define XF86AccelServer	YES
  #else
  # define XF86AccelServer	NO
  #endif
  
+ #undef XF98AccelServerDirs
+ #define XF98AccelServerDirs   XF98NECS3Dir XF98PWSKBDir XF98PWLBDir
+ 
+ #undef XF98AccelServer
+ #if XF98NECS3Server || XF98PWSKBServer || XF98PWLBServer
+ # define XF98AccelServer	YES
+ #else
+ # define XF98AccelServer	NO
+ #endif
+ 
  /*
   * Driver list for several of the X Servers.
   */
  #ifndef XF86SvgaDrivers
  # define XF86SvgaDrivers	et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
  				ncr77c22 compaq oak mx al2101 ali cl64xx \
! 				video7 chips ark realtek generic
! #endif
! 
! #ifndef XF98SvgaDrivers
! # define XF98SvgaDrivers	generic
  #endif
  
  #ifndef XF86Vga16Drivers
! # define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl64xx \
! 				sis generic
! #endif
! 
! #ifndef XF98Vga16Drivers
! # define XF98Vga16Drivers	generic
  #endif
  
  #ifndef XF86Vga2Drivers
  # define XF86Vga2Drivers	et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
! 				ncr77c22 compaq oak cl64xx sis generic
  #endif
  
  #ifndef XF86Vga2Banked
***************
*** 161,188 ****
  #define BuildXIE		XF86AccelServer || XF86SVGAServer
  #endif
  
  /*
   * By default, build all of the fonts.
   */
  #ifndef Build75Dpi
! #define Build75Dpi	YES
  #endif
  #ifndef Build100Dpi
! #define Build100Dpi	YES
  #endif
  #ifndef BuildSpeedo
! #define BuildSpeedo	YES
  #endif
  #ifndef BuildType1
! #define BuildType1	YES
  #endif
  
! #ifndef CompressAllFonts
! #define CompressAllFonts	YES
  #endif
  
! #ifndef InstallXcmsTxt
! #define InstallXcmsTxt		YES
  #endif
  
  #ifndef HasLinuxDoc
--- 245,284 ----
  #define BuildXIE		XF86AccelServer || XF86SVGAServer
  #endif
  
+ #ifndef XF98S3Drivers
+ # define XF98S3Drivers		mmio_928 s3_generic
+ #endif
+ 
  /*
   * By default, build all of the fonts.
   */
  #ifndef Build75Dpi
! #define Build75Dpi		YES
  #endif
  #ifndef Build100Dpi
! #define Build100Dpi		YES
  #endif
  #ifndef BuildSpeedo
! #define BuildSpeedo		YES
  #endif
  #ifndef BuildType1
! #define BuildType1		YES
  #endif
  
! #ifndef BuildScanpci
! #if SystemV || SystemV4 || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(LynxOSArchitecture)
! #define BuildScanpci		YES
! #else
! #define BuildScanpci		NO
! #endif
! #endif
! 
! #ifndef BuildXF86DGA
! #define BuildXF86DGA		NO
  #endif
  
! #ifndef CompressAllFonts
! #define CompressAllFonts	YES
  #endif
  
  #ifndef HasLinuxDoc
***************
*** 193,201 ****
  #define InstallJapaneseDocs	NO
  #endif
  
  /* Server defines required for all OSs */
  #ifndef XFree86ServerDefines
! #define XFree86ServerDefines	-DSTATIC_COLOR -DAVOID_GLYPHBLT -DPIXPRIV LinkKitDefines
  #endif
  
  #ifndef XFree86ServerOSDefines
--- 289,303 ----
  #define InstallJapaneseDocs	NO
  #endif
  
+ #if BuildXF86DGA
+ #define XFree86DGADefines	-DXFreeXDGA
+ #else
+ #define XFree86DGADefines	/**/
+ #endif
+ 
  /* Server defines required for all OSs */
  #ifndef XFree86ServerDefines
! #define XFree86ServerDefines	-DSTATIC_COLOR -DAVOID_GLYPHBLT -DPIXPRIV LinkKitDefines XFree86DGADefines
  #endif
  
  #ifndef XFree86ServerOSDefines
***************
*** 218,223 ****
--- 320,365 ----
  #define XF86LinkKit	NO
  #endif
  
+ #if XF86LinkKit
+ /*
+  * Definitions for LinkKit self-containment.  This should work whether or not
+  * UseInstalled is defined.
+  */
+ # ifndef HasLdRunPath
+ #  define HasLdRunPath        NO
+ # endif
+ 
+ # ifndef TopIncludes
+ #  ifdef IncRoot
+ #   define TopIncludes        -I$(INCROOT)
+ #  else
+ #   define TopIncludes        /**/
+ #  endif
+ # endif
+ # ifndef ClientLibDir
+ #  if defined(UsrLibDir) || HasLdRunPath
+ #   define ClientLibDir       /**/
+ #  else
+ #   define ClientLibDir       -L$(USRLIBDIR)
+ #  endif
+ # endif
+ # ifndef LdPreLib
+ #  if defined(LdPostLib) && defined(UsrLibDir) && !HasLdRunPath
+ #   define LdPreLib   -L$(USRLIBDIR)
+ #  else
+ #   define LdPreLib   /**/
+ #  endif
+ # endif
+ # ifndef LdPostLib
+ #  if defined(UsrLibDir) && !HasLdRunPath
+ #   define LdPostLib  -L$(USRLIBDIR)
+ #  else
+ #   define LdPostLib  /**/
+ #  endif
+ # endif
+ 
+ #endif
+ 
  #ifndef LinkKitDefines
  #if XF86LinkKit
  #define LinkKitDefines	-DLINKKIT
***************
*** 258,267 ****
   MONODRIVERSRC = $(XF86SRC)/drivers/mono
     S3DRIVERSRC = $(XF86SRC)/drivers/s3
  
  #ifdef SiteIConfigFiles
  #undef SiteIConfigFiles
  #endif
! #define SiteIConfigFiles $(TOP)/site.def $(TOP)/Imakefile
  #else
         XF86SRC = $(SERVERSRC)/hw/xfree86
    XF86ACCELSRC = $(XF86SRC)/accel
--- 400,422 ----
   MONODRIVERSRC = $(XF86SRC)/drivers/mono
     S3DRIVERSRC = $(XF86SRC)/drivers/s3
  
+            XF98SRC = $(TOP)
+       XF98ACCELSRC = $(XF98SRC)/lib
+         XF98COMSRC = $(XF98SRC)/lib
+      XF98CONFIGSRC = $(XF98SRC)
+          XF98HWSRC = $(XF98SRC)/lib
+          XF98OSSRC = $(XF98SRC)/lib
+      XF98DRIVERSRC = $(XF98SRC)/drivers
+   XF98VGADRIVERSRC = $(XF98SRC)/drivers/vga256
+ XF98VGA16DRIVERSRC = $(XF98SRC)/drivers/vga16
+  XF98VGA2DRIVERSRC = $(XF98SRC)/drivers/vga2
+  XF98MONODRIVERSRC = $(XF98SRC)/drivers/mono
+   XF98NECDRIVERSRC = $(XF98SRC)/drivers/s3
+ 
  #ifdef SiteIConfigFiles
  #undef SiteIConfigFiles
  #endif
! #define SiteIConfigFiles $(TOP)/xf86site.def $(TOP)/Imakefile $(IRULESSRC)/host.def
  #else
         XF86SRC = $(SERVERSRC)/hw/xfree86
    XF86ACCELSRC = $(XF86SRC)/accel
***************
*** 274,294 ****
   VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers
   MONODRIVERSRC = $(XF86SRC)/mono/drivers
     S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
  #endif
  
  /*
!  * These libraries are needed by all X Servers
   */
  
- XF86INIT   = $(XF86COMSRC)/xf86Init.o
- XF86MINIT  = $(XF86COMSRC)/xf86Init_m.o
- XF86CONFIG = $(XF86CONFIGSRC)/xf86_Option.o
- XF86COMLIB = $(XF86COMSRC)/libxf86.a
- XF86OSLIB  = $(XF86OSSRC)/libxf86_os.a
- XF86HWLIB  = $(XF86HWSRC)/libxf86_hw.a
- XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
- XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
- 
          XFREE86DOCDIR = $(LIBDIR)/doc
        XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
      XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
--- 429,457 ----
   VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers
   MONODRIVERSRC = $(XF86SRC)/mono/drivers
     S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
+ 
+            XF98SRC = $(SERVERSRC)/hw/xfree98
+       XF98ACCELSRC = $(XF98SRC)/accel
+         XF98COMSRC = $(XF98SRC)/common
+      XF98CONFIGSRC = $(XF98COMSRC)
+          XF98HWSRC = $(XF98SRC)/common_hw/generic
+       XF98HWNECSRC = $(XF98SRC)/common_hw/nec
+     XF98HWPWSKBSRC = $(XF98SRC)/common_hw/pwskb
+      XF98HWPWLBSRC = $(XF98SRC)/common_hw/pwlb
+          XF98OSSRC = $(XF98SRC)/os-support
+   XF98VGADRIVERSRC = $(XF98SRC)/vga256/drivers
+ XF98VGA16DRIVERSRC = $(XF98SRC)/vga16/drivers
+  XF98VGA2DRIVERSRC = $(XF98SRC)/vga2/drivers
+  XF98MONODRIVERSRC = $(XF98SRC)/mono/drivers
+   XF98NECDRIVERSRC = $(XF98SRC)/accel/s3nec/drivers
+ XF98PWSKBDRIVERSRC = $(XF98SRC)/accel/s3pwskb/drivers
+  XF98PWLBDRIVERSRC = $(XF98SRC)/accel/s3pwlb/drivers
  #endif
  
  /*
!  * Installed location of the XFree86 documentation
   */
  
          XFREE86DOCDIR = $(LIBDIR)/doc
        XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
      XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
***************
*** 303,309 ****
  #endif
  
  #ifndef XFree86Version
! #define XFree86Version	3110
  #endif
  
  #ifndef XVendorString
--- 466,472 ----
  #endif
  
  #ifndef XFree86Version
! #define XFree86Version	3123
  #endif
  
  #ifndef XVendorString
***************
*** 334,343 ****
  
  #if HasGcc
  #ifndef DefaultCCOptions
! #if defined(SunArchitecture) && defined(i386Architecture)
! #define DefaultCCOptions -DNO_ASM
  #else
! #define DefaultCCOptions -ansi  -DNO_ASM
  #endif
  #endif
  #endif
--- 497,506 ----
  
  #if HasGcc
  #ifndef DefaultCCOptions
! #ifdef UseInstalled
! #define DefaultCCOptions -ansi
  #else
! #define DefaultCCOptions -ansi -pedantic
  #endif
  #endif
  #endif
***************
*** 355,359 ****
--- 518,524 ----
  #define LbxDefines -DLBX_COMPAT
  #endif
  #endif
+ 
+ #define VidTuneExtensionDefines -DXF86VIDMODE
  
  #include <xf86.rules>
