From patchwork Thu Mar 15 21:54:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Mahoney X-Patchwork-Id: 10285829 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 5202560386 for ; Thu, 15 Mar 2018 21:55:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 437BC28C3D for ; Thu, 15 Mar 2018 21:55:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3885F28C45; Thu, 15 Mar 2018 21:55:08 +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 DD8E628C3D for ; Thu, 15 Mar 2018 21:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752658AbeCOVzH (ORCPT ); Thu, 15 Mar 2018 17:55:07 -0400 Received: from mx2.suse.de ([195.135.220.15]:54974 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752651AbeCOVzG (ORCPT ); Thu, 15 Mar 2018 17:55:06 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2E569B01E; Thu, 15 Mar 2018 21:55:05 +0000 (UTC) Received: from starscream.home.jeffm.io (starscream-1.home.jeffm.io [IPv6:2001:559:c0d4::1fe]) by mail.home.jeffm.io (Postfix) with ESMTPS id 9D22F81AD3E6; Thu, 15 Mar 2018 17:55:01 -0400 (EDT) Received: by starscream.home.jeffm.io (Postfix, from userid 1000) id 1E9278076C; 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 4/4] build: fix detection in AC_PACKAGE_WANT_GDBM Date: Thu, 15 Mar 2018 17:54:55 -0400 Message-Id: <20180315215455.8245-5-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 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 --- 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