Fixed merge problems

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

diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4
index 69e45452428c15cdcdd6510f9c378801d886ec7e..513e20f23e656ccfd0b89dbefd0bfa45d8e3265e 100644 (file)
--- a/m4/package_gdbmdev.m4
+++ b/m4/package_gdbmdev.m4
@@ -1,5 +1,12 @@
-AC_DEFUN([AC_PACKAGE_WANT_LIBGDBM],
-  [ AC_CHECK_HEADER([gdbm/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 ])
+    libgdbm=""
+    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 /usr/lib/libgdbm.a; then
        libgdbm="/usr/lib/libgdbm.a"
     fi