xfs
[Top] [All Lists]

[PATCH] xfstests: detect gdbm library correctly

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfstests: detect gdbm library correctly
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Wed, 16 Nov 2011 07:56:37 +1100
From: Dave Chinner <dchinner@xxxxxxxxxx>

Debian unstable has move the location of the gdbm libraries as part
of it's multi-arch conversion. The libraries are now only found by
the configured library search path in /etc/ld.conf.d, so change the
autoconf macros to test and find the libraries by link tests rather
than hard coding library paths when a header is found.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 m4/package_gdbmdev.m4 |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4
index 6580fba..c07f75d 100644
--- a/m4/package_gdbmdev.m4
+++ b/m4/package_gdbmdev.m4
@@ -1,19 +1,50 @@
 AC_DEFUN([AC_PACKAGE_WANT_NDBM],
   [ AC_CHECK_HEADERS(ndbm.h, [ have_db=true ], [ have_db=false ])
+    found=false
     libgdbm=""
+
+    if test $have_db = true; then
+      AC_CHECK_LIB(ndbm,dbm_open,found=true,found=false)
+      AC_CHECK_LIB(ndbm,dbm_fetch,,found=false)
+      AC_CHECK_LIB(ndbm,dbm_store,,found=false)
+      AC_CHECK_LIB(ndbm,dbm_close,,found=false)
+
+      if test $found = true; then
+        libgdbm="$ndbm"
+      fi
+    fi
+
     AC_SUBST(libgdbm)
     AC_SUBST(have_db)
   ])
 
 AC_DEFUN([AC_PACKAGE_WANT_GDBM],
   [ AC_CHECK_HEADERS([gdbm/ndbm.h, gdbm-ndbm.h], [ have_db=true ], [ 
have_db=false ])
+    found=false
     libgdbm=""
-    if test $have_db = true -a -f 
${libexecdir}${libdirsuffix}/libgdbm_compat.a; then
-       libgdbm="${libexecdir}${libdirsuffix}/libgdbm_compat.a"
-    fi
-    if test $have_db = true -a -f ${libexecdir}${libdirsuffix}/libgdbm.a; then
-       libgdbm="${libgdbm} ${libexecdir}${libdirsuffix}/libgdbm.a"
+
+    if test $have_db = true; then
+      AC_CHECK_LIB(gdbm,dbm_open,found=true,found=false)
+      AC_CHECK_LIB(gdbm,dbm_fetch,,found=false)
+      AC_CHECK_LIB(gdbm,dbm_store,,found=false)
+      AC_CHECK_LIB(gdbm,dbm_close,,found=false)
+
+      if test $found = true; then
+        libgdbm="${libgdbm} -lgdbm"
+      fi
+
+      found="no"
+      AC_CHECK_LIB(gdbm_compat,dbm_open,found=true,found=false)
+      AC_CHECK_LIB(gdbm_compat,dbm_fetch,,found=false)
+      AC_CHECK_LIB(gdbm_compat,dbm_store,,found=false)
+      AC_CHECK_LIB(gdbm_compat,dbm_close,,found="no")
+
+      if test $found = true ; then
+        libgdbm="${libgdbm} -lgdbm_compat"
+      fi
     fi
+
     AC_SUBST(libgdbm)
     AC_SUBST(have_db)
   ])
+
-- 
1.7.5.4

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfstests: detect gdbm library correctly, Dave Chinner <=