Re: Heimdal 0.3d

[GOMBAS Gabor <gombasg@inf.elte.hu>]

Hello,

Would you try this? It only checks for libdes if you request Kerberos4
support.

Gabor

diff -u -r1.1.1.3 configure.in
--- configure.in	2000/12/12 16:12:54	1.1.1.3
+++ configure.in	2000/12/13 23:23:22
@@ -547,21 +547,35 @@
 dnl crypto functions tests
 dnl
 
-AC_FIND_FUNC_NO_LIBS2(MD4Init, crypto des, [], [], [], [$LIB_krb4])
-AC_FIND_FUNC_NO_LIBS2(MD4_Init, crypto des, [], [], [], [$LIB_krb4])
-AC_FIND_FUNC_NO_LIBS2(MD5Init, crypto des, [], [], [], [$LIB_krb4])
-AC_FIND_FUNC_NO_LIBS2(MD5_Init, crypto des, [], [], [], [$LIB_krb4])
-AC_FIND_FUNC_NO_LIBS2(SHA1Init, crypto des, [], [], [], [$LIB_krb4])
-AC_FIND_FUNC_NO_LIBS2(SHA1_Init, crypto des, [], [], [], [$LIB_krb4])
-AC_FIND_FUNC_NO_LIBS2(des_cbc_encrypt, crypto des, [], [], [], [$LIB_krb4])
-AC_FIND_FUNC_NO_LIBS2(RC4, crypto des, [], [], [], [$LIB_krb4])
+if test "$with_krb4" != "no"; then
+  DESLIBS="crypto des"
+else
+  DESLIBS="crypto"
+fi
+
+AC_FIND_FUNC_NO_LIBS2(MD4Init, $DESLIBS, [], [], [], [$LIB_krb4])
+AC_FIND_FUNC_NO_LIBS2(MD4_Init, $DESLIBS, [], [], [], [$LIB_krb4])
+AC_FIND_FUNC_NO_LIBS2(MD5Init, $DESLIBS, [], [], [], [$LIB_krb4])
+AC_FIND_FUNC_NO_LIBS2(MD5_Init, $DESLIBS, [], [], [], [$LIB_krb4])
+AC_FIND_FUNC_NO_LIBS2(SHA1Init, $DESLIBS, [], [], [], [$LIB_krb4])
+AC_FIND_FUNC_NO_LIBS2(SHA1_Init, $DESLIBS, [], [], [], [$LIB_krb4])
+AC_FIND_FUNC_NO_LIBS2(des_cbc_encrypt, $DESLIBS, [], [], [], [$LIB_krb4])
+AC_FIND_FUNC_NO_LIBS2(RC4, $DESLIBS, [], [], [], [$LIB_krb4])
 if test "$ac_cv_func_des_cbc_encrypt" = "yes" -a \
 \( "$ac_cv_func_MD4Init"  = "yes" -o "$ac_cv_func_MD4_Init"  = "yes" \) -a \
 \( "$ac_cv_func_MD5Init"  = "yes" -o "$ac_cv_func_MD5_Init"  = "yes" \) -a \
 \( "$ac_cv_func_SHA1Init" = "yes" -o "$ac_cv_func_SHA1_Init" = "yes" \) -a \
 "$ac_cv_func_RC4" = "yes"; then
   DIR_des=''
-  LIB_des="-rpath $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4Init"
+  LIB_des=''
+  if test "$krb4_libdir" != ""; then
+    LIB_des="-rpath $krb4_libdir -L$krb4_libdir"
+  fi
+  if test "$ac_cv_func_MD4Init" = "yes"; then
+    LIB_des="$LIB_des $ac_cv_funclib_MD4Init"
+  else
+    LIB_des="$LIB_des $ac_cv_funclib_MD4_Init"
+  fi
 else
   DIR_des='des'
   LIB_des='$(top_builddir)/lib/des/libdes.la'

-- 
Gabor Gombas                                       Eotvos Lorand University
E-mail: gombasg@inf.elte.hu                        Hungary