diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-11-30 21:36:26 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-11-30 21:36:26 +0000 |
| commit | 79588d7a20dd3bf537eb2f0cc18f65b8ed6268af (patch) | |
| tree | c38a4a0821e80d7eb71ccc7f9c563977de415109 /src/include | |
| parent | 62ee6ced9d648e4d67713d5262dfe29b91647296 (diff) | |
| download | krb5-79588d7a20dd3bf537eb2f0cc18f65b8ed6268af.tar.gz krb5-79588d7a20dd3bf537eb2f0cc18f65b8ed6268af.tar.xz krb5-79588d7a20dd3bf537eb2f0cc18f65b8ed6268af.zip | |
configure.in: Add support for --enable-athena and --with-krb4
(to set KRB5_KRB4_COMPAT).
Makefile.in: Remove remnants of unifdef support for building
osconf.h and config.h, left over from the imake build system.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4719 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/krb5/Makefile.in | 7 | ||||
| -rw-r--r-- | src/include/krb5/configure.in | 8 |
3 files changed, 19 insertions, 4 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index cd5855ddd..5afb16064 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,11 @@ +Wed Nov 30 16:16:54 1994 Theodore Y. Ts'o (tytso@dcl) + + * configure.in: Add support for --enable-athena and --with-krb4 + (to set KRB5_KRB4_COMPAT). + + * Makefile.in: Remove remnants of unifdef support for building + osconf.h and config.h, left over from the imake build system. + Mon Nov 21 14:43:14 1994 Theodore Y. Ts'o (tytso@dcl) * func-proto.h (krb5_encode_kdc_rep, krb5_encrypt_tkt_part): diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index 64db70708..12f4c8b4f 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -39,10 +39,9 @@ install:: PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \ -e "s+@KDB5DIR+$(KDB5DIR)+" \ - -e "s+@KRB5SRVTABDIR+${KRB5SRVTABDIR}+" \ - -e "/UnifdefRan/,/SPLIT-HERE/d" + -e "s+@KRB5SRVTABDIR+${KRB5SRVTABDIR}+" -OSCONFSRC = $(srcdir)/stock/osauto.h $(srcdir)/stock/osconf.h +OSCONFSRC = $(srcdir)/stock/osconf.h osconf.h: $(OSCONFSRC) cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new @@ -51,7 +50,7 @@ osconf.h: $(OSCONFSRC) CONF_REPLACE = -e "/UnifdefRan/,/SPLIT-HERE/d" -CONFSRC = $(srcdir)/stock/confauto.h $(srcdir)/stock/config.h +CONFSRC = $(srcdir)/stock/config.h config.h: $(CONFSRC) cat $(CONFSRC) | sed $(CONF_REPLACE) > config.new diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index 984b0c54c..48e2d3e1c 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -85,4 +85,12 @@ AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) AC_FUNC_CHECK([dbm_open], , AC_DEFINE(ODBM)) +AC_ARG_ENABLE([athena], +[ --enable-athena build with MIT Project Athena configuration], +AC_DEFINE(KRB5_ATHENA_COMPAT),) + +AC_ARG_WITH([krb4], +[ --with-krb4=KRB4DIR build with Kerberos V4 backwards compatibility], +AC_DEFINE(KRB5_KRB4_COMPAT),,) + V5_AC_OUTPUT_MAKEFILE |