Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 6454b519dfaec8b8321aae5b3f091f2b > files > 11

squid-3.0-8mdv2009.0.src.rpm

diff -Naurp squid-3.0.STABLE1/configure.in squid-3.0.STABLE1.oden/configure.in
--- squid-3.0.STABLE1/configure.in	2007-12-14 01:25:27.000000000 +0100
+++ squid-3.0.STABLE1.oden/configure.in	2008-01-27 19:38:23.000000000 +0100
@@ -2345,7 +2345,7 @@ AC_SUBST(LIB_LDAP)
 AC_SUBST(LIB_LBER)
 
 dnl Check for libdb
-DBLIB=
+LIB_DB=
 dnl 1.85
 AC_CACHE_CHECK(if dbopen needs -ldb,ac_cv_dbopen_libdb, [
 SAVED_LIBS="$LIBS"; LIBS="$LIBS -ldb"
@@ -2357,9 +2357,9 @@ SAVED_LIBS="$LIBS"; LIBS="$LIBS -ldb"
 #include <limits.h>
 #endif
 #if HAVE_DB_185_H
-#include <db_185.h>
+#include <db4/db_185.h>
 #elif HAVE_DB_H
-#include <db.h>
+#include <db4/db.h>
 #endif],
     [dbopen((void *)0L, 0, 0, DB_HASH, (void *)0L)],
     ac_cv_dbopen_libdb="yes",
diff -Naurp squid-3.0.STABLE1/helpers/external_acl/session/Makefile.am squid-3.0.STABLE1.oden/helpers/external_acl/session/Makefile.am
--- squid-3.0.STABLE1/helpers/external_acl/session/Makefile.am	2006-03-21 00:38:23.000000000 +0100
+++ squid-3.0.STABLE1.oden/helpers/external_acl/session/Makefile.am	2008-01-27 19:38:23.000000000 +0100
@@ -11,6 +11,6 @@ man_MANS 			= squid_session.8
 EXTRA_DIST			= squid_session.8
 squid_session_SOURCES		= squid_session.c
 
-LDADD = $(LIB_DB) 
+LDADD = -ldb
 
 INCLUDES	= -I. -I$(top_builddir)/include -I$(top_srcdir)/include
diff -Naurp squid-3.0.STABLE1/helpers/external_acl/session/squid_session.c squid-3.0.STABLE1.oden/helpers/external_acl/session/squid_session.c
--- squid-3.0.STABLE1/helpers/external_acl/session/squid_session.c	2006-03-20 04:46:17.000000000 +0100
+++ squid-3.0.STABLE1.oden/helpers/external_acl/session/squid_session.c	2008-01-27 19:38:23.000000000 +0100
@@ -31,13 +31,7 @@
 #include <string.h>
 #include <time.h>
 
-#if defined(HAVE_DB_185_H)
-#include <db_185.h>
-#elif defined(HAVE_DB_H)
-#include <db.h>
-#else
-#include <db_185.h>
-#endif
+#include <db4/db_185.h>
 
 static int session_ttl = 3600;
 char *db_path = NULL;