Finally a libdb autoconf test that has a chance of working..

diff --git a/configure.in b/configure.in
index c5c628b4b3beedbc0904876c4eafc701d1289e85..b05c48a1489e550d11dea6ad679207d18b722d2f 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.400 2006/03/20 23:07:48 hno Exp $
+dnl  $Id: configure.in,v 1.401 2006/03/20 23:38:23 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.400 $)dnl
+AC_REVISION($Revision: 1.401 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2182,8 +2182,12 @@ AC_SUBST(LIB_LBER)
 
 dnl Check for libdb
 DBLIB=
-AC_CHECK_LIB(dbopen, db, [LIBDB="-ldb"])
-AC_SUBST(LIBDB)
+dnl 1.85
+AC_CHECK_LIB(db, dbopen, [LIB_DB="-ldb"])
+dnl more current ones..
+AC_CHECK_LIB(db, db_open, [LIB_DB="-ldb"])
+AC_CHECK_LIB(db, __db185_open, [LIB_DB="-ldb"])
+AC_SUBST(LIB_DB)
 
 dnl System-specific library modifications
 dnl

diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am
index c303c7ba5b389a218fc238de209208f7d4ceec09..a7e32727232113f39e3c993e351e07f98afc8fad 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.2 2006/03/20 23:03:16 hno Exp $
+#  $Id: Makefile.am,v 1.3 2006/03/20 23:38:23 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,5 +11,6 @@ man_MANS                      = squid_session.8
 EXTRA_DIST                     = squid_session.8
 squid_session_SOURCES          = squid_session.c
 
-LDADD          = $(LIBDB}
+LDADD = $(LIB_DB) 
+
 INCLUDES       = -I. -I$(top_builddir)/include -I$(top_srcdir)/include