Mercurial > emacs

changeset 5127:e1a169a43ac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(HAVE_GETTIMEOFDAY): Define only if HAVE_SOCKETS. Fix up conditionals changed recently.
author Richard M. Stallman <rms@gnu.org>
date Tue, 23 Nov 1993 08:56:03 +0000
parents 30682388c4cf
children 16e75a0b53e5
files src/s/sco4.h
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/s/sco4.h	Tue Nov 23 08:43:48 1993 +0000
+++ b/src/s/sco4.h	Tue Nov 23 08:56:03 1993 +0000
@@ -76,12 +76,6 @@
 #ifdef HAVE_SOCKETS
 #define LIBS_SYSTEM -lsocket
 
-/* configure can't get this right since it comes from -lsocket
-   and configure doesn't know to look there.  */
-#undef HAVE_XSCREENNUMBEROFSCREEN
-#define HAVE_XSCREENNUMBEROFSCREEN
-#endif
-
 /* SCO has gettimeofday in socket library */
 /* Autoconf should determine this, but for now, 
    play safe to avoid error rather than deleting this
@@ -91,6 +85,12 @@
 #endif
 #endif
 
+#ifdef HAVE_X11R5
+/* configure can't get this right linking fails unless -lsocket is used.  */
+#undef HAVE_XSCREENNUMBEROFSCREEN
+#define HAVE_XSCREENNUMBEROFSCREEN
+#endif
+
 /* We don't have -loldX, and we don't need it.  */
 #define LIB_XMENU_LIB