summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbalmer <mbalmer@openbsd.org>2006-02-04 09:46:23 +0000
committermbalmer <mbalmer@openbsd.org>2006-02-04 09:46:23 +0000
commit2d72db0a435d6918646d113f717a2e82233a998d (patch)
treef63a1006ebb15bc481dd77a8bb77c325e99910d9
parent- document that svnd0 must not be configured when making release (diff)
downloadwireguard-openbsd-2d72db0a435d6918646d113f717a2e82233a998d.tar.xz
wireguard-openbsd-2d72db0a435d6918646d113f717a2e82233a998d.zip
Don't link libmilter against libldap and liblber if WANT_LDAP is defined
in /etc/mk.conf. Fixes PR 4928 ok millert
-rw-r--r--gnu/usr.sbin/sendmail/Makefile.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/usr.sbin/sendmail/Makefile.inc b/gnu/usr.sbin/sendmail/Makefile.inc
index bc39cc4e6f2..7f00b4e983b 100644
--- a/gnu/usr.sbin/sendmail/Makefile.inc
+++ b/gnu/usr.sbin/sendmail/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.16 2004/06/24 03:59:23 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2006/02/04 09:46:23 mbalmer Exp $
.include <bsd.own.mk>
.include <bsd.obj.mk>
@@ -55,10 +55,12 @@ LDADD+= -lwrap
# To build with LDAP map support define WANT_LDAP in /etc/mk.conf (unsupported)
.if defined(WANT_LDAP)
+.if !defined(LIB) || (${LIB} != "milter")
ENVDEF+= -DLDAPMAP
LDADD+=-lldap -llber
CFLAGS+=-I/usr/local/include
LDFLAGS+=-L/usr/local/lib
.endif
+.endif
CFLAGS+=${ENVDEF} -I${.CURDIR}/../sendmail -I${.CURDIR}/../include