| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 0d5b337ff5ef7dd48f970f08bd95d6327917cfd1 Mon Sep 17 00:00:00 2001 |
| 2 | Message-Id: <0d5b337ff5ef7dd48f970f08bd95d6327917cfd1.1382375807.git.Jim.Somerville@windriver.com> |
| 3 | From: Jim Somerville <Jim.Somerville@windriver.com> |
| 4 | Date: Mon, 21 Oct 2013 12:50:44 -0400 |
| 5 | Subject: [PATCH 1/1] Fix flawed dynamic -ldb link test in configure |
| 6 | |
| 7 | The test uses dbopen, but just ignores the fact |
| 8 | that this function may not exist in the db version |
| 9 | used. This leads to the dynamic link test failing |
| 10 | and the configure script just making assumptions |
| 11 | about why and setting the need for -ldb incorrectly. |
| 12 | |
| 13 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
| 14 | --- |
| 15 | configure.ac | 12 ++++++++++-- |
| 16 | 1 files changed, 10 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/configure.ac b/configure.ac |
| 19 | index 962a748..42e6a93 100644 |
| 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac |
| 22 | @@ -3051,8 +3051,16 @@ AC_CHECK_DECL(dbopen,,,[ |
| 23 | #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 |
| 41 | -- |
| 42 | 1.7.4.1 |
| 43 | |