merge of DB-NEW

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10453 ec53bebd-3082-4978-b11e-865c3cabbd6b

cf/db.m4

@@ -9,32 +9,140 @@ if test "$withval" = no; then
 	berkeley_db=""
 fi
 ])
+
+db_type=unknown
+
 if test "$berkeley_db"; then
+
   AC_CHECK_HEADERS([				\
 	db.h					\
 	db_185.h				\
   ])
-fi
 
-AC_FIND_FUNC_NO_LIBS2(dbopen, $berkeley_db, [
-#include <stdio.h>
-#if defined(HAVE_DB_185_H)
-#include <db_185.h>
-#elif defined(HAVE_DB_H)
-#include <db.h>
-#endif
-],[NULL, 0, 0, 0, NULL])
+dnl db_create is used by db3
 
-AC_FIND_FUNC_NO_LIBS(dbm_firstkey, $berkeley_db gdbm ndbm)
-AC_FIND_FUNC_NO_LIBS(db_create, $berkeley_db)
+  AC_FIND_FUNC_NO_LIBS(db_create, $berkeley_db, [
+  #include <stdio.h>
+  #include <db.h>
+  ],[NULL, NULL, 0])
 
-DBLIB="$LIB_dbopen"
-if test "$LIB_dbopen" != "$LIB_db_create"; then
-        DBLIB="$DBLIB $LIB_db_create"
-fi
-if test "$LIB_dbopen" != "$LIB_dbm_firstkey"; then
-	DBLIB="$DBLIB $LIB_dbm_firstkey"
-fi
+  if test "$ac_cv_func_db_create" = "yes"; then
+    db_type=db3
+    if test "$ac_cv_funclib_db_create" != "yes"; then
+      DBLIB="$ac_cv_funclib_db_create"
+    else
+      DBLIB=""
+    fi
+    AC_DEFINE(HAVE_DB3, 1, [define if you have a berkeley db3 library])
+  else
+
+dnl dbopen is used by db1/db2
+
+    AC_FIND_FUNC_NO_LIBS(dbopen, $berkeley_db, [
+    #include <stdio.h>
+    #if defined(HAVE_DB_185_H)
+    #include <db_185.h>
+    #elif defined(HAVE_DB_H)
+    #include <db.h>
+    #else
+    #error no db.h
+    #endif
+    ],[NULL, 0, 0, 0, NULL])
+
+    if test "$ac_cv_func_dbopen" = "yes"; then
+      db_type=db1
+      if test "$ac_cv_funclib_dbopen" != "yes"; then
+        DBLIB="$ac_cv_funclib_dbopen"
+      else
+        DBLIB=""
+      fi
+      AC_DEFINE(HAVE_DB1, 1, [define if you have a berkeley db1/2 library])
+    fi
+  fi
+
+dnl test for ndbm compatability
+
+  AC_FIND_FUNC_NO_LIBS2(dbm_firstkey, $ac_cv_funclib_dbopen, [
+  #include <stdio.h>
+  #define DB_DBM_HSEARCH 1
+  #include <db.h>
+  DBM *dbm;
+  ],[NULL])
+
+  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+    else
+      LIB_NDBM=""
+    fi
+    AC_DEFINE(HAVE_DB_NDBM, 1, [define if you have ndbm compat in db])
+  else
+    $as_unset ac_cv_func_dbm_firstkey
+    $as_unset ac_cv_funclib_dbm_firstkey
+  fi
+
+fi # berkeley db
+
+if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
+
+  AC_CHECK_HEADERS([				\
+	dbm.h					\
+	ndbm.h					\
+  ])
+
+  AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [
+  #include <stdio.h>
+  #if defined(HAVE_DBM_H)
+  #include <dbm.h>
+  #elif defined(HAVE_NDBM_H)
+  #include <ndbm.h>
+  #else
+  #error no ndbm.h
+  #endif
+  DBM *dbm;
+  ],[NULL])
+
+  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+    else
+      LIB_NDBM=""
+    fi
+    AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
+    if test "$db_type" = "unknown"; then
+      db_type=ndbm
+      DBLIB="$LIB_NDBM"
+    fi
+  else
+
+    $as_unset ac_cv_func_dbm_firstkey
+    $as_unset ac_cv_funclib_dbm_firstkey
+
+    AC_CHECK_HEADERS([				\
+	  gdbm/ndbm.h				\
+    ])
+
+    AC_FIND_FUNC_NO_LIBS(dbm_firstkey, gdbm, [
+    #include <stdio.h>
+    #include <gdbm/ndbm.h>
+    DBM *dbm;
+    ],[NULL])
+
+    if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+      if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+	LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+      else
+	LIB_NDBM=""
+      fi
+      AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
+      if test "$db_type" = "unknown"; then
+	db_type=ndbm
+	DBLIB="$LIB_NDBM"
+      fi
+    fi
+  fi
+
+fi # unknown
 AC_SUBST(DBLIB)dnl
-
+AC_SUBST(LIB_NDBM)dnl
 ])