On Sun, Feb 13, 2011 at 09:37:12PM +0000, Christos Zoulas wrote: > >Do we really want to support "USE_LIB_SASL=cyrus"? Linking stuff in > >base again libraries from "pkgsrc" sounds like a big hack to me and > >will e.g. break cross compiling. > I did not put it there, I found it there.
As far as I can tell you added it in revision 1.3: Index: Makefile.inc =================================================================== RCS file: /cvsroot/src/external/ibm-public/postfix/Makefile.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.inc 25 Jun 2009 18:21:50 -0000 1.2 +++ Makefile.inc 12 Feb 2011 19:07:08 -0000 1.3 @@ -1,20 +1,33 @@ -# $NetBSD: Makefile.inc,v 1.2 2009/06/25 18:21:50 tron Exp $ +# $NetBSD: Makefile.inc,v 1.3 2011/02/12 19:07:08 christos Exp $ .include <bsd.own.mk> USE_FORT?= yes # network client and server +HAVE_LIB_SASLC?= yes WARNS?= 0 PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist -CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\" \ +CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH \ -I${DIST} \ -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \ -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \ -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \ -I${PFIX_DISTDIR}/src/xsasl +.if defined(HAVE_LIB_SASLC) +CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_SASLC_SASL +LDADD+= -lsaslc +.elif defined(HAVE_CYRUS_SASL) +CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \ + -DDEF_SERVER_SASL_TYPE=\"cyrus\" \ + -I/usr/pkg/include/sasl +LDADD+= -lsasl2 -L/usr/pkg/lib -Wl,-R/usr/pkg/lib +.else +CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" +.endif + .if defined(HAVE_PCC) # code uses gcc-specific aggregate dynamic array CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG > And yes there is less reason to use cyrus right now, which is what > the libsaslc project is all about. I agree. Kind regards -- Matthias Scheler http://zhadum.org.uk/