aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>1993-11-23 08:56:03 +0000
committerRichard M. Stallman <[email protected]>1993-11-23 08:56:03 +0000
commitcd23c8dbd2e2f406ea58ac949fec3690ae6c6d8f (patch)
tree3ffd754bd50c7bacd30376815e8884601f489f9e
parent4897b0a059da3d102330ce5622f5cdd8dd56a0ae (diff)
(HAVE_GETTIMEOFDAY): Define only if HAVE_SOCKETS.
Fix up conditionals changed recently.
-rw-r--r--src/s/sco4.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/s/sco4.h b/src/s/sco4.h
index dba7644429..e3a93d90b1 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -76,12 +76,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#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 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#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