* aclocal.m4: Define DES425_LIB and DES425_DEPLIB all the time. We

	build the des425 library all the time and these need to be define
	for "make check."

This is required when compiling --without-krb4

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12086 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f1a15b27b87f8db92719d25b1c687a0676420aa..bcd24d66af533e7fe0b9d1ee8c53c2ca2abfe931 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-28  Ezra Peisach  <epeisach@mit.edu>
+
+       * aclocal.m4: Define DES425_LIB and DES425_DEPLIB all the time. We
+       build the des425 library all the time and these need to be define
+       for "make check."
+
 2000-02-07  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4: Kludge in the old test for tcl so that we have some

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 2b7c4fd8b744f8516cd61673f879fda5b8a48945..2c30f36bc8e6e0496b4351f16d309a73a1d21890 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -299,8 +299,6 @@ if test $withval = no; then
        AC_MSG_RESULT(no krb4 support)
        KRB4_LIB=
        KRB4_DEPLIB=
-       DES425_LIB=
-       DES425_DEPLIB=
        KRB4_INCLUDES=
        KRB4_LIBPATH=
        KRB524_DEPLIB=
@@ -309,8 +307,6 @@ if test $withval = no; then
        krb5_cv_krb4_libdir=
 else 
  ADD_DEF(-DKRB5_KRB4_COMPAT)
- DES425_DEPLIB='$(TOPLIBD)/libdes425$(DEPLIBEXT)'
- DES425_LIB=-ldes425
  if test $withval = yes; then
        AC_MSG_RESULT(built in krb4 support)
        KRB4_DEPLIB='$(TOPLIBD)/libkrb4$(DEPLIBEXT)'
@@ -337,6 +333,9 @@ AC_SUBST(KRB4_LIB)
 AC_SUBST(KRB4_DEPLIB)
 AC_SUBST(KRB524_DEPLIB)
 AC_SUBST(KRB524_LIB)
+dnl We always compile the des425 library
+DES425_DEPLIB='$(TOPLIBD)/libdes425$(DEPLIBEXT)'
+DES425_LIB=-ldes425
 AC_SUBST(DES425_DEPLIB)
 AC_SUBST(DES425_LIB)
 ])dnl