# HG changeset patch # User Jim Blandy # Date 739899434 0 # Node ID 6c88b630141b1adada339ae0fe1b1cb77d07547e # Parent e1380814a454c3f05a22098d1e0746af1d514260 * 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. diff -r e1380814a454 -r 6c88b630141b src/m/delta88k.h --- 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 */ diff -r e1380814a454 -r 6c88b630141b src/m/tekxd88.h --- 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 */ diff -r e1380814a454 -r 6c88b630141b src/s/gnu-linux.h --- 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