Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libkrb5 Detect if MIT Kerberos V headers are present on ...



details:   https://anonhg.NetBSD.org/src/rev/05162f6757a9
branches:  trunk
changeset: 488171:05162f6757a9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jun 19 23:50:52 2000 +0000

description:
Detect if MIT Kerberos V headers are present on the system (by looking
in ${DESTDIR}/usr/include/krb5/osconf.h) and if so, tell the operator
to remove the contents of that directory in an error message and abort.

diffstat:

 lib/libkrb5/Makefile |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 01bd7ee98f2b -r 05162f6757a9 lib/libkrb5/Makefile
--- a/lib/libkrb5/Makefile      Mon Jun 19 23:46:08 2000 +0000
+++ b/lib/libkrb5/Makefile      Mon Jun 19 23:50:52 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 22:46:46 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/19 23:50:52 thorpej Exp $
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/lib/krb5
 .PATH: ${DIST}/heimdal/lib/des
@@ -160,5 +160,15 @@
 TEXINFO=       heimdal.texi
 INFOFLAGS=     -I${DIST}/heimdal/doc
 
+# Prevent collision with old MIT Kerberos includes -- require manual
+# intervention of the operator.
+.BEGIN:
+.ifmake includes
+       @if [ -f ${DESTDIR}${INCSDIR}/osconf.h ]; then \
+               echo "Error: you must first remove the MIT headers from ${DESTDIR}${INCSDIR}" >&2; \
+               false; \
+       fi
+.endif
+
 .include <bsd.lib.mk>
 .include <bsd.info.mk>



Home | Main Index | Thread Index | Old Index