blob: 2304c5f1dd08ae87d5277d365758c15b6ff1b962 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From 0d5b337ff5ef7dd48f970f08bd95d6327917cfd1 Mon Sep 17 00:00:00 2001
Message-Id: <0d5b337ff5ef7dd48f970f08bd95d6327917cfd1.1382375807.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 21 Oct 2013 12:50:44 -0400
Subject: [PATCH 1/1] Fix flawed dynamic -ldb link test in configure
The test uses dbopen, but just ignores the fact
that this function may not exist in the db version
used. This leads to the dynamic link test failing
and the configure script just making assumptions
about why and setting the need for -ldb incorrectly.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
configure.ac | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 962a748..42e6a93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3051,8 +3051,16 @@ AC_CHECK_DECL(dbopen,,,[
#include <db.h>
#endif])
-dnl 1.85
-SQUID_CHECK_DBOPEN_NEEDS_LIBDB
+if test "x$ac_cv_have_decl_dbopen" = "xyes"; then
+ dnl 1.85
+ SQUID_CHECK_DBOPEN_NEEDS_LIBDB
+else
+ # dbopen isn't there. So instead of running a compile/link test that
+ # uses it and is thus guaranteed to fail, we just assume that we will
+ # need to link in the db library, rather than fabricate some other
+ # dynamic compile/link test.
+ ac_cv_dbopen_libdb="yes"
+fi
if test "x$ac_cv_dbopen_libdb" = "xyes"; then
LIB_DB="-ldb"
fi
--
1.7.4.1
|
