diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-08-29 12:20:06 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-08-29 12:20:06 +0000 |
| commit | de466ef5ddf9a5a6f7fe11ac73dcee9873ec4e7d (patch) | |
| tree | 721f07300cfd04ac9711b29b9802433ae43717b2 | |
| parent | d9fee649d277cf0ec1f4f9d62a0bbe6f63d1cf03 (diff) | |
| download | krb5-de466ef5ddf9a5a6f7fe11ac73dcee9873ec4e7d.tar.gz krb5-de466ef5ddf9a5a6f7fe11ac73dcee9873ec4e7d.tar.xz krb5-de466ef5ddf9a5a6f7fe11ac73dcee9873ec4e7d.zip | |
* configure.in: Configure lib/krb4 and krb524 only if KRB4_LIB
is non-empty; this may not be right for "--with-krb4=/some/dir".
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14798 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/configure.in | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7cd65d4d11..e4e675d35e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,7 +3,8 @@ * aclocal.m4 (CHOOSE_ET, CHOOSE_SS): New macros. (CONFIG_RULES): Invoke them. * configure.in: Configure util/et and util/ss only if they're - going to be used. + going to be used. Configure lib/krb4 and krb524 only if KRB4_LIB + is non-empty; this may not be right for "--with-krb4=/some/dir". 2002-08-26 Ezra Peisach <epeisach@bu.edu> diff --git a/src/configure.in b/src/configure.in index 65c0ea3695..e08bbffcbb 100644 --- a/src/configure.in +++ b/src/configure.in @@ -86,7 +86,15 @@ fi if test "$SS_VERSION" = k5 ; then AC_CONFIG_SUBDIRS(util/ss) fi -AC_CONFIG_SUBDIRS(util/profile util/pty util/db2 include lib/crypto lib/krb5 lib/des425 lib/krb4 lib/kdb lib/gssapi lib/rpc lib/kadm5 krb524 kdc kadmin slave clients appl tests) +AC_CONFIG_SUBDIRS(util/profile util/pty util/db2 include lib/crypto lib/krb5 lib/des425) +if test -n "$KRB4_LIB"; then + AC_CONFIG_SUBDIRS(lib/krb4) +fi +AC_CONFIG_SUBDIRS(lib/kdb lib/gssapi lib/rpc lib/kadm5) +if test -n "$KRB4_LIB"; then + AC_CONFIG_SUBDIRS(krb524) +fi +AC_CONFIG_SUBDIRS(kdc kadmin slave clients appl tests) AC_OUTPUT_COMMANDS([chmod +x krb5-config]) AC_OUTPUT_COMMANDS([echo timestamp > krb5-stamp-h]) K5_GEN_FILE(krb5-config) |