]>
Commit | Line | Data |
---|---|---|
8d013520 PZ |
1 | --- mutt-2.0.6/configure.ac.orig 2021-03-06 19:06:37.000000000 +0000 |
2 | +++ mutt-2.0.6/configure.ac 2021-04-07 17:45:51.050794394 +0000 | |
3 | @@ -1180,16 +1180,16 @@ | |
3982bc1f JB |
4 | AC_MSG_CHECKING([for BerkeleyDB > 4.0]) |
5 | for d in $bdbpfx; do | |
6 | BDB_INCLUDE_DIR="" | |
7 | - BDB_LIB_DIR="" | |
8 | + BDB_LIB_L="" | |
9 | for v in / $BDB_VERSIONS; do | |
10 | if test -r "$d/include/$v/db.h"; then | |
11 | BDB_INCLUDE_DIR="$d/include/$v" | |
12 | - for bdblibdir in "$d/lib/$v" "$d/lib"; do | |
13 | - test -d "$bdblibdir" || continue | |
14 | - BDB_LIB_DIR="$bdblibdir" | |
15 | + for bdblibdir in '' "$d/lib/$v" "$d/lib"; do | |
8d013520 PZ |
16 | + test -z "$bdblibdir" -o -d "$bdblibdir" || continue |
17 | + BDB_LIB_L="${bdblibdir:+-L$bdblibdir}" | |
3982bc1f JB |
18 | for l in `echo $BDB_VERSIONS`; do |
19 | CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR" | |
20 | - LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l" | |
8d013520 | 21 | + LIBS="$OLDLIBS $BDB_LIB_L -l$l" |
c59ea3a3 | 22 | AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
3982bc1f JB |
23 | #include <stdlib.h> |
24 | #include <db.h> | |
8d013520 | 25 | @@ -1212,7 +1212,7 @@ |
3982bc1f JB |
26 | then |
27 | AC_MSG_RESULT(yes) | |
28 | CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR" | |
29 | - LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" | |
30 | + LIBS="$OLDLIBS $BDB_LIB_L -l$BDB_LIB" | |
31 | AC_DEFINE(HAVE_DB4, 1, [Berkeley DB4 Support]) | |
32 | db_found=bdb | |
33 | else |