[PATCH xserver 2/2] build: Remove <*dbm.h> checks

[Adam Jackson]

Formerly used by the rgb database code, which hasn't been a thing in
over a decade.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 configure.ac            | 2 --
 include/dix-config.h.in | 9 ---------
 include/meson.build     | 3 ---
 3 files changed, 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30b4b383d6..512bc9e9e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,8 +190,6 @@ dnl Find the math libary, then check for cbrt function in it.
 AC_CHECK_LIB(m, sqrt)
 AC_CHECK_FUNCS([cbrt])
 
-AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
-
 dnl AGPGART headers
 AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)
 AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 8bce0e07bb..44a29a69a2 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -66,9 +66,6 @@
 /* Define to 1 if you have the `cbrt' function. */
 #undef HAVE_CBRT
 
-/* Define to 1 if you have the <dbm.h> header file. */
-#undef HAVE_DBM_H
-
 /* Define to 1 if you have the declaration of `program_invocation_short_name', and
    to 0 if you don't. */
 #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
@@ -146,18 +143,12 @@
 /* Define to 1 if you have the function pthread_setname_np(pthread_t, const char*) */
 #undef HAVE_PTHREAD_SETNAME_NP_WITH_TID
 
-/* Define to 1 if you have the <ndbm.h> header file. */
-#undef HAVE_NDBM_H
-
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
 /* Define to 1 if you have the `reallocarray' function. */
 #undef HAVE_REALLOCARRAY
 
-/* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
-#undef HAVE_RPCSVC_DBM_H
-
 /* Define to 1 if you have the `arc4random_buf' function. */
 #undef HAVE_ARC4RANDOM_BUF
 
diff --git a/include/meson.build b/include/meson.build
index d6ec0d7cd3..c7830ef733 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -92,14 +92,11 @@ conf_data.set('XORG_VERSION_CURRENT', release)
 conf_data.set('HASXDMAUTH', get_option('xdm-auth-1'))
 conf_data.set('SECURE_RPC', get_option('secure-rpc'))
 
-conf_data.set('HAVE_DBM_H', cc.has_header('dbm.h'))
 conf_data.set('HAVE_DLFCN_H', cc.has_header('dlfcn.h'))
 conf_data.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
 conf_data.set('HAVE_FCNTL_H', cc.has_header('fcntl.h'))
 conf_data.set('HAVE_FNMATCH_H', cc.has_header('fnmatch.h'))
 conf_data.set('HAVE_LINUX_AGPGART_H', cc.has_header('linux/agpgart.h'))
-conf_data.set('HAVE_NDBM_H', cc.has_header('ndbm.h'))
-conf_data.set('HAVE_RPCSVC_DBM_H', cc.has_header('rpcsvc/dbm.h'))
 conf_data.set('HAVE_STDLIB_H', cc.has_header('stdlib.h'))
 conf_data.set('HAVE_STRING_H', cc.has_header('string.h'))
 conf_data.set('HAVE_STRINGS_H', cc.has_header('strings.h'))
-- 
2.14.3