From 9bfb656b5bfaa8754fc65ebd7772293347d5c8be Mon Sep 17 00:00:00 2001
From: nyan <nyan@FreeBSD.org>
Date: Mon, 14 Jan 2019 06:34:54 +0000
Subject: [PATCH] Use ${SRCTOP}/contrib/com_err/com_err.h instead of the
 installed com_err.h. This fixes build when com_err.h is not installed.

PR:		234691
MFC after:	1 week
---
 kerberos5/lib/libasn1/Makefile              | 3 ++-
 kerberos5/lib/libgssapi_krb5/Makefile       | 4 +++-
 kerberos5/lib/libhdb/Makefile               | 1 +
 kerberos5/lib/libheimntlm/Makefile          | 3 ++-
 kerberos5/lib/libhx509/Makefile             | 4 +++-
 kerberos5/lib/libkadm5clnt/Makefile         | 3 ++-
 kerberos5/lib/libkadm5srv/Makefile          | 3 ++-
 kerberos5/lib/libkdc/Makefile               | 3 ++-
 kerberos5/lib/libkrb5/Makefile              | 4 +++-
 kerberos5/lib/libwind/Makefile              | 2 +-
 kerberos5/libexec/digest-service/Makefile   | 3 ++-
 kerberos5/libexec/hprop/Makefile            | 1 +
 kerberos5/libexec/hpropd/Makefile           | 2 +-
 kerberos5/libexec/kadmind/Makefile          | 2 +-
 kerberos5/libexec/kdc/Makefile              | 2 +-
 kerberos5/usr.bin/hxtool/Makefile           | 4 +++-
 kerberos5/usr.bin/kadmin/Makefile           | 2 +-
 kerberos5/usr.bin/string2key/Makefile       | 3 ++-
 kerberos5/usr.bin/verify_krb5_conf/Makefile | 3 ++-
 kerberos5/usr.sbin/kstash/Makefile          | 2 +-
 20 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index d9594392cb76..f75445e47f63 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -21,7 +21,8 @@ SRCS=	asn1_err.c \
 	timegm.c \
 	${GEN:S/.x$/.c/:S/.hx$/.h/}
 
-CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+	-I${SRCTOP}/contrib/com_err -I.
 
 GEN_RFC2459=	asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx
 GEN_CMS= 	asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile
index 905b824d0a57..9ba59dcb48c5 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile
+++ b/kerberos5/lib/libgssapi_krb5/Makefile
@@ -78,7 +78,9 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5
 CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
 CFLAGS+=-I${KRB5DIR}/lib/krb5
 CFLAGS+=-I${KRB5DIR}/lib/asn1
-CFLAGS+=-I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/roken
+CFLAGS+=-I${SRCTOP}/contrib/com_err
+CFLAGS+=-I.
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index df67359404c6..29ba7d2c58a2 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -59,6 +59,7 @@ SRCS=	common.c \
 CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \
 	-I${KRB5DIR}/lib/krb5 \
+	-I${SRCTOP}/contrib/com_err \
 	-I. ${LDAPCFLAGS}
 CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
 
diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile
index bcb45f3b8f0c..148aa8df1f70 100644
--- a/kerberos5/lib/libheimntlm/Makefile
+++ b/kerberos5/lib/libheimntlm/Makefile
@@ -5,7 +5,8 @@ LDFLAGS=	-Wl,--no-undefined
 LIBADD=	crypto com_err krb5 roken
 SRCS=	ntlm.c ntlm_err.c ntlm_err.h
 INCS=	heimntlm.h heimntlm-protos.h ntlm_err.h
-CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken
+CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken \
+	-I${SRCTOP}/contrib/com_err
 VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map
 
 MAN=	ntlm_buf.3 \
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
index 553eac13f0e9..1696ffb73cb8 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -211,7 +211,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
 CFLAGS+=-I${KRB5DIR}/lib/asn1
 CFLAGS+=-I${KRB5DIR}/lib/wind
-CFLAGS+=-I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/roken
+CFLAGS+=-I${SRCTOP}/contrib/com_err
+CFLAGS+=-I.
 
 GEN_OCSP= \
 	asn1_OCSPBasicOCSPResponse.x \
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index 1f3401e636d5..fecdf915070e 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -34,7 +34,8 @@ SRCS=	ad.c \
 	rename_c.c \
 	send_recv.c
 
-CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+	-I${SRCTOP}/contrib/com_err -I.
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index adf49a5b1af5..733242ce99af 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -35,7 +35,8 @@ SRCS=	acl.c \
 	set_keys.c \
 	set_modifier.c
 
-CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+	-I${SRCTOP}/contrib/com_err -I.
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile
index 14b0797e2738..24267a8dd419 100644
--- a/kerberos5/lib/libkdc/Makefile
+++ b/kerberos5/lib/libkdc/Makefile
@@ -28,7 +28,8 @@ SRCS=	\
 CFLAGS+=	-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/kdc
+		-I${KRB5DIR}/kdc \
+		-I${SRCTOP}/contrib/com_err
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 0eac57c803f0..75e065a2192e 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -621,7 +621,9 @@ CFLAGS+=	-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/ipc \
-		-I${KRB5DIR}/base -I.
+		-I${KRB5DIR}/base \
+		-I${SRCTOP}/contrib/com_err \
+		-I.
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile
index a489566efbb3..0e4fa4303b98 100644
--- a/kerberos5/lib/libwind/Makefile
+++ b/kerberos5/lib/libwind/Makefile
@@ -27,7 +27,7 @@ SRCS=	bidi.c \
 SRCS+=	wind_err.c \
 	wind_err.h
 
-CFLAGS+=-I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/com_err -I.
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 840f2c4d2fec..7b888f5481cd 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -7,7 +7,8 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/ipc \
 		-I${KRB5DIR}/lib/wind \
-		-I${KRB5DIR}/lib/roken
+		-I${KRB5DIR}/lib/roken \
+		-I${SRCTOP}/contrib/com_err
 LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
 LDFLAGS=${LDAPLDFLAGS}
 
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index b267571315f2..1c5d4b20e1bf 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -9,6 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1
 CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/ntlm
 CFLAGS+=-I${KRB5DIR}/kdc
+CFLAGS+=-I${SRCTOP}/contrib/com_err
 CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5
 LIBADD=	hdb krb5 roken vers
 DPADD=	${LDAPDPADD}
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 9f7f9e712838..56a598f08312 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -3,7 +3,7 @@
 PROG=	hpropd
 MAN=	hpropd.8
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
+	-I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
 LIBADD=	hdb krb5 roken vers
 DPADD=	${LDAPDPADD}
 LDADD=	${LDAPLDADD}
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 27200d6d98ca..b2f3f71cc1e8 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -8,7 +8,7 @@ SRCS=	rpc.c \
 	kadm_conn.c
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-	${LDAPCFLAGS}
+	-I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
 LIBADD=	kadm5srv gssapi hdb krb5 roken vers
 DPADD=	${LDAPDPADD}
 LDADD=	${LDAPLDADD}
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index aa4584e4ac7b..338a508de20b 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -9,7 +9,7 @@ SRCS=	config.c \
 	main.c
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
+	-I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
 LIBADD=	kdc hdb krb5 roken crypt vers
 LDFLAGS=${LDAPLDFLAGS}
 
diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile
index af85a446928a..7cec9ee729b1 100644
--- a/kerberos5/usr.bin/hxtool/Makefile
+++ b/kerberos5/usr.bin/hxtool/Makefile
@@ -5,7 +5,9 @@ MAN=
 CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/sl -I.
+		-I${KRB5DIR}/lib/sl \
+		-I${SRCTOP}/contrib/com_err \
+		-I.
 LIBADD=	hx509 roken asn1 crypto sl vers edit
 SRCS=	hxtool.c hxtool-commands.c hxtool-commands.h
 
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index e7aff44c2230..729b9f7f418e 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -25,7 +25,7 @@ SRCS=	add_enctype.c \
 	util.c
 
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS}
+	-I${KRB5DIR}/lib/sl -I${SRCTOP}/contrib/com_err -I. ${LDAPCFLAGS}
 LIBADD=	kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
 DPADD=	${LDAPDPADD}
 LDADD=	${LDAPLDADD}
diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile
index eb7b2043fac0..129d12cbcf0d 100644
--- a/kerberos5/usr.bin/string2key/Makefile
+++ b/kerberos5/usr.bin/string2key/Makefile
@@ -6,7 +6,8 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/windc
+		-I${KRB5DIR}/lib/windc \
+		-I${SRCTOP}/contrib/com_err
 LIBADD=	krb5 roken crypto vers
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
index e4613f4508ae..372870c1ecc9 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@@ -2,7 +2,8 @@
 
 PROG=	verify_krb5_conf
 MAN=	verify_krb5_conf.8
-CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
+	-I${SRCTOP}/contrib/com_err
 LIBADD=	krb5 roken vers
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index d96c96c75121..1eec313766d3 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -3,7 +3,7 @@
 PROG=	kstash
 MAN=	kstash.8
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
+	-I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
 LIBADD=	hdb krb5 crypto vers
 DPADD=	${LDAPDPADD}
 LDADD=	${LDAPLDADD}