← Back to branch summary

~ubuntu-branches/ubuntu/saucy/apr-util/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/016_bdb5.1.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Fritsch
  • Date: 2011-04-08 19:19:23 UTC
  • Revision ID: james.westby@ubuntu.com-20110408191923-9jggpjvu2du6eqal
Tags: 1.3.10+dfsg-2
http://bugs.debian.org/621366
* Remove libdb4.8-dev dependency in libaprutil1-dev. This allows packages
  build-depending on apr-util1 to use a different version of db than
  apr-util.
* With the libdb build-dependency decoupled from subversion, we can now
  build-depend on libdb-dev instead of libdb4.8-dev. Users of APU_WANT_DB
  in apu_want.h would have to depend on libdb-dev explicitly, but there
  are none outside of apr-util itself. Closes: #621366
* Add configure support for libdb 5.1.
* Bump standards version to 3.9.2 (no changes)
* Fix some lintian warnings about the short descriptions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/016_bdb5.1.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
@DPATCH@
 
3
 
 
4
commit fbda7d702df7b50f7f8e4bc1c6de271c9972da5c
 
5
Author: Rainer Jung <rjung@apache.org>
 
6
Date:   Sat Oct 2 12:36:37 2010 +0000
 
7
 
 
8
    Add support for Berkeley DB 5.1.
 
9
    
 
10
    
 
11
    git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x@1003788 13f79535-47bb-0310-9956-ffa450edef68
 
12
 
 
13
diff --git a/build/dbm.m4 b/build/dbm.m4
 
14
index 0700684..1b229f4 100644
 
15
--- a/build/dbm.m4
 
16
+++ b/build/dbm.m4
 
17
@@ -560,6 +560,25 @@ AC_DEFUN([APU_CHECK_DB50], [
 
18
     apu_db_version=5
 
19
   fi
 
20
 ])
 
21
+dnl
 
22
+dnl APU_CHECK_DB51: is DB5.1 present?
 
23
+dnl
 
24
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
 
25
+dnl
 
26
+AC_DEFUN([APU_CHECK_DB51], [
 
27
+  places=$1
 
28
+  if test -z "$places"; then
 
29
+    places="std /usr/local/BerkeleyDB.5.1 /boot/home/config"
 
30
+  fi
 
31
+  APU_CHECK_BERKELEY_DB("5", "1", "-1",
 
32
+    "$places",
 
33
+    "db51/db.h db5/db.h db.h",
 
34
+    "db-5.1 db5-5.1 db51 db5 db"
 
35
+  )
 
36
+  if test "$apu_have_db" = "1"; then
 
37
+    apu_db_version=5
 
38
+  fi
 
39
+])
 
40
 
 
41
 AC_DEFUN([APU_CHECK_DB], [
 
42
   requested=$1
 
43
@@ -656,6 +675,12 @@ AC_DEFUN([APU_CHECK_DB], [
 
44
       AC_MSG_ERROR(Berkeley db5 not found)
 
45
     fi
 
46
     ;;
 
47
+  db51)
 
48
+    APU_CHECK_DB51("$check_places")
 
49
+    if test "$apu_db_version" != "5"; then
 
50
+      AC_MSG_ERROR(Berkeley db5 not found)
 
51
+    fi
 
52
+    ;;
 
53
   default)
 
54
     APU_CHECK_DB_ALL("$check_places")
 
55
     ;;
 
56
@@ -663,38 +688,41 @@ AC_DEFUN([APU_CHECK_DB], [
 
57
 ])
 
58
 
 
59
 dnl
 
60
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1.
 
61
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1.
 
62
 dnl
 
63
 AC_DEFUN([APU_CHECK_DB_ALL], [
 
64
   all_places=$1
 
65
  
 
66
-  APU_CHECK_DB50("$all_places")
 
67
+  APU_CHECK_DB51("$all_places")
 
68
   if test "$apu_db_version" != "5"; then
 
69
-    APU_CHECK_DB48("$all_places")
 
70
-    if test "$apu_db_version" != "4"; then
 
71
-      APU_CHECK_DB47("$all_places")
 
72
+    APU_CHECK_DB50("$all_places")
 
73
+    if test "$apu_db_version" != "5"; then
 
74
+      APU_CHECK_DB48("$all_places")
 
75
       if test "$apu_db_version" != "4"; then
 
76
-        APU_CHECK_DB46("$all_places")
 
77
+        APU_CHECK_DB47("$all_places")
 
78
         if test "$apu_db_version" != "4"; then
 
79
-          APU_CHECK_DB45("$all_places")
 
80
+          APU_CHECK_DB46("$all_places")
 
81
           if test "$apu_db_version" != "4"; then
 
82
-            APU_CHECK_DB44("$all_places")
 
83
+            APU_CHECK_DB45("$all_places")
 
84
             if test "$apu_db_version" != "4"; then
 
85
-              APU_CHECK_DB43("$all_places")
 
86
+              APU_CHECK_DB44("$all_places")
 
87
               if test "$apu_db_version" != "4"; then
 
88
-                APU_CHECK_DB42("$all_places")
 
89
+                APU_CHECK_DB43("$all_places")
 
90
                 if test "$apu_db_version" != "4"; then
 
91
-                  APU_CHECK_DB41("$all_places")
 
92
+                  APU_CHECK_DB42("$all_places")
 
93
                   if test "$apu_db_version" != "4"; then
 
94
-                    APU_CHECK_DB4("$all_places")
 
95
+                    APU_CHECK_DB41("$all_places")
 
96
                     if test "$apu_db_version" != "4"; then
 
97
-                      APU_CHECK_DB3("$all_places")
 
98
-                      if test "$apu_db_version" != "3"; then
 
99
-                        APU_CHECK_DB2("$all_places")
 
100
-                        if test "$apu_db_version" != "2"; then
 
101
-                          APU_CHECK_DB1("$all_places")
 
102
-                          if test "$apu_db_version" != "1"; then
 
103
-                            APU_CHECK_DB185("$all_places")
 
104
+                      APU_CHECK_DB4("$all_places")
 
105
+                      if test "$apu_db_version" != "4"; then
 
106
+                        APU_CHECK_DB3("$all_places")
 
107
+                        if test "$apu_db_version" != "3"; then
 
108
+                          APU_CHECK_DB2("$all_places")
 
109
+                          if test "$apu_db_version" != "2"; then
 
110
+                            APU_CHECK_DB1("$all_places")
 
111
+                            if test "$apu_db_version" != "1"; then
 
112
+                              APU_CHECK_DB185("$all_places")
 
113
+                            fi
 
114
                           fi
 
115
                         fi
 
116
                       fi
 
117
@@ -735,11 +763,11 @@ AC_DEFUN([APU_CHECK_DBM], [
 
118
   apu_db_version=0
 
119
 
 
120
   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
 
121
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
 
122
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])],
 
123
   [
 
124
     if test "$withval" = "yes"; then
 
125
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
 
126
-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
 
127
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
 
128
     fi
 
129
     requested="$withval"
 
130
   ], [
 
131
@@ -946,6 +974,10 @@ AC_DEFUN([APU_CHECK_DBM], [
 
132
       apu_use_db=1
 
133
       apu_default_dbm=db5
 
134
       ;;
 
135
+    db51)
 
136
+      apu_use_db=1
 
137
+      apu_default_dbm=db5
 
138
+      ;;
 
139
     default)
 
140
       dnl ### use more sophisticated DBMs for the default?
 
141
       apu_default_dbm="sdbm (default)"
 
142
@@ -953,7 +985,7 @@ AC_DEFUN([APU_CHECK_DBM], [
 
143
       ;;
 
144
     *)
 
145
       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
 
146
-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
 
147
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
 
148
       ;;
 
149
   esac
 
150