From 581862bdc02323bc3c2e71a489b09ca4e23cf461 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Thu, 15 Mar 2018 17:54:55 -0400 Subject: [PATCH] build: fix 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 and both defining the datum type, resulting in build failures. Nothing has ever set HAVE_GDBM_H or checked for the 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- m4/package_gdbmdev.m4 | 20 +++----------------- src/dbtest.c | 3 --- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4 index 922cbcbc..723900fc 100644 --- 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 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 and header files.]) - fi - fi fi if test "$have_db" = true; then diff --git a/src/dbtest.c b/src/dbtest.c index f45db4ac..4366dcdf 100644 --- a/src/dbtest.c +++ b/src/dbtest.c @@ -22,9 +22,6 @@ #include #elif HAVE_GDBM_NDBM_H #include -#elif HAVE_GDBM_H -#include -#include #elif HAVE_NDBM_H #include #else -- 2.47.3