apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: update AC_PACKAGE_WANT_GDBM() and src/dbtest.c to build

Browse Source 
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 <mcgrof@kernel.org>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Luis R. Rodriguez
2017-12-12 16:45:14 -08:00
committed by Eryu Guan
parent 07350fc758
commit 2353022e57
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
m4/package_gdbmdev.m4
+8
View File
@@ -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 <gdbm/ndbm.h> 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 <gdbm.h> and <ndbm.h> header files.])
fi
fi
fi
fi
src/dbtest.c
+1
View File
@@ -24,6 +24,7 @@
#include <gdbm-ndbm.h>
#elif HAVE_GDBM_H
#include <gdbm.h>
#include <ndbm.h>
#elif HAVE_NDBM_H
#include <ndbm.h>
#else