summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/configure.in10
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7cd65d4d1..e4e675d35 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 65c0ea369..e08bbffcb 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)