blob: 738e609c05dca0a8d97b9fbc02c93630ad74bec2 [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---
Patrick Williams520786c2023-06-25 16:20:36 -050015Upstream-Status: Pending
16
Brad Bishopc342db32019-05-15 21:57:59 -040017 configure.ac | 10 ++++++++++
18 1 file changed, 10 insertions(+)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050019
20diff --git a/configure.ac b/configure.ac
Brad Bishopc342db32019-05-15 21:57:59 -040021index d2f7feb..c7ae568 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050022--- a/configure.ac
23+++ b/configure.ac
Andrew Geissler87f5cff2022-09-30 13:13:31 -050024@@ -3268,6 +3268,16 @@ case "$host" in
Brad Bishopc342db32019-05-15 21:57:59 -040025 ;;
26 esac
Patrick Williamsb48b7b42016-08-17 15:04:38 -050027
Patrick Williamsb48b7b42016-08-17 15:04:38 -050028+if test "x$ac_cv_have_decl_dbopen" = "xyes"; then
29+ dnl 1.85
30+ SQUID_CHECK_DBOPEN_NEEDS_LIBDB
31+else
32+ # dbopen isn't there. So instead of running a compile/link test that
33+ # uses it and is thus guaranteed to fail, we just assume that we will
34+ # need to link in the db library, rather than fabricate some other
35+ # dynamic compile/link test.
36+ ac_cv_dbopen_libdb="yes"
37+fi
Brad Bishopc342db32019-05-15 21:57:59 -040038 dnl System-specific library modifications
39 dnl
40 case "$host" in