diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2004-06-01 01:29:42 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2004-06-01 01:29:42 +0000 |
commit | 76a17fc31644dd8ea6914a3b0c7daba6b85fe159 (patch) | |
tree | c05169b8bdcf1b9d61cd5583f11216147af44885 | |
parent | d503c79cad595bd26f835062ce4bb6ef858857eb (diff) | |
download | FreeBSD-src-76a17fc31644dd8ea6914a3b0c7daba6b85fe159.zip FreeBSD-src-76a17fc31644dd8ea6914a3b0c7daba6b85fe159.tar.gz |
Honor NOINET6 and disable IPv6 support in libmilter and sendmail if it
is set.
MFC after: 4 days
-rw-r--r-- | lib/libmilter/Makefile | 6 | ||||
-rw-r--r-- | lib/libsm/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/sendmail/Makefile | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile index d75fcd4..3e89e33 100644 --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -4,9 +4,13 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNETINET6 -DNOT_SENDMAIL -Dsm_snprintf=snprintf +CFLAGS+=-DNOT_SENDMAIL -Dsm_snprintf=snprintf CFLAGS+=-D_THREAD_SAFE +.if !defined(NOINET6) +CFLAGS+=-DNETINET6 +.endif + # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index c8ec07b..56e5ac3 100644 --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -4,7 +4,11 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsm CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNETINET6 -DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL +CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL + +.if !defined(NOINET6) +CFLAGS+=-DNETINET6 +.endif # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 26b2082..c1c8381 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -32,7 +32,11 @@ MAPS= -DMAP_REGEX -DDNSMAP CSTD?= c89 CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I. -CFLAGS+= ${DBMDEF} ${NIS} -DMILTER -DNETINET6 -DTCPWRAPPERS ${MAPS} +CFLAGS+= ${DBMDEF} ${NIS} -DMILTER -DTCPWRAPPERS ${MAPS} + +.if !defined(NOINET6) +CFLAGS+= -DNETINET6 +.endif DPADD= ${LIBUTIL} ${LIBWRAP} LDADD= -lutil -lwrap |