diff options
| author | Tom Yu <tlyu@mit.edu> | 1996-06-04 04:26:20 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1996-06-04 04:26:20 +0000 |
| commit | 4d25c2daef4b178b90e0ea2e57818f69e4aabcba (patch) | |
| tree | 2db9bd536ad956f051c58f3c0ee239460709297f | |
| parent | abe7300909fc7ce4afbdd90514e5f97690f717cd (diff) | |
| download | krb5-4d25c2daef4b178b90e0ea2e57818f69e4aabcba.tar.gz krb5-4d25c2daef4b178b90e0ea2e57818f69e4aabcba.tar.xz krb5-4d25c2daef4b178b90e0ea2e57818f69e4aabcba.zip | |
* 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
| -rw-r--r-- | src/appl/bsd/ChangeLog | 8 | ||||
| -rw-r--r-- | src/appl/bsd/Makefile.in | 2 | ||||
| -rw-r--r-- | src/appl/bsd/configure.in | 16 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 17849aaae..fde293683 100644 --- 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 013f0d487..7bf583f82 100644 --- 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 cb7ae23f5..123becee5 100644 --- 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 |