blob: 1516bb014b442bdd03b8aea1b84b23998eae8a7d [file] [log] [blame]
Brad Bishopc342db32019-05-15 21:57:59 -04001From b73b802282bf95d214c86ba943c5765ba6930bc1 Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -05002From: Jim Somerville <Jim.Somerville@windriver.com>
3Date: Mon, 21 Oct 2013 12:50:44 -0400
Brad Bishop316dfdd2018-06-25 12:45:53 -04004Subject: [PATCH] Fix flawed dynamic -ldb link test in configure
Patrick Williamsb48b7b42016-08-17 15:04:38 -05005
6The test uses dbopen, but just ignores the fact
7that this function may not exist in the db version
8used. This leads to the dynamic link test failing
9and the configure script just making assumptions
10about why and setting the need for -ldb incorrectly.
11
12Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -040013
Patrick Williamsb48b7b42016-08-17 15:04:38 -050014---
Brad Bishopc342db32019-05-15 21:57:59 -040015 configure.ac | 10 ++++++++++
16 1 file changed, 10 insertions(+)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050017
18diff --git a/configure.ac b/configure.ac
Brad Bishopc342db32019-05-15 21:57:59 -040019index d2f7feb..c7ae568 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050020--- a/configure.ac
21+++ b/configure.ac
Brad Bishopc342db32019-05-15 21:57:59 -040022@@ -3235,6 +3235,16 @@ case "$host" in
23 ;;
24 esac
Patrick Williamsb48b7b42016-08-17 15:04:38 -050025
Patrick Williamsb48b7b42016-08-17 15:04:38 -050026+if test "x$ac_cv_have_decl_dbopen" = "xyes"; then
27+ dnl 1.85
28+ SQUID_CHECK_DBOPEN_NEEDS_LIBDB
29+else
30+ # dbopen isn't there. So instead of running a compile/link test that
31+ # uses it and is thus guaranteed to fail, we just assume that we will
32+ # need to link in the db library, rather than fabricate some other
33+ # dynamic compile/link test.
34+ ac_cv_dbopen_libdb="yes"
35+fi
Brad Bishopc342db32019-05-15 21:57:59 -040036 dnl System-specific library modifications
37 dnl
38 case "$host" in