From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 23 Nov 1993 08:56:03 +0000 (+0000)
Subject: (HAVE_GETTIMEOFDAY): Define only if HAVE_SOCKETS.
X-Git-Tag: emacs-19.34~10724
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cd23c8dbd2e2f406ea58ac949fec3690ae6c6d8f;p=emacs.git

(HAVE_GETTIMEOFDAY): Define only if HAVE_SOCKETS.
Fix up conditionals changed recently.
---

diff --git a/src/s/sco4.h b/src/s/sco4.h
index dba7644429e..e3a93d90b16 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