build: update AC_PACKAGE_WANT_GDBM() and src/dbtest.c to build

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

diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4
index 6580fbae5befbcb5ec204696931f60847a083d4b..e963431684784a9a41a12df14dc5498f600be9ed 100644 (file)
--- a/m4/package_gdbmdev.m4
+++ b/m4/package_gdbmdev.m4
@@ -1,19 +1,69 @@
 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 ])
-    libgdbm=""
-    if test $have_db = true -a -f ${libexecdir}${libdirsuffix}/libgdbm_compat.a; then
-       libgdbm="${libexecdir}${libdirsuffix}/libgdbm_compat.a"
+  [ AC_CHECK_HEADER(gdbm-ndbm.h, [ gdbm_ndbm=true; have_db=true ], [ gdbm_ndbm=false; have_db=false ])
+
+    if test $gdbm_ndbm = true; then
+        AC_DEFINE(HAVE_GDBM_NDBM_H, [1], [Define to 1 if you have the <gdbm-ndbm.h> header file.])
+    else
+        AS_UNSET([ac_cv_header_gdbm_ndbm_h])
+        AC_CHECK_HEADER(gdbm/ndbm.h, [ gdbm_ndbm_=true; have_db=true ], [ gdbm_ndbm_=false; have_db=false ])
+        if test $gdbm_ndbm_ = true; then
+            AC_DEFINE(HAVE_GDBM_NDBM_H_, [1], [Define to 1 if you have the <gdbm/ndbm.h> header file.])
+        else
+            AC_CHECK_HEADER(gdbm.h, [ gdbm_ndbm_=true; have_db=true ], [ gdbm_ndbm_=false; have_db=false ])
+            AC_CHECK_HEADER(ndbm.h, [ ndbm_=true ], [ ndbm_=false ])
+                if test $gdbm_ndbm_ = true; then
+                    if test $ndbm_ = true; then
+                        AC_DEFINE(HAVE_GDBM_H, [1], [Define to 1 if you have both <gdbm.h> and <ndbm.h> header files.])
+                    fi
+                fi
+        fi
     fi
-    if test $have_db = true -a -f ${libexecdir}${libdirsuffix}/libgdbm.a; then
-       libgdbm="${libgdbm} ${libexecdir}${libdirsuffix}/libgdbm.a"
+
+    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,-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"
+      fi
     fi
+
     AC_SUBST(libgdbm)
     AC_SUBST(have_db)
   ])
+