diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1996-06-12 00:09:56 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1996-06-12 00:09:56 +0000 |
| commit | 0810aa012e37fa3adb20caa82d0d8f89dbf8124b (patch) | |
| tree | 4bde5a9aba0b31a634d6657f1e125852954d37db | |
| parent | b5f1c5ea0435c02200283806e7606c3c47731c13 (diff) | |
| download | krb5-0810aa012e37fa3adb20caa82d0d8f89dbf8124b.tar.gz krb5-0810aa012e37fa3adb20caa82d0d8f89dbf8124b.tar.xz krb5-0810aa012e37fa3adb20caa82d0d8f89dbf8124b.zip | |
*aclocal.m4: Remove WITH_KDB4 and USE_KDB4_LIBRARY support
kdb4 is no longer needed in the source tree. It has not been needed in
about 10 months, but this is the cleanup...
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8292 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/aclocal.m4 | 37 |
2 files changed, 6 insertions, 35 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 244cb5214..1ab852ca0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 8 10:01:11 1996 Ezra Peisach <epeisach@kangaroo.mit.edu> + + * aclocal.m4: Remove WITH_KDB4 and USE_KDB4_LIBRARY support + Fri Jun 7 17:39:45 1996 Theodore Y. Ts'o <tytso@mit.edu> * Makefile.in (makefile-windows): Use full directory diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 1ee7e151e..81244e346 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -348,8 +348,6 @@ if test $withval = no; then DEPKRB4_LIB= KRB4_CRYPTO_LIB= DEPKRB4_CRYPTO_LIB= - KDB4_LIB= - DEPKDB4_LIB= LDARGS= krb5_cv_build_krb4_libs=no krb5_cv_krb4_libdir= @@ -361,8 +359,6 @@ else DEPKRB4_LIB='$(TOPLIBD)/libkrb4.a' KRB4_CRYPTO_LIB='-ldes425' DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a' - KDB4_LIB='-lkdb4' - DEPKDB4_LIB='$(TOPLIBD)/libkdb4.a' LDARGS= krb5_cv_build_krb4_libs=yes krb5_cv_krb4_libdir= @@ -372,18 +368,14 @@ else DEPKRB4_LIB="$withval/lib/libkrb.a" KRB4_CRYPTO_LIB='-ldes425' DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a' - KDB4_LIB="-lkdb" - DEPKDB4_LIB="$withval/lib/libkdb.a" LDARGS="-L$withval/lib" krb5_cv_build_krb4_libs=no krb5_cv_krb4_libdir="$withval/lib" fi fi AC_SUBST(KRB4_LIB) -AC_SUBST(KDB4_LIB) AC_SUBST(KRB4_CRYPTO_LIB) AC_SUBST(DEPKRB4_LIB) -AC_SUBST(DEPKDB4_LIB) AC_SUBST(DEPKRB4_CRYPTO_LIB) ])dnl dnl @@ -864,14 +856,6 @@ if test "$dbval" = "db"; then fi ]) dnl -dnl This rule tells KRB5_LIBRARIES to include the kdb4 library. -dnl -kdb4_deplib='' -kdb4_lib='' -define(USE_KDB4_LIBRARY,[ -kdb4_deplib=$DEPKRB4_LIB -kdb4_lib=$KDB4_LIB]) -dnl dnl This rule tells KRB5_LIBRARIES to include the krb4 libraries. dnl krb4_deplib='' @@ -895,8 +879,8 @@ define(KRB5_LIBRARIES,[ if test ${kdbm_deplib}x = x; then USE_ANAME fi -DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadm_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $kdb4_deplib $krb4_deplib $kdbm_deplib $kaname_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib \[$](TOPLIBD)/libcom_err.a" -LIBS="\[$](LOCAL_LIBRARIES) $kadm_lib $kdb5_lib $kdb4_lib $kutil_lib $krb4_lib -lkrb5 $kdbm_libs $kaname_libs -lcrypto $ss_lib -lcom_err $LIBS" +DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadm_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib $kdbm_deplib $kaname_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib \[$](TOPLIBD)/libcom_err.a" +LIBS="\[$](LOCAL_LIBRARIES) $kadm_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 $kdbm_libs $kaname_libs -lcrypto $ss_lib -lcom_err $LIBS" LDFLAGS="$LDFLAGS -L\$(TOPLIBD)" AC_SUBST(LDFLAGS) AC_SUBST(LDARGS) @@ -1164,23 +1148,6 @@ fi ])dnl dnl dnl -dnl -dnl -AC_DEFUN(WITH_KDB4,[ -AC_ARG_WITH([kdb4], -[ --with-kdb4 use Kerberos version 4 database library. - --without-kdb4 Avoid using Kerberos version 4 database library.], -, -withval=no)dnl -if test "$withval" = no; then -$2 -: -else -$1 -: -fi -])dnl -dnl dnl Check for prototype support - used by application not including k5-int.h dnl define(KRB5_CHECK_PROTOS,[ |