3 files changed, 19 insertions, 11 deletions
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index f42f6d5fca7..14ea986fd4c 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.35 2000/09/03 18:41:12 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.36 2001/05/25 23:13:46 ho Exp $
 
 .include <bsd.own.mk>
 
@@ -17,6 +17,12 @@ KRB=--with-krb4=/usr --enable-encryption
 KRB=--without-krb4
 .endif
 
+.if (${KERBEROS5:L} == "yes")
+KRB5=--with-gssapi=/usr --enable-encryption
+.else
+KRB5=
+.endif
+
 all:	config.status
 	${MAKE} ${GNUCFLAGS} LDFLAGS=${LDSTATIC} all info
 
@@ -32,12 +38,14 @@ config: .FORCE
 	-rm -f config.cache
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
-		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/libdata ${KRB} ${CF}
+		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \
+			--datadir=/usr/libdata ${KRB} ${KRB5} ${CF}
 
 config.status:
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
-		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/libdata ${KRB} ${CF}
+		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \
+			--datadir=/usr/libdata ${KRB} ${KRB5} ${CF}
 
 .ifdef NOMAN
 maninstall:
diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure
index 8ed5f829c2a..3154a647af5 100644
--- a/gnu/usr.bin/cvs/configure
+++ b/gnu/usr.bin/cvs/configure
@@ -3234,7 +3234,7 @@ echo "default place for GSSAPI is $GSSAPI"
 
 
 hold_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
+CPPFLAGS="$CPPFLAGS -I$GSSAPI/include/kerberosV "
 for ac_hdr in krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -3284,15 +3284,15 @@ if test "$ac_cv_header_krb5_h" = "yes" &&
 #define HAVE_GSSAPI 1
 EOF
 
-  includeopt="${includeopt} -I$GSSAPI/include"
+  includeopt="${includeopt} -I$GSSAPI/include/kerberosV"
   # FIXME: This is ugly, but these things don't seem to be standardized.
   if test "$ac_cv_header_gssapi_h" = "yes"; then
-    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
+    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes"
   else
     LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
   fi
   save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
+  CPPFLAGS="-I$GSSAPI/include/kerberosV $CPPFLAGS"
   if test "$ac_cv_header_gssapi_h" = "yes"; then
     cat > conftest.$ac_ext <<EOF
 #line 3299 "configure"
diff --git a/gnu/usr.bin/cvs/configure.in b/gnu/usr.bin/cvs/configure.in
index a3ec8e566ef..f0c89fe6e88 100644
--- a/gnu/usr.bin/cvs/configure.in
+++ b/gnu/usr.bin/cvs/configure.in
@@ -222,7 +222,7 @@ AC_SUBST(GSSAPI)])dnl
 WITH_GSSAPI
 
 hold_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
+CPPFLAGS="$CPPFLAGS -I$GSSAPI/include/kerberosV "
 AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
 CPPFLAGS=$hold_cppflags
 
@@ -230,15 +230,15 @@ if test "$ac_cv_header_krb5_h" = "yes" &&
    (test "$ac_cv_header_gssapi_h" = "yes" ||
     test "$ac_cv_header_gssapi_gssapi_h" = "yes"); then
   AC_DEFINE(HAVE_GSSAPI)
-  includeopt="${includeopt} -I$GSSAPI/include"
+  includeopt="${includeopt} -I$GSSAPI/include/kerberosV"
   # FIXME: This is ugly, but these things don't seem to be standardized.
   if test "$ac_cv_header_gssapi_h" = "yes"; then
-    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
+    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes"
   else
     LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
   fi
   save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
+  CPPFLAGS="-I$GSSAPI/include/kerberosV $CPPFLAGS"
   if test "$ac_cv_header_gssapi_h" = "yes"; then
     AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
   else