changeset 3680:6c88b630141b

* config.h.in (HAVE_XRMSETDATABASE, HAVE_RANDOM, HAVE_LIBXBSD): Add #undefs for these. Dyke out code requesting -lXbsd and HAVE_RANDOM for XFREE386. * xfns.c (Fx_open_connection): Test HAVE_XRMSETDATABASE instead of NO_XRM_SET_DATABASE; the latter isn't used any more. * m/delta88k, m/tekXD88.h, s/linux.h, s/usg5-4-2.h (HAVE_RANDOM): Dyke out these #definitions; to avoid conflict with autoconf.
author Jim Blandy <jimb@redhat.com>
date Sat, 12 Jun 1993 15:37:14 +0000
parents e1380814a454
children 94593e8e6593
files src/m/delta88k.h src/m/tekxd88.h src/s/gnu-linux.h
diffstat 3 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/m/delta88k.h	Sat Jun 12 10:12:21 1993 +0000
+++ b/src/m/delta88k.h	Sat Jun 12 15:37:14 1993 +0000
@@ -176,7 +176,9 @@
 
 #ifdef USG5_4
 #ifdef HAVE_X_WINDOWS
+#if 0 /* autoconf should take care of this. */
 #define HAVE_RANDOM
+#endif
 #else
 #undef BSTRING
 #endif /* HAVE_X_WINDOWS */
--- a/src/m/tekxd88.h	Sat Jun 12 10:12:21 1993 +0000
+++ b/src/m/tekxd88.h	Sat Jun 12 15:37:14 1993 +0000
@@ -112,7 +112,9 @@
 #undef sigsetmask	/* XD88 has sigsetmask() */
 
 #ifdef HAVE_X_WINDOWS
+#  if 0 /* autoconf should take care of this.  */
 #  define HAVE_RANDOM	/* Random is in libX11.a */
+#  endif 
 #  undef LIB_X11_LIB	/* Don't use shared libraries defined in usg5-3.h */
 #  undef LIBX11_SYSTEM
 #endif /* HAVE_X_WINDOWS */
--- a/src/s/gnu-linux.h	Sat Jun 12 10:12:21 1993 +0000
+++ b/src/s/gnu-linux.h	Sat Jun 12 15:37:14 1993 +0000
@@ -179,7 +179,9 @@
 #define HAVE_UNISTD_H	      /* for getpagesize.h */
 #define NO_SIOCTL_H           /* don't have sioctl.h */
 
+#if 0 /* autoconf should take care of this.  */
 #define HAVE_RANDOM           /* is builtin */
+#endif
 #define HAVE_CLOSEDIR
 #define HAVE_GETPAGESIZE
 #define HAVE_VFORK