public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: jeffm@suse.com
To: xfstests list <fstests@vger.kernel.org>
Cc: Luis Rodriguez <mcgrof@suse.com>, Eryu Guan <eguan@redhat.com>,
	Jeff Mahoney <jeffm@suse.com>
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	[thread overview]
Message-ID: <20180315215455.8245-3-jeffm@suse.com> (raw)
In-Reply-To: <20180315215455.8245-1-jeffm@suse.com>

From: Jeff Mahoney <jeffm@suse.com>

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 <jeffm@suse.com>
---
 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.15.1


  parent reply	other threads:[~2018-03-15 21:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-15 21:54 [PATCH 0/4] fstests: GDBM detection cleanup jeffm
2018-03-15 21:54 ` [PATCH 1/4] build: remove dead AC_PACKAGE_WANT_NDBM macro jeffm
2018-03-15 21:54 ` jeffm [this message]
2018-03-15 21:54 ` [PATCH 3/4] build: clean up AC_PACKAGE_WANT_GDBM jeffm
2018-03-15 21:54 ` [PATCH 4/4] build: fix <ndbm.h> detection in AC_PACKAGE_WANT_GDBM jeffm
2018-03-23  3:30 ` [PATCH 0/4] fstests: GDBM detection cleanup Eryu Guan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180315215455.8245-3-jeffm@suse.com \
    --to=jeffm@suse.com \
    --cc=eguan@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=mcgrof@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox