# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 744082306 0
# Node ID 04bd0c1a62459db2126381f8df9ef6f32b6452b5
# Parent  f3506c9677f3db7510f9a5799875e4ee05b6008b
* config.h.in (HAVE_XSCREENRESOURCESTRING): New #undef for
configure to edit.
* xrdb.c (get_user_db): Test it to decide whether or not to try to
retrieve the screen-dependent resources.

diff -r f3506c9677f3 -r 04bd0c1a6245 src/config.in
--- a/src/config.in	Sat Jul 31 01:21:21 1993 +0000
+++ b/src/config.in	Sat Jul 31 01:31:46 1993 +0000
@@ -111,6 +111,8 @@
 
 #undef HAVE_LIBXBSD
 #undef HAVE_XRMSETDATABASE
+#undef HAVE_XSCREENRESOURCESTRING
+
 #undef HAVE_RANDOM
 
 #undef HAVE_BCOPY
diff -r f3506c9677f3 -r 04bd0c1a6245 src/xrdb.c
--- a/src/xrdb.c	Sat Jul 31 01:21:21 1993 +0000
+++ b/src/xrdb.c	Sat Jul 31 01:31:46 1993 +0000
@@ -459,8 +459,7 @@
       free (xdefault);
     }
 
-#ifdef XlibSpecificationRelease
-#if XlibSpecificationRelease >= 5
+#ifdef HAVE_XSCREENRESOURCESTRING
   /* Get the screen-specific resources too.  */
   xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));
   if (xdefs != NULL)
@@ -469,7 +468,6 @@
       XFree (xdefs);
     }
 #endif
-#endif
 
   return db;
 }