From 156dafb888a66c0d85f21bb008537f537655689a Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Thu, 15 Mar 2018 17:54:53 -0400 Subject: [PATCH] build: AC_PACKAGE_WANT_GDBM, fall back to compat if libgdbm detection fails We currently check if libgdbm_compat contains the required symbols even if libgdbm does. Let's fall back only when necessary (which is pretty much always anyway). Signed-off-by: Jeff Mahoney Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- m4/package_gdbmdev.m4 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4 index 484b751a..3e5f33d0 100644 --- a/m4/package_gdbmdev.m4 +++ b/m4/package_gdbmdev.m4 @@ -30,16 +30,15 @@ AC_DEFUN([AC_PACKAGE_WANT_GDBM], if test $found = true; then libgdbm="${libgdbm} -lgdbm" - fi - - found="no" - AC_CHECK_LIB(gdbm_compat,dbm_open,found=true,found=false,-lgdbm) - AC_CHECK_LIB(gdbm_compat,dbm_fetch,,found=false,-lgdbm) - AC_CHECK_LIB(gdbm_compat,dbm_store,,found=false,-lgdbm) - AC_CHECK_LIB(gdbm_compat,dbm_close,,found="no",-lgdbm) - - if test $found = true ; then - libgdbm="${libgdbm} -lgdbm_compat -lgdbm" + else + AC_CHECK_LIB(gdbm_compat,dbm_open,found=true,found=false,-lgdbm) + AC_CHECK_LIB(gdbm_compat,dbm_fetch,,found=false,-lgdbm) + AC_CHECK_LIB(gdbm_compat,dbm_store,,found=false,-lgdbm) + AC_CHECK_LIB(gdbm_compat,dbm_close,,found="false",-lgdbm) + + if test $found = true ; then + libgdbm="${libgdbm} -lgdbm_compat -lgdbm" + fi fi fi -- 2.30.2