From 2353022e570f53982721386f3055a303f20cbe6c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 12 Dec 2017 16:45:14 -0800 Subject: [PATCH] build: update AC_PACKAGE_WANT_GDBM() and src/dbtest.c to build Modern gdbm-devel packages bundle together gdbm.h and ndbm.h. The old m4 macro had detection support for some old gdbm libraries but not for new ones. We fix compilation of src/dbtest.c by making the autoconf helper check for this new arrangement: If both gdbm.h and ndbm.h are found define set both gdbm_ndbm_=true, and have_db=true, and define HAVE_GDBM_H. The src/dbtest.c already had a HAVE_GDBM_H but there was never a respective autoconf settter for it. We can just re-use this and fix it for new arrangement. Signed-off-by: Luis R. Rodriguez Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- m4/package_gdbmdev.m4 | 8 ++++++++ src/dbtest.c | 1 + 2 files changed, 9 insertions(+) diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4 index 734a192ba..e96343168 100644 --- a/m4/package_gdbmdev.m4 +++ b/m4/package_gdbmdev.m4 @@ -28,6 +28,14 @@ AC_DEFUN([AC_PACKAGE_WANT_GDBM], AC_CHECK_HEADER(gdbm/ndbm.h, [ gdbm_ndbm_=true; have_db=true ], [ gdbm_ndbm_=false; have_db=false ]) if test $gdbm_ndbm_ = true; then AC_DEFINE(HAVE_GDBM_NDBM_H_, [1], [Define to 1 if you have the header file.]) + else + AC_CHECK_HEADER(gdbm.h, [ gdbm_ndbm_=true; have_db=true ], [ gdbm_ndbm_=false; have_db=false ]) + AC_CHECK_HEADER(ndbm.h, [ ndbm_=true ], [ ndbm_=false ]) + 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 fi diff --git a/src/dbtest.c b/src/dbtest.c index ec8db0b93..f45db4ac2 100644 --- a/src/dbtest.c +++ b/src/dbtest.c @@ -24,6 +24,7 @@ #include #elif HAVE_GDBM_H #include +#include #elif HAVE_NDBM_H #include #else -- 2.51.0