ocaml-db3.patch

   1 diff -ur ocaml-3.04--/otherlibs/dbm/cldbm.c ocaml-3.04/otherlibs/dbm/cldbm.c
   2 --- ocaml-3.04--/otherlibs/dbm/cldbm.c  Fri Dec  7 14:39:51 2001
   3 +++ ocaml-3.04/otherlibs/dbm/cldbm.c    Sat Feb  2 02:38:17 2002
   4 @@ -15,7 +15,8 @@
   5
   6  #include <string.h>
   7  #include <fcntl.h>
   8 -#include <ndbm.h>
   9 +#define DB_DBM_HSEARCH 1
  10 +#include <db.h>
  11  #include <mlvalues.h>
  12  #include <alloc.h>
  13  #include <memory.h>
  14
  15 diff -ur ocaml-3.04/configure ocaml-3.04-/configure
  16 --- ocaml-3.04/configure        Fri Dec  7 14:23:01 2001
  17 +++ ocaml-3.04-/configure       Mon Jun  3 15:25:25 2002
  18 @@ -1065,38 +1065,11 @@
  19
  20  # See if we can compile the dbm library
  21
  22 -dbm_include="not found"
  23 -dbm_link="not found"
  24 -for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do
  25 -  if test -f $dir/ndbm.h; then
  26 -    dbm_include=$dir
  27 -    if sh ./hasgot dbm_open; then
  28 -      dbm_link=""
  29 -    elif sh ./hasgot -lndbm dbm_open; then
  30 -      dbm_link="-lndbm"
  31 -    elif sh ./hasgot -ldb1 dbm_open; then
  32 -      dbm_link="-ldb1"
  33 -    elif sh ./hasgot -lgdbm dbm_open; then
  34 -      dbm_link="-lgdbm"
  35 -    else
  36 -      dbm_include="not found"
  37 -    fi
  38 -    break
  39 -  fi
  40 -done
  41 -if test "$dbm_include" = "not found"; then
  42 -  echo "NDBM not found, the \"dbm\" library will not be supported."
  43 -else
  44 -  echo "NDBM found (in $dbm_include)"
  45 -  if test "$dbm_include" = "/usr/include"; then
  46 -    dbm_include=""
  47 -  else
  48 -    dbm_include="-I$dbm_include"
  49 -  fi
  50 -  echo "DBM_INCLUDES=$dbm_include" >> Makefile
  51 -  echo "DBM_LINK=$dbm_link" >> Makefile
  52 -  otherlibraries="$otherlibraries dbm"
  53 -fi
  54 +dbm_include=""
  55 +dbm_link="-ldb"
  56 +echo "DBM_INCLUDES=$dbm_include" >> Makefile
  57 +echo "DBM_LINK=$dbm_link" >> Makefile
  58 +otherlibraries="$otherlibraries dbm"
  59
  60  # Look for tcl/tk
  61