X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=m4%2Fpackage_gdbmdev.m4;h=c07f75d82d3486ca5b1ae815468657e344777ee3;hp=d826acdf0728420f2590960aed1e1ececcd7e0df;hb=681a33182ce024eaa967e195d7b8bae6922399f5;hpb=e11d0477a18717de5253e2af292d028d896e4176

diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4
index d826acdf..c07f75d8 100644
--- a/m4/package_gdbmdev.m4
+++ b/m4/package_gdbmdev.m4
@@ -1,15 +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], [ have_db=true ], [ have_db=false ])
-    if test $have_db = true -a -f ${libexecdir}${libdirsuffix}/libgdbm.a; then
-	libgdbm="${libexecdir}${libdirsuffix}/libgdbm.a"
+  [ AC_CHECK_HEADERS([gdbm/ndbm.h, gdbm-ndbm.h], [ have_db=true ], [ have_db=false ])
+    found=false
+    libgdbm=""
+
+    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)
   ])
+