cyrus-imapd-verifydbver.patch

   1 --- cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4~    2007-08-15 20:18:01.000000000 +0300
   2 +++ cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4     2008-09-24 01:07:28.790721366 +0300
   3 @@ -216,13 +216,29 @@
   4          for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 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
   5            do
   6             LIBS="$saved_LIBS -l$dbname"
   7 -           AC_TRY_LINK([#include <stdio.h>
   8 -#include <db.h>],
   9 -           [db_create(NULL, NULL, 0);],
  10 +           dnl check that the header / library matches
  11 +           AC_RUN_IFELSE([
  12 +                   #include <db.h>
  13 +
  14 +                   int main() {
  15 +                   DB *db;
  16 +                   db_create(&db, NULL, 0);
  17 +                   int major, minor;
  18 +
  19 +                   db_version(&major, &minor, NULL);
  20 +                   if (major == DB_VERSION_MAJOR && minor == DB_VERSION_MINOR) {
  21 +                       exit(0);
  22 +                   } else {
  23 +                       exit(1);
  24 +                   }
  25 +               }
  26 +           ],
  27             BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
  28 -            dblib="no")
  29 +            dblib="no"
  30 +           )
  31             if test "$dblib" = "berkeley"; then break; fi
  32            done
  33 +
  34          if test "$dblib" = "no"; then
  35             LIBS="$saved_LIBS -ldb"
  36             AC_TRY_LINK([#include <stdio.h>