- obsolete

Changed files:
    apr-util-db46.patch -> 1.2

diff --git a/apr-util-db46.patch b/apr-util-db46.patch
deleted file mode 100644 (file)
index dfa31f5..0000000
--- a/apr-util-db46.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- apr-util-1.2.8/build/dbm.m4.orig   2007-08-28 22:39:30.420428000 +0200
-+++ apr-util-1.2.8/build/dbm.m4        2007-08-28 22:44:58.691135633 +0200
-@@ -483,6 +483,25 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB46: is DB4.6 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB46], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.6 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "5", "-1",
-+    "$places",
-+    "db46/db.h db4/db.h db.h",
-+    "db-4.6 db4-4.6 db46 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -555,6 +574,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db46)
-+    APU_CHECK_DB46("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -567,6 +592,8 @@
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
-+ APU_CHECK_DB46("$all_places")
-+ if test "$apu_db_version" != "4"; then
-   APU_CHECK_DB45("$all_places")
-   if test "$apu_db_version" != "4"; then
-     APU_CHECK_DB44("$all_places")
-@@ -595,6 +622,7 @@
-       fi
-     fi
-   fi
-+ fi
-   AC_MSG_CHECKING(for Berkeley DB)
-   if test "$apu_have_db" = "1"; then
-     AC_MSG_RESULT(found db$apu_db_version)
-@@ -623,11 +651,11 @@
- 
-   AC_ARG_WITH(dbm, [
-     --with-dbm=DBM          choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45}
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}
-   ], [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
-     fi
-     requested="$withval"
-   ], [
-@@ -817,6 +845,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db46)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -824,7 +856,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44 db45])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44 db45 db46])
-       ;;
-   esac
-