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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/config.in b/src/config.in
index 6ebcde54c24..174f6bac195 100644
--- a/src/config.in
+++ b/src/config.in
@@ -111,6 +111,8 @@ and this notice must be preserved on all copies.  */
 
 #undef HAVE_LIBXBSD
 #undef HAVE_XRMSETDATABASE
+#undef HAVE_XSCREENRESOURCESTRING
+
 #undef HAVE_RANDOM
 
 #undef HAVE_BCOPY
diff --git a/src/xrdb.c b/src/xrdb.c
index 7bced538a8b..ea0cbc89b31 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -459,8 +459,7 @@ get_user_db (display)
       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 @@ get_user_db (display)
       XFree (xdefs);
     }
 #endif
-#endif
 
   return db;
 }