From 6713873427a1b38f0b9e6c758a370cff933a2e90 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 26 Nov 2004 02:52:14 +0000
Subject: Teach openldap to use DL_{CFLAGS,LDFLAGS,LIBS} when linking slapd
 when building dynamic backends or when using Cyrus SASL.

---
 databases/openldap/distinfo         |  4 ++--
 databases/openldap/patches/patch-ag | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'databases/openldap')

diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 2793685d8aa..c5075bbd4c6 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.30 2004/11/19 16:35:26 jlam Exp $
+$NetBSD: distinfo,v 1.31 2004/11/26 02:52:14 jlam Exp $
 
 SHA1 (openldap-2.2.18.tgz) = df7b681c2480aea39560b22e8b0c7d118915a8f1
 Size (openldap-2.2.18.tgz) = 2574691 bytes
 SHA1 (patch-ac) = f3d5edf5ddbad93d7a88a6837ea962820fc475ce
 SHA1 (patch-ad) = c49ccf52a60110a6fe16afaff0d327e112216c50
 SHA1 (patch-af) = cd7c9527272dadf4509c4df1388d353378cdba13
-SHA1 (patch-ag) = b2d9b54b9692f0f102b01fcf94a9933a5920523b
+SHA1 (patch-ag) = 4dcbfa758f8c69193a69cb1cc018565a54789939
 SHA1 (patch-ah) = e421d148537c936d76d3bb3cc3cd8f7dfb504c20
 SHA1 (patch-aj) = cb425a00e480ce625332d9e3c56fd9305075fd01
 SHA1 (patch-ak) = 1fd396ea0591fc61a97038bb754a2fd3c9436a48
diff --git a/databases/openldap/patches/patch-ag b/databases/openldap/patches/patch-ag
index 7db247ff5b6..05bd4476f60 100644
--- a/databases/openldap/patches/patch-ag
+++ b/databases/openldap/patches/patch-ag
@@ -1,8 +1,19 @@
-$NetBSD: patch-ag,v 1.2 2004/07/24 03:32:24 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2004/11/26 02:52:14 jlam Exp $
 
---- servers/slapd/Makefile.in.orig	Mon Apr 12 14:07:40 2004
+--- servers/slapd/Makefile.in.orig	2004-07-25 18:31:04.000000000 -0400
 +++ servers/slapd/Makefile.in
-@@ -401,17 +401,14 @@ install-schema: FORCE
+@@ -74,6 +74,10 @@ XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_
+ XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+ XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS)
+ 
++AC_CFLAGS += $(DL_CFLAGS)
++AC_LDFLAGS += $(DL_LDFLAGS)
++AC_LIBS += $(DL_LIBS)
++
+ BUILD_OPT = "--enable-slapd"
+ BUILD_SRV = @BUILD_SLAPD@
+ 
+@@ -401,17 +405,14 @@ install-schema: FORCE
  		else \
  			echo "PRESERVING EXISTING SCHEMA FILE $$SD" ; \
  		fi ; \
-- 
cgit v1.2.3