* Makefile.in,configure.in: allow compilation w/o krb4 (Ezra's

		patches)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8210 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 17849aaae1d011c5cb79b736f832c9f6439d864c..fde2936838e13554e98c3e12e20f94d5b5b8d118 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jun  3 21:26:34 1996  Tom Yu  <tlyu@mit.edu>
+
+       * login.c: Ezra's patches to trim unsed arg from
+               verify_krb_v5_tgt, etc.
+
+       * Makefile.in,configure.in: allow compilation w/o krb4 (Ezra's
+               patches)
+
 Sun May 19 15:22:06 1996  Sam Hartman  <hartmans@mit.edu>
 
        * login.c (destroy_tickets main):  Use a secure context

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 013f0d487e6892301a679a7c131c115e172f0e6d..7bf583f822ea802d41cfb516f69e321f280cd165 100644 (file)
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -3,7 +3,7 @@ LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
 
-LOGINLIBS = ../../krb524/libkrb524.a @LOGINLIBS@
+LOGINLIBS =@LOGINLIBS@
 LIBOBJS=@LIBOBJS@
 
 LOCAL_LIBRARIES=-lpty

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index cb7ae23f579ec002e4e26af01ed29041e6e0d750..123becee56cb990c2b4e3dc37f554988ea95b19a 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -37,6 +37,22 @@ alpha-dec-osf*)
        )
        ;;
 esac
+dnl 
+dnl After beta6 this functionality will be integrated with aclocal.m4
+AC_ARG_WITH([krb4],
+[  --without-krb4          don't include Kerberos V4 backwards compatibility
+  --with-krb4             use V4 libraries included with V5 (default)
+  --with-krb4=KRB4DIR     use preinstalled V4 libraries],
+,
+withval=yes
+)dnl
+if test $withval = no; then
+       AC_MSG_RESULT(no krb4 support)
+else 
+       AC_MSG_RESULT(Adding in krb4 support)
+       LOGINLIBS="../../krb524/libkrb524.a $LOGINLIBS"
+fi
+dnl
 dnl
 AC_SUBST(LOGINLIBS)
 dnl