blob: 25f68aff8fcca375bb66cb35043f53cf68b83915 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From b4943594654cd340b95aabdc2f3750a4705cc0de 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 Bishop316dfdd2018-06-25 12:45:53 -040015 configure.ac | 12 ++++++++++--
16 1 file changed, 10 insertions(+), 2 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050017
18diff --git a/configure.ac b/configure.ac
Brad Bishop316dfdd2018-06-25 12:45:53 -040019index 57cd1ac..3827222 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050020--- a/configure.ac
21+++ b/configure.ac
Brad Bishop316dfdd2018-06-25 12:45:53 -040022@@ -3229,8 +3229,16 @@ AC_CHECK_DECL(dbopen,,,[
Patrick Williamsb48b7b42016-08-17 15:04:38 -050023 #include <db.h>
24 #endif])
25
26-dnl 1.85
27-SQUID_CHECK_DBOPEN_NEEDS_LIBDB
28+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
38 if test "x$ac_cv_dbopen_libdb" = "xyes"; then
39 LIB_DB="-ldb"
40 fi