Add arch taglines

[bpt/emacs.git] / src / s / isc2-2.h

diff --git a/src/s/isc2-2.h b/src/s/isc2-2.h
index a9f3304..88f216b 100644 (file)
--- a/src/s/isc2-2.h
+++ b/src/s/isc2-2.h
@@ -3,16 +3,20 @@
 
 #include "usg5-3.h"
 
-/* With this defined, subprocesses made by (e.g.) M-x grep don't exit
-   cleanly, they just hang.  ISC 2.2.1 does have select, in the -linet
-   library, but I guess it's not what Emacs needs.  --karl@cs.umb.edu  */
-#undef HAVE_SELECT /* override configuration decision */
+/* select (in -linet) works okay on X ptys, but not on the serial port.
+   karl@cs.umb.edu says that with that select call, subprocesses made by
+   (e.g.) M-x grep don't exit cleanly, they just hang.  Similar problems
+   have been observed in ISC 3.0.  */
+#define BROKEN_SELECT_NON_X
 
-/* Although ISC has sockets, again in -linet, again it's not what Emacs
-   needs.  With this defined, interrupt-shell-subjob and the like do
-   nothing.  --karl@cs.umb.edu
-#define HAVE_SOCKETS */
+/* karl@cs.umb.edu says that ISC's socket support (in -linet) isn't
+   what Emacs needs; it makes interrupt-shell-subjob and the like do
+   nothing.  But that appears to have been another manifestation of
+   the broken select, so it should now be safe to define this again.  */
+#define HAVE_SOCKETS
 
+#define NO_SOCKETS_IN_FILE_SYSTEM
+#define NEED_NET_ERRNO_H
 
 /* This keeps the .cdbx section that gcc puts out when generating
    stabs-in-coff output, so Emacs can be debugged.  --karl@cs.umb.edu. */
@@ -35,22 +39,23 @@
 #define SIGNALS_VIA_CHARACTERS
 
 /* -lPW is only needed if not using Gcc.  We used to include -lcposix here
-   for the rename function, but some pepople saus ISC's renames doesn't
+   for the rename function, but some people say ISC's rename doesn't
    work correctly with Emacs so we use Emacs' emulation instead. */
 #if defined (__GNUC__)
-#  define LIB_STANDARD -lcposix -lc
+#  define LIB_STANDARD_1 -lcposix
 #else /* !__GNUC__ */
-#  define LIB_STANDARD -lPW -lc
+#  define LIB_STANDARD_1 -lPW
 #endif /* !__GNUC__ */
 
+/* LIB_STANDARD_1 is used both here and in LIBS_SYSTEM
+   (the latter for the sake of configure).  */
+#define LIB_STANDARD LIB_STANDARD_1 -lc
+
 #define NO_X_DESTROY_DATABASE
 
-/* May be needed to avoid undefined symbols such as gethostname,
-   inet_addr, gethostbyname, socket, connect, ...  But if we are not
-   compiling with X support, it's not needed.  */
-#ifdef HAVE_X_WINDOWS
-#define LIBS_SYSTEM -linet
-#endif
+/* -linet may be needed to avoid undefined symbols such as gethostname,
+   inet_addr, gethostbyname, socket, connect, ...  */
+#define LIBS_SYSTEM -linet LIB_STANDARD_1
 
 /* This system has job control.  */
 #undef NOMULTIPLEJOBS
@@ -70,3 +75,6 @@
 /* Some versions of ISC are said to define S_IFLNK even tho
    they don't really support symlinks.  */
 #undef S_IFLNK
+
+/* arch-tag: 4de02713-eac5-4360-9d36-fd82c7a3ae44
+   (do not change this comment) */