* 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 --git a/src/config.in b/src/config.in
index 6ebcde54c2497f7ae8cf297b51706093fb0af32a..174f6bac195cbd24de6c7d431bcca8b567fd48c2 100644 (file)
--- 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 7bced538a8b6f1f196520c58e5355a17d75074bb..ea0cbc89b3187db8b191da1162d1d97fce003413 100644 (file)
--- 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)
@@ -468,7 +467,6 @@ get_user_db (display)
       XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db);
       XFree (xdefs);
     }
-#endif
 #endif
 
   return db;