X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml.git;a=blobdiff_plain;f=ocaml-db3.patch;h=30dc6dfdc797879435f5552cf24bc012897b722e;hp=5a2847210a6eddb73381580041958ee7f33c02e7;hb=023cf8907fbea3dffe7d40574c0691b4b600e210;hpb=e15a24262af3558a34627d3d660acbc6cbcdbb0f

diff --git a/ocaml-db3.patch b/ocaml-db3.patch
index 5a28472..30dc6df 100644
--- a/ocaml-db3.patch
+++ b/ocaml-db3.patch
@@ -1,14 +1,14 @@
-diff -ur ocaml-3.07beta2/configure ocaml-3.07beta2-/configure
---- ocaml-3.07beta2/configure	2003-08-20 17:10:58.000000000 +0200
-+++ ocaml-3.07beta2-/configure	2003-08-26 11:12:29.000000000 +0200
-@@ -1225,49 +1225,12 @@
+diff -urN ocaml-3.10.0.org/configure ocaml-3.10.0/configure
+--- ocaml-3.10.0.org/configure	2007-05-03 14:49:56.000000000 +0200
++++ ocaml-3.10.0/configure	2007-07-15 20:20:19.325848428 +0200
+@@ -1252,51 +1252,13 @@
  
  # 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
@@ -20,6 +20,8 @@ diff -ur ocaml-3.07beta2/configure ocaml-3.07beta2-/configure
 -      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
@@ -29,7 +31,7 @@ diff -ur ocaml-3.07beta2/configure ocaml-3.07beta2-/configure
 -    if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
 -      dbm_link="-lgdbm_compat -lgdbm"
 -    fi
--    break   
+-    break
 -  fi
 -done
 -if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
@@ -41,8 +43,6 @@ diff -ur ocaml-3.07beta2/configure ocaml-3.07beta2-/configure
 -  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
@@ -50,8 +50,8 @@ diff -ur ocaml-3.07beta2/configure ocaml-3.07beta2-/configure
 -fi
 +dbm_include=""
 +dbm_link="-ldb"
-+echo "DBM_INCLUDES=$dbm_include" >> Makefile
-+echo "DBM_LINK=$dbm_link" >> Makefile
+ echo "DBM_INCLUDES=$dbm_include" >> Makefile
+ echo "DBM_LINK=$dbm_link" >> Makefile
 +otherlibraries="$otherlibraries dbm"
  
  # Look for tcl/tk