sync Makefiles (unused)opensmtpd-5.4.4p1

3 files changed, 24 insertions, 53 deletions

diff --git a/smtpd/makemap/Makefile b/smtpd/makemap/Makefile
index 904a89d8..a3aa3f00 100644
--- a/smtpd/makemap/Makefile
+++ b/smtpd/makemap/Makefile
@@ -2,8 +2,6 @@
 
 .PATH:		${.CURDIR}/..
 
-NEED_REALLOCARRAY!=	grep -q reallocarray /usr/include/stdlib.h && echo No || echo Yes
-
 PROG=	makemap
 BINOWN=	root
 
@@ -38,11 +36,6 @@ SRCS+=		table_db.c
 SRCS+=		table_getpwnam.c
 SRCS+=		table_proc.c
 
-.if ${NEED_REALLOCARRAY} == "Yes"
-CFLAGS+=	-DNEED_REALLOCARRAY
-SRCS+=		reallocarray.c
-.endif
-
 DPADD+= ${LIBUTIL} ${LIBCRYPTO} ${LIBZ}
 LDADD+= -lutil -lcrypto -lz
 .include <bsd.prog.mk>
diff --git a/smtpd/smtpctl/Makefile b/smtpd/smtpctl/Makefile
index 50b2e02f..44eef46f 100644
--- a/smtpd/smtpctl/Makefile
+++ b/smtpd/smtpctl/Makefile
@@ -2,9 +2,6 @@
 
 .PATH:		${.CURDIR}/..
 
-NEED_REALLOCARRAY!=	grep -q reallocarray /usr/include/stdlib.h && echo No || echo Yes
-NEED_ERRC!=		grep -q errc /usr/include/err.h && echo No || echo Yes
-
 PROG=	smtpctl
 BINOWN=	root
 
@@ -35,15 +32,6 @@ SRCS+=		expand.c
 SRCS+=		tree.c
 SRCS+=		dict.c
 
-.if ${NEED_REALLOCARRAY} == "Yes"
-CFLAGS+=	-DNEED_REALLOCARRAY
-SRCS+=		reallocarray.c
-.endif
-.if ${NEED_ERRC} == "Yes"
-CFLAGS+=	-DNEED_ERRC
-SRCS+=		errc.c
-.endif
-
 LDADD+=	-lutil -lz -lcrypto
 DPADD+=	${LIBUTIL} ${LIBZ} ${LIBCRYPTO}
 .include <bsd.prog.mk>
diff --git a/smtpd/smtpd/Makefile b/smtpd/smtpd/Makefile
index 9b6baccc..3475c9eb 100644
--- a/smtpd/smtpd/Makefile
+++ b/smtpd/smtpd/Makefile
@@ -1,10 +1,15 @@
 #	$OpenBSD$
 
-ASRDIR=		${.CURDIR}/../asr
-.PATH:		${.CURDIR}/.. ${ASRDIR}
+.PATH:		${.CURDIR}/.. /usr/src/lib/libc/asr
 
-NEED_ASR!=		grep -q AI_ADDRCONF /usr/include/netdb.h && echo No || echo Yes
-NEED_REALLOCARRAY!=	grep -q reallocarray /usr/include/stdlib.h && echo No || echo Yes
+# detect if asr is built in libc
+TESTASR!=	nm `ls /usr/lib/libc.so.* | sort | tail -1` | grep "T asr_unpack_rr" | cut -d ' ' -f 3
+.if ${TESTASR} != "asr_unpack_rr"
+NEED_ASR=	Yes
+.endif
+
+# we're in a transitional phase, we *always* need the shipped in ASR for now
+NEED_ASR=	Yes
 
 PROG=		smtpd
 
@@ -29,6 +34,8 @@ SRCS+=		lka.c
 SRCS+=		lka_session.c
 SRCS+=		log.c
 SRCS+=		mda.c
+#SRCS+=		mfa.c
+#SRCS+=		mfa_session.c
 SRCS+=		mproc.c
 SRCS+=		mta.c
 SRCS+=		mta_session.c
@@ -36,10 +43,6 @@ SRCS+=		parse.y
 SRCS+=		pony.c
 SRCS+=		queue.c
 SRCS+=		queue_backend.c
-.if ${NEED_REALLOCARRAY} == "Yes"
-CFLAGS+=	-DNEED_REALLOCARRAY
-SRCS+=		reallocarray.c
-.endif
 SRCS+=		rfc2822.c
 SRCS+=		ruleset.c
 SRCS+=		runq.c
@@ -83,31 +86,15 @@ SRCS+=		scheduler_proc.c
 
 SRCS+=		stat_ramstat.c
 
-.if ${NEED_ASR} == "Yes"
-CFLAGS+=	-I${ASRDIR}
-SRCS+=	asr.c
-SRCS+=	asr_debug.c
-SRCS+=	asr_private.h
-SRCS+=	asr_utils.c
-SRCS+=	getaddrinfo.c
-SRCS+=	getaddrinfo_async.c
-SRCS+=	gethostnamadr.c
-SRCS+=	gethostnamadr_async.c
-SRCS+=	getnameinfo.c
-SRCS+=	getnameinfo_async.c
-SRCS+=	getnetnamadr.c
-SRCS+=	getnetnamadr_async.c
-SRCS+=	getrrsetbyname.c
-SRCS+=	getrrsetbyname_async.c
-SRCS+=	res_debug.c
-SRCS+=	res_init.c
-SRCS+=	res_mkquery.c
-SRCS+=	res_query.c
-SRCS+=	res_search_async.c
-SRCS+=	res_send.c
-SRCS+=	res_send_async.c
-SRCS+=	sethostent.c
-SRCS+=	event_asr_run.c
+.ifdef NEED_ASR
+SRCS+=		asr.c
+SRCS+=		asr_debug.c
+SRCS+=		asr_utils.c
+SRCS+=		gethostnamadr_async.c
+SRCS+=		res_send_async.c
+SRCS+=		getaddrinfo_async.c
+SRCS+=		getnameinfo_async.c
+SRCS+=		res_search_async.c
 .endif
 
 MAN=		smtpd.8 smtpd.conf.5 table.5
@@ -115,7 +102,7 @@ BINDIR=		/usr/sbin
 
 LDADD+=		-levent -lutil -lssl -lcrypto -lm -lz
 DPADD+=		${LIBEVENT} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBM} ${LIBZ}
-CFLAGS+=	-g3 -ggdb -I${.CURDIR}/..
+CFLAGS+=	-g3 -ggdb -I${.CURDIR}/.. -I/usr/src/lib/libc/asr
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
 CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual
@@ -123,6 +110,9 @@ CFLAGS+=	-Wsign-compare -Wbounded
 #CFLAGS+=	-Werror # during development phase (breaks some archs)
 CFLAGS+=	-DIO_SSL
 CFLAGS+=	-DQUEUE_PROFILING
+.ifdef NEED_ASR
+CFLAGS+=	-DASR_OPT_THREADSAFE=0
+.endif
 YFLAGS=
 
 .include <bsd.prog.mk>