Module Name: src
Committed By: christos
Date: Sun Feb 13 05:12:55 UTC 2011
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
Log Message:
change the variable to USE_LIB_SASL that can be set to saslc or cyrus
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/ibm-public/postfix/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.6 src/external/ibm-public/postfix/Makefile.inc:1.7
--- src/external/ibm-public/postfix/Makefile.inc:1.6 Sat Feb 12 20:53:50 2011
+++ src/external/ibm-public/postfix/Makefile.inc Sun Feb 13 00:12:55 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.6 2011/02/13 01:53:50 christos Exp $
+# $NetBSD: Makefile.inc,v 1.7 2011/02/13 05:12:55 christos Exp $
.include <bsd.own.mk>
USE_FORT?= yes # network client and server
-USE_LIB_SASLC?= yes
+USE_LIB_SASL?= saslc
PKGROOT?= /usr/pkg
WARNS?= 0
@@ -17,7 +17,7 @@
-I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \
-I${PFIX_DISTDIR}/src/xsasl
-.if ${USE_LIB_SASLC} != "no"
+.if ${USE_LIB_SASL} == "sasl"
CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_SASLC_SASL
.if (${MKCRYPTO} != "mo")
DPADD+= ${LIBSASCL} ${LIBSSL}
@@ -27,7 +27,7 @@
LDADD+= -lgssapi
.endif
.endif
-.elif defined(HAVE_CYRUS_SASL)
+.elif ${USE_LIB_SASL} == "cyrus"
CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \
-DDEF_SERVER_SASL_TYPE=\"cyrus\" \
-I${PKGROOT}/include/sasl
