* 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.

3 files changed, 6 insertions, 0 deletions

diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 61c61e53028..bede552b434 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -176,7 +176,9 @@ and this notice must be preserved on all copies.  */
 
 #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 */
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 1a7ca441dc9..5d1810837c1 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -112,7 +112,9 @@ and this notice must be preserved on all copies.  */
 #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 */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 8b481207ec2..2858fec12af 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -179,7 +179,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #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