mutt-db.patch

   1 --- mutt-1.5.21/configure.ac.orig       2012-04-06 17:33:23.905605556 +0200
   2 +++ mutt-1.5.21/configure.ac    2012-04-07 07:42:20.793977750 +0200
   3 @@ -985,20 +985,20 @@
   4                  bdbpfx="$bdbpfx $d/$v"
   5              done
   6          done
   7 -        BDB_VERSIONS="db-4 db4 db-5 db5 db-5.2 db5.2 db52 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-4.8 db4.8 db48 db-4.7 db4.7 db47 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 ''"
   8 +        BDB_VERSIONS="db-6.1 db-6.0 db-5.3 db-5.2 db5.2 db52 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-5 db5 db-4.8 db4.8 db48 db-4.7 db4.7 db47 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 db4 db ''"
   9          AC_MSG_CHECKING([for BerkeleyDB > 4.0])
  10          for d in $bdbpfx; do
  11              BDB_INCLUDE_DIR=""
  12 -            BDB_LIB_DIR=""
  13 +            BDB_LIB_L=""
  14              for v in / $BDB_VERSIONS; do
  15                  if test -r "$d/include/$v/db.h"; then
  16                      BDB_INCLUDE_DIR="$d/include/$v"
  17 -                    for bdblibdir in "$d/lib/$v" "$d/lib"; do
  18 -                        test -d "$bdblibdir" || continue
  19 -                        BDB_LIB_DIR="$bdblibdir"
  20 +                    for bdblibdir in '' "$d/lib/$v" "$d/lib"; do
  21 +                        test -z "$bdblibdir" -o -d "$bdblibdir" || continue
  22 +                        BDB_LIB_L="${bdblibdir:+-L$bdblibdir}"
  23                          for l in `echo $BDB_VERSIONS`; do
  24                              CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
  25 -                            LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l"
  26 +                            LIBS="$OLDLIBS $BDB_LIB_L -l$l"
  27                              AC_LINK_IFELSE([AC_LANG_PROGRAM([[
  28                                  #include <stdlib.h>
  29                                  #include <db.h>
  30 @@ -1021,7 +1021,7 @@
  31          then
  32              AC_MSG_RESULT(yes)
  33              CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
  34 -            LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
  35 +            LIBS="$OLDLIBS $BDB_LIB_L -l$BDB_LIB"
  36              AC_DEFINE(HAVE_DB4, 1, [Berkeley DB4 Support])
  37              db_found=bdb
  38          else