Autoconf test for -ldb

diff --git a/configure.in b/configure.in
index f213f7ecea8049dfe4ab17fa67092ecc3fc60e8f..1bba95fbe5a152d918c687af0e71d9d46dc3472d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.398 2006/03/20 03:44:34 hno Exp $
+dnl  $Id: configure.in,v 1.399 2006/03/20 23:03:16 hno Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.398 $)dnl
+AC_REVISION($Revision: 1.399 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2180,6 +2180,11 @@ esac
 AC_SUBST(LIB_LDAP)
 AC_SUBST(LIB_LBER)
 
+dnl Check for libdb
+DBLIB=
+AC_CHECK_LIB(dbopen, db, [DBLIB="-ldb"])
+AC_SUBST(DBLIB)
+
 dnl System-specific library modifications
 dnl
 case "$host" in

diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am
index f1f0925146e6707878ca770101787576bb497dcc..c303c7ba5b389a218fc238de209208f7d4ceec09 100644 (file)
--- a/helpers/external_acl/session/Makefile.am
+++ b/helpers/external_acl/session/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.am,v 1.1 2006/03/19 01:11:44 hno Exp $
+#  $Id: Makefile.am,v 1.2 2006/03/20 23:03:16 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,5 +11,5 @@ man_MANS                      = squid_session.8
 EXTRA_DIST                     = squid_session.8
 squid_session_SOURCES          = squid_session.c
 
-LDADD          = -ldb
+LDADD          = $(LIBDB}
 INCLUDES       = -I. -I$(top_builddir)/include -I$(top_srcdir)/include

diff --git a/helpers/external_acl/session/config.test b/helpers/external_acl/session/config.test
index eb3d6afb7a7454f3e63c79dd558f27ad4785e80e..2f7dc7ddfd4bdd9fb3d9103a81cd8b8ad9df9dc3 100755 (executable)
--- a/helpers/external_acl/session/config.test
+++ b/helpers/external_acl/session/config.test
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-# Need a little more autoconf magic before enabling this. Some systems
-# have db 1.85 in libc but the makefile currently assumes -ldb is needed..
-exit 1
-
 # Actual intended test
 if [ -f /usr/include/db_185.h ]; then
     exit 0