[gnu.emacs] patches for 18.54.4 on SVr3.2u with X

eric@snark.uu.net (Eric S. Raymond) (08/18/89)

The following s- file and patches enable 18.54.4 to be compiled for use
with X11 on AT&T SVr3.2u, on the 6386WGS-E. However, temacs is dying
with error code 138 when it attempts to build xemacs. I've tried increasing
PURESIZE by 4K but that doesn't seem to do it. Any other suggestions?

First, the s- file. Note that some things in here are dependent on
HAVE_X_WINDOWS; on SV machines use of the X libraries brings with it
some BSD calls. See the change to config.h below.
----------------------------------------------------------------------------
/* Definitions file for GNU Emacs running on AT&T's System V Release 3.2
   Copyright (C) 1987 Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.  No author or distributor
accepts responsibility to anyone for the consequences of using it
or for whether it serves any particular purpose or works at all,
unless he says so in writing.  Refer to the GNU Emacs General Public
License for full details.

Everyone is granted permission to copy, modify and redistribute
GNU Emacs, but only under the conditions described in the
GNU Emacs General Public License.   A copy of this license is
supposed to have been given to you along with GNU Emacs so you
can know your rights and responsibilities.  It should be in a
file named COPYING.  Among other things, the copyright notice
and this notice must be preserved on all copies.  */


/*
 *	Define symbols to identify the version of Unix this is.
 *	Define all the symbols that apply correctly.
 */

#define USG				/* System III, System V, etc */

#define USG5

/* SYSTEM_TYPE should indicate the kind of system you are using.
 It sets the Lisp variable system-type.  */

#define SYSTEM_TYPE "usg-unix-v"

/* nomultiplejobs should be defined if your system's shell
 does not have "job control" (the ability to stop a program,
 run some other program, then continue the first one).  */

#define NOMULTIPLEJOBS

/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */

/* #define INTERRUPT_INPUT */

/* Letter to use in finding device name of first pty,
  if system supports pty's.  'p' means it is /dev/ptyp0  */

#define FIRST_PTY_LETTER 'p'

/*
 *	Define HAVE_TERMIO if the system provides sysV-style ioctls
 *	for terminal control.
 */

#define HAVE_TERMIO

/*
 *	Define HAVE_TIMEVAL if the system supports the BSD style clock values.
 *	Look in <sys/time.h> for a timeval structure.
 */

#ifdef HAVE_X_WINDOWS
#define HAVE_TIMEVAL
#endif

/*
 * Even if we're linking X libraries, there is no utimes()
 */
#define USE_UTIME
 
/*
 *	Define HAVE_SELECT if the system supports the `select' system call.
 */

#ifdef HAVE_X_WINDOWS
#define HAVE_SELECT
#endif

/*
 *	Define HAVE_PTYS if the system supports pty devices.
 *	SVr3.2 has something that *may* be ptys; now if I can find
 *	some documentation...
 * #define HAVE_PTYS
 * #define SYSV_PTYS
 * #define PTY_NAME_SPRINTF	sprintf (ptyname, "/dev/pts%03d", i);
 */

/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */

/* #define HAVE_SOCKETS */

/*
 *	Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
 *      The 4.2 opendir, etc., library functions.
 */

/* #define NONSYSTEM_DIR_LIBRARY */

/*
 * 	Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
 *	library functions.  Almost, but not quite the same as
 *	the 4.2 functions
 */
#define SYSV_SYSTEM_DIR

/* Define this symbol if your system has the functions bcopy, etc. */

#ifdef HAVE_X_WINDOWS
#define BSTRING
#endif

/* subprocesses should be defined if you want to
 have code for asynchronous subprocesses
 (as used in M-x compile and M-x shell).
 This is supposed to work now on system V release 2.  */

#define subprocesses

/* If your system uses COFF (Common Object File Format) then define the
   preprocessor symbol "COFF". */

#define COFF

/* define MAIL_USE_FLOCK if the mailer uses flock
   to interlock access to /usr/spool/mail/$USER.
   The alternative is that a lock file named
   /usr/spool/mail/$USER.lock.  */

/* #define MAIL_USE_FLOCK */

/* Define CLASH_DETECTION if you want lock files to be written
   so that Emacs can tell instantly when you try to modify
   a file that someone else has modified in his Emacs.  */

/* #define CLASH_DETECTION */

/* Define SHORTNAMES if the C compiler can distinguish only
   short names.  It means that the stuff in ../shortnames
   must be run to convert the long names to short ones.  */

/* #define SHORTNAMES */

/* We use the Berkeley (and usg5.2.2) interface to nlist.  */

#define NLIST_STRUCT

/* The file containing the kernel's symbol table is called /unix.  */

#define KERNEL_FILE "/unix"

/* The symbol in the kernel where the load average is found
   is named avenrun.  */

#define LDAV_SYMBOL "avenrun"

/* Special hacks needed to make Emacs run on this system.  */

/*
 *	Make the sigsetmask function go away.  Don't know what the
 *	ramifications of this are, but doesn't seem possible to
 *	emulate it properly anyway at this point.
 */

#define sigsetmask(mask)	/* Null expansion */

/* setjmp and longjmp can safely replace _setjmp and _longjmp,
   but they will run slower.  */

#define _setjmp setjmp
#define _longjmp longjmp

/* On USG systems the system calls are interruptable by signals
 that the user program has elected to catch.  Thus the system call
 must be retried in these cases.  To handle this without massive
 changes in the source code, we remap the standard system call names
 to names for our own functions in sysdep.c that do the system call
 with retries. */

#define read sys_read
#define write sys_write
#define open sys_open
#define close sys_close

#define INTERRUPTABLE_OPEN
#define INTERRUPTABLE_CLOSE
#define INTERRUPTABLE_IO

/* On USG systems these have different names */

#define index strchr
#define rindex strrchr

/* USG systems tend to put everything declared static
   into the initialized data area, which becomes pure after dumping Emacs.
   Foil this.  Emacs carefully avoids static vars inside functions.  */

#define static

/* Compiler bug bites on many systems when default ADDR_CORRECT is used.  */

#define ADDR_CORRECT(x) (x)

/* Prevent -lg from being used for debugging.  Not implemented?  */

#define LIBS_DEBUG

/* Use terminfo instead of termcap.  */

#define TERMINFO

/* X needs to talk on the network, so search the network library.  */

#define LIBX10_SYSTEM	-lnls
#define LIBX11_SYSTEM	-lX11_s -lnls -lnsl_s -lpt -lc_s
-----------------------------CUT HERE---------------------------------------

Patches begin here:

This first change modifies config.h slightly to put HAVE_X_WINDOWS
*before* the s- file include, very useful for SV configuration.

cdiff config.h-orig config.h
*** config.h-orig	Fri Aug 18 00:05:09 1989
--- config.h	Fri Aug 18 00:07:42 1989
***************
*** 20,25 ****
--- 20,33 ----
  
  
  
+ /*
+  * Define HAVE_X_WINDOWS if you want to use the X window system.
+  * We do this because in System V.3 variants some BSDish things in the
+  * s- files need to be conditional on HAVE_X_WINDOWS
+  */
+ 
+ #define HAVE_X_WINDOWS
+ 
  /* Include here a s- file that describes the system type you are using.
     See the file ../etc/MACHINES for a list of systems and
     the names of the s- files to use for them.
***************
*** 43,52 ****
  #include "../shortnames/remap.h"
  #endif /* not NO_SHORTNAMES */
  #endif /* SHORTNAMES */
- 
- /* Define HAVE_X_WINDOWS if you want to use the X window system.  */
- 
- #define HAVE_X_WINDOWS
  
  /* Define X11 if you want to use version 11 of X windows.
     Otherwise, Emacs expects to use version 10.  */
--- 51,56 ----

If a SV has X, the timeval structure will be in <sys/time.h>. I think the
#if arm should go away entirely, as nothing in process.c uses struct tm.

*** process.c-orig	Thu Aug 17 22:11:56 1989
--- process.c	Fri Aug 18 00:38:59 1989
***************
*** 56,62 ****
  
  #else /* not IRIS, not UNIPLUS */
  #ifdef HAVE_TIMEVAL
! #if defined(USG) && !defined(IBMRTAIX)
  #include <time.h>
  #else /* IBMRTAIX or not USG */
  #include <sys/time.h>
--- 56,62 ----
  
  #else /* not IRIS, not UNIPLUS */
  #ifdef HAVE_TIMEVAL
! #if defined(USG) && !defined(IBMRTAIX) && !defined(HAVE_X_WINDOWS)
  #include <time.h>
  #else /* IBMRTAIX or not USG */
  #include <sys/time.h>


See above.

*** x11term.c-orig	Thu Aug 17 20:37:45 1989
--- x11term.c	Thu Aug 17 20:40:22 1989
***************
*** 70,81 ****
  
  #include "x11term.h"
  
- #ifdef USG
- #include <time.h>
- #else
  #include <sys/time.h>
- #endif
- 
  #include <fcntl.h>
  #include <stdio.h>
  #include <ctype.h>
--- 70,76 ----

Thisd change is due to the fact that 3.2 doesn't have a libX11.a; instead,
there is a shared library libX11_s. Perhaps we need a new BASE_X_LIBRARY
config symbol?

*** ymakefile-orig	Wed Aug 16 17:46:40 1989
--- ymakefile	Thu Aug 17 19:58:53 1989
***************
*** 36,41 ****
--- 36,42 ----
  
  #ifdef X11
  #define HAVE_X11
+ MYCPPFLAG = -I/usr/X/include
  #undef X11
  #endif
  
***************
*** 177,183 ****
  LIBX = -lXMenu -loldX -lX11 LIBX11_MACHINE LIBX11_SYSTEM
  #else
  XOBJ = x11term.o x11fns.o
! LIBX = -lX11 LIBX11_MACHINE LIBX11_SYSTEM
  #endif
  #else /* not HAVE_X11 */
  #ifdef HAVE_X_MENU
--- 178,184 ----
  LIBX = -lXMenu -loldX -lX11 LIBX11_MACHINE LIBX11_SYSTEM
  #else
  XOBJ = x11term.o x11fns.o
! LIBX = LIBX11_MACHINE LIBX11_SYSTEM
  #endif
  #else /* not HAVE_X11 */
  #ifdef HAVE_X_MENU
-- 
      Eric S. Raymond = eric@snark.uu.net    (mad mastermind of TMN-Netnews)