This commit was manufactured by cvs2git to create branch 'AC-branch'.

Cherrypick from master 2006-04-22 22:38:22 UTC Jakub Bogusz <qboosh@pld-linux.org> '- updated to 3.09.2':
    ocaml-db3.patch -> 1.5

diff --git a/ocaml-db3.patch b/ocaml-db3.patch
new file mode 100644 (file)
index 0000000..e6fd10e
--- /dev/null
+++ b/ocaml-db3.patch
@@ -0,0 +1,72 @@
+--- ocaml-3.09.2/configure.orig        2006-04-19 22:15:48.276544500 +0200
++++ ocaml-3.09.2/configure     2006-04-22 23:49:10.045620750 +0200
+@@ -1238,51 +1238,12 @@
+ 
+ # See if we can compile the dbm library
+ 
+-dbm_include="not found"
+-dbm_link="not found"
+ use_gdbm_ndbm=no
+-
+-for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do
+-  if test -f $dir/ndbm.h; then
+-    dbm_include=$dir
+-    if sh ./hasgot dbm_open; then
+-      dbm_link=""
+-    elif sh ./hasgot -lndbm dbm_open; then
+-      dbm_link="-lndbm"
+-    elif sh ./hasgot -ldb1 dbm_open; then
+-      dbm_link="-ldb1"
+-    elif sh ./hasgot -lgdbm dbm_open; then
+-      dbm_link="-lgdbm"
+-    elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
+-      dbm_link="-lgdbm_compat -lgdbm"
+-    fi
+-    break
+-  fi
+-  if test -f $dir/gdbm-ndbm.h; then
+-    dbm_include=$dir
+-    use_gdbm_ndbm=yes
+-    if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
+-      dbm_link="-lgdbm_compat -lgdbm"
+-    fi
+-    break
+-  fi
+-done
+-if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
+-  echo "NDBM not found, the \"dbm\" library will not be supported."
+-else
+-  echo "NDBM found (in $dbm_include)"
+-  if test "$dbm_include" = "/usr/include"; then
+-    dbm_include=""
+-  else
+-    dbm_include="-I$dbm_include"
+-  fi
+-  echo "DBM_INCLUDES=$dbm_include" >> Makefile
+-  echo "DBM_LINK=$dbm_link" >> Makefile
+-  if test "$use_gdbm_ndbm" = "yes"; then
+-    echo "#define DBM_USES_GDBM_NDBM" >> s.h
+-  fi
+-  otherlibraries="$otherlibraries dbm"
+-fi
++dbm_include=""
++dbm_link="-ldb"
++echo "DBM_INCLUDES=$dbm_include" >> Makefile
++echo "DBM_LINK=$dbm_link" >> Makefile
++otherlibraries="$otherlibraries dbm"
+ 
+ # Look for tcl/tk
+ 
+diff -ur ocaml-3.07beta2/otherlibs/dbm/cldbm.c ocaml-3.07beta2-/otherlibs/dbm/cldbm.c
+--- ocaml-3.07beta2/otherlibs/dbm/cldbm.c      2003-07-08 15:50:31.000000000 +0200
++++ ocaml-3.07beta2-/otherlibs/dbm/cldbm.c     2003-08-26 11:11:19.000000000 +0200
+@@ -24,7 +24,8 @@
+ #ifdef DBM_USES_GDBM_NDBM
+ #include <gdbm-ndbm.h>
+ #else
+-#include <ndbm.h>
++#define DB_DBM_HSEARCH 1
++#include <db.h>
+ #endif
+ 
+ /* Quite close to sys_open_flags, but we need RDWR */