← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/cyrus-sasl2/gutsy-201105300151

« back to all changes in this revision

Viewing changes to debian/13_libdb42_autotools.diff

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2006-11-27 12:59:40 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20061127125940-na3q3g3tkydvyvgl
Tags: 2.1.22.dfsg1-4ubuntu1
* Merge from debian unstable, remaining changes:
  - remove stop links from rc0 and rc6
  - build against db4.3 instead of 4.2
  - build against heimdal-dev instead of libkrb5-dev
  - depend on, don't recommend, modules

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/13_libdb42_autotools.diff
1
 
diff -Nru3 ./cyrus-sasl-2.1.18/cmulocal/berkdb.m4 ../build-tree.new/cyrus-sasl-2.1.18/cmulocal/berkdb.m4
2
 
--- ./cyrus-sasl-2.1.18/cmulocal/berkdb.m4      2004-02-14 21:13:03.000000000 +0000
3
 
+++ ../build-tree.new/cyrus-sasl-2.1.18/cmulocal/berkdb.m4      2004-07-04 12:42:28.000000000 +0100
4
 
@@ -211,11 +211,13 @@
5
 
            BDB_LIBADD=""
6
 
        fi
7
 
 
8
 
-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
9
 
-          do
10
 
-            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
11
 
-              dblib="berkeley"; break, dblib="no")
12
 
-          done
13
 
+#        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
14
 
+#          do
15
 
+#            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
16
 
+#              dblib="berkeley"; break, dblib="no")
17
 
+#          done
18
 
+        BDB_LIBADD="$BDB_LIBADD -ldb-4.2";
19
 
+       dblib="berkeley";
20
 
         if test "$dblib" = "no"; then
21
 
           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
22
 
             dblib="berkeley"; dbname=db,