From patchwork Thu Mar 15 21:54:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Mahoney X-Patchwork-Id: 10285827 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF3F860621 for ; Thu, 15 Mar 2018 21:55:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1D5828C3D for ; Thu, 15 Mar 2018 21:55:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6AC328C40; Thu, 15 Mar 2018 21:55:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 579FE28C42 for ; Thu, 15 Mar 2018 21:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751714AbeCOVzH (ORCPT ); Thu, 15 Mar 2018 17:55:07 -0400 Received: from mx2.suse.de ([195.135.220.15]:54971 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752378AbeCOVzG (ORCPT ); Thu, 15 Mar 2018 17:55:06 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 24F5CB01C; Thu, 15 Mar 2018 21:55:05 +0000 (UTC) Received: from starscream.home.jeffm.io (starscream-1.home.jeffm.io [192.168.1.254]) by mail.home.jeffm.io (Postfix) with ESMTPS id 9298581AD3E2; Thu, 15 Mar 2018 17:55:01 -0400 (EDT) Received: by starscream.home.jeffm.io (Postfix, from userid 1000) id 124F580771; Thu, 15 Mar 2018 17:55:04 -0400 (EDT) From: jeffm@suse.com To: xfstests list Cc: Luis Rodriguez , Eryu Guan , Jeff Mahoney Subject: [PATCH 2/4] build: AC_PACKAGE_WANT_GDBM, fall back to compat if libgdbm detection fails Date: Thu, 15 Mar 2018 17:54:53 -0400 Message-Id: <20180315215455.8245-3-jeffm@suse.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180315215455.8245-1-jeffm@suse.com> References: <20180315215455.8245-1-jeffm@suse.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Mahoney 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 --- 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