build: fix <ndbm.h> detection in AC_PACKAGE_WANT_GDBM

SUSE systems export the NDBM interface via /usr/include/ndbm.h

This means that dbtest wasn't built on SUSE systems until commit
2353022 (build: update AC_PACKAGE_WANT_GDBM() and src/dbtest.c to
build). That change was incompatible with older SLES releases due to
<ndbm.h> and <gdbm.h> both defining the datum type, resulting in
build failures.

Nothing has ever set HAVE_GDBM_H or checked for the <gdbm.h> header
prior to the above commit, and it's not required on SUSE systems
either, so just remove that entirely.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4
index 922cbcbcd5653907d765c02be3ab1285883fb48c..723900fc5337b9bc755896be5699cdaf236c7ee8 100644 (file)
--- a/m4/package_gdbmdev.m4
+++ b/m4/package_gdbmdev.m4
@@ -22,26 +22,12 @@ AC_DEFUN([AC_PACKAGE_WANT_GDBM],
     fi
 
     if test -z "$have_db"; then
-      AC_CHECK_HEADER(gdbm.h,
-       [
-         have_db=true
-         gdbm_ndbm_=true
-       ], [
-         have_db=false
-         gdbm_ndbm_=false
-       ])
       AC_CHECK_HEADER(ndbm.h,
        [
-         ndbm_=true
-       ], [
-         ndbm_=false
+         have_db=true
+         AC_DEFINE(HAVE_NDBM_H, [1],
+                   [Define to 1 if you have the <ndbm.h> header file.])
        ])
-       if test $gdbm_ndbm_ = true; then
-         if test $ndbm_ = true; then
-           AC_DEFINE(HAVE_GDBM_H, [1],
-                     [Define to 1 if you have both <gdbm.h> and <ndbm.h> header files.])
-         fi
-       fi
     fi
 
     if test "$have_db" = true; then

diff --git a/src/dbtest.c b/src/dbtest.c
index f45db4ac2b193f090a279b259d713bb5393175da..4366dcdf8da035b7aa54f7af42a03beac0d7f1ec 100644 (file)
--- a/src/dbtest.c
+++ b/src/dbtest.c
@@ -22,9 +22,6 @@
 #include <gdbm/ndbm.h>
 #elif HAVE_GDBM_NDBM_H
 #include <gdbm-ndbm.h>
-#elif HAVE_GDBM_H
-#include <gdbm.h>
-#include <ndbm.h>
 #elif HAVE_NDBM_H
 #include <ndbm.h>
 #else