Commit 5447018c authored by Jim Blandy's avatar Jim Blandy

* s/usg5-4.h: Changes from Eric Raymond:

	If we're doing ordinary linking, define LIB_STANDARD appropriately.
	Give LIBS_DEBUG a null definition; usg5-4 has no -lg.
	#define LIBS_STANDARD as "-lc"; usg5-4 has no -lPW.
	#define NSIG, if it's not already defined.
	#define HAVE_TERMIOS instead of HAVE_TCATTR.
	Provide our own definition of LIB_X11_LIB.
parent aee87fc4
...@@ -18,7 +18,8 @@ along with GNU Emacs; see the file COPYING. If not, write to ...@@ -18,7 +18,8 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* This file written by James Van Artsdalen of Dell Computer Corporation. /* This file written by James Van Artsdalen of Dell Computer Corporation.
* james@bigtex.cactus.org. * james@bigtex.cactus.org. Subsequently improved for Dell 2.2 by Eric
* S. Raymond <esr@snark.thyrsus.com>.
*/ */
/* Use the SysVr3 file for at least base configuration. */ /* Use the SysVr3 file for at least base configuration. */
...@@ -34,11 +35,18 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -34,11 +35,18 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define LIBS_SYSTEM -lsocket -lnsl -lelf #define LIBS_SYSTEM -lsocket -lnsl -lelf
#define ORDINARY_LINK #define ORDINARY_LINK
#if 0 /* These should be unnecessary now because of ORDINARY_LINK. */ #ifdef ORDINARY_LINK
#define LIB_STANDARD -lc /usr/ucblib/libucb.a
#else
#define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o #define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o
#define LIB_STANDARD -lc /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o #define LIB_STANDARD -lc /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o
#endif #endif
/* there are no -lg libraries on this system, and no libPW */
#define LIBS_DEBUG
#define LIBS_STANDARD -lc
/* No <sioctl.h> */ /* No <sioctl.h> */
#define NO_SIOCTL_H #define NO_SIOCTL_H
...@@ -66,6 +74,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -66,6 +74,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#undef SIGIO #undef SIGIO
#endif #endif
/* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
* instead, there's a system variable _sys_nsig. Unfortunately, we need the
* constant to dimension an array. So wire in the appropriate value here.
*/
#ifndef NSIG
#define NSIG 32
#endif
/* libc has this stuff, but not utimes. */ /* libc has this stuff, but not utimes. */
#define HAVE_RENAME #define HAVE_RENAME
...@@ -93,7 +110,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -93,7 +110,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define HAVE_PTYS #define HAVE_PTYS
#define HAVE_SETSID #define HAVE_SETSID
#define HAVE_TCATTR #define HAVE_TERMIOS
/* It is possible to receive SIGCHLD when there are no children /* It is possible to receive SIGCHLD when there are no children
waiting, because a previous waitsys(2) cleaned up the carcass of child waiting, because a previous waitsys(2) cleaned up the carcass of child
...@@ -153,6 +170,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -153,6 +170,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
fatal ("ioctl I_PUSH ttcompat", errno); fatal ("ioctl I_PUSH ttcompat", errno);
/* Undo the SVr3 X11 library definition */
#undef LIB_X11_LIB -lX11
/* The definition of this in s-usg5-3.h is not needed in 5.4. */ /* The definition of this in s-usg5-3.h is not needed in 5.4. */
/* liblnsl_s should never be used. The _s suffix implies a shared /* liblnsl_s should never be used. The _s suffix implies a shared
library, as opposed to a DLL. Share libraries were used in SVR3, and are library, as opposed to a DLL. Share libraries were used in SVR3, and are
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment