Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev

[xfstests-dev.git] / m4 / package_gdbmdev.m4

diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4
index 6580fbae5befbcb5ec204696931f60847a083d4b..c07f75d82d3486ca5b1ae815468657e344777ee3 100644 (file)
--- 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 ])
 AC_DEFUN([AC_PACKAGE_WANT_NDBM],
   [ AC_CHECK_HEADERS(ndbm.h, [ have_db=true ], [ have_db=false ])

+    found=false

     libgdbm=""
     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 ])
     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=""
     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
     fi

+

     AC_SUBST(libgdbm)
     AC_SUBST(have_db)
   ])
     AC_SUBST(libgdbm)
     AC_SUBST(have_db)
   ])

+