rename des to hcrypto

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20466 ec53bebd-3082-4978-b11e-865c3cabbd6b

admin/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_des)
+AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_hcrypto)
 
 SLC = $(top_builddir)/lib/sl/slc
 
@@ -35,7 +35,7 @@ ktutil-commands.c ktutil-commands.h: ktutil-commands.in
 LDADD = \
 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
 	$(top_builddir)/lib/krb5/libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/sl/libsl.la \
 	$(LIB_readline) \

appl/afsutil/Makefile.am

@@ -16,7 +16,7 @@ LDADD = $(LIB_kafs) \
 	$(LIB_krb4) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken)
 
 EXTRA_DIST = $(man_MANS)

appl/ftp/ftp/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des)
+AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_hcrypto)
 
 bin_PROGRAMS = ftp
 
@@ -42,7 +42,7 @@ LDADD = \
 	$(LIB_gssapi) \
 	$(LIB_krb5) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken) \
 	$(LIB_readline)
 

appl/ftp/ftpd/Makefile.am

@@ -53,7 +53,7 @@ LDADD = ../common/libcommon.a \
 	$(LIB_krb5) \
 	$(LIB_kafs) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken)
 
 EXTRA_DIST = $(man_MANS)

appl/kf/Makefile.am

@@ -13,7 +13,7 @@ kf_SOURCES = kf.c kf_locl.h
 kfd_SOURCES = kfd.c kf_locl.h
 
 LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 

appl/kx/Makefile.am

@@ -66,8 +66,8 @@ tenletxr: tenletxr.in
 
 LDADD = \
 	$(LIB_kafs)				\
-	$(LIB_krb5) \
+	$(LIB_krb5) 				\
 	$(LIB_krb4)				\
-	$(LIB_des)	\
+	$(LIB_hcrypto)				\
 	$(LIB_roken)				\
 	$(X_LIBS) $(LIB_XauReadAuth) $(X_PRE_LIBS) $(X_EXTRA_LIBS)

appl/login/Makefile.am

@@ -29,7 +29,7 @@ LDADD = $(LIB_otp) \
 	$(LIB_kafs) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
 	$(LIB_security) \

appl/otp/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_des)
+AM_CPPFLAGS += $(INCLUDE_hcrypto)
 
 bin_PROGRAMS = otp otpprint
 bin_SUIDS = otp

appl/popper/Makefile.am

@@ -42,7 +42,7 @@ LDADD = \
 	$(top_builddir)/lib/gssapi/libgssapi.la \
 	$(LIB_krb5) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken) \
 	$(DBLIB)
 

appl/push/Makefile.am

@@ -22,6 +22,6 @@ EXTRA_DIST = pfrom.in $(man_MANS)
 
 LDADD = $(LIB_krb5) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken) \
 	$(LIB_hesiod)

appl/rsh/Makefile.am

@@ -23,7 +23,7 @@ limits_conf.c:
 LDADD = $(LIB_kafs) \
 	$(LIB_krb5) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken)
 
 EXTRA_DIST = $(man_MANS)

appl/su/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des)
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto)
 
 bin_PROGRAMS = su
 bin_SUIDS = su
@@ -12,7 +12,7 @@ man_MANS = su.1
 LDADD = $(LIB_kafs) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 

appl/telnet/libtelnet/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
+AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_hcrypto)
 
 noinst_LIBRARIES = libtelnet.a
 

appl/telnet/telnet/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
+AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_hcrypto)
 
 bin_PROGRAMS = telnet
 
@@ -17,7 +17,7 @@ man_MANS = telnet.1
 LDADD = ../libtelnet/libtelnet.a \
 	$(LIB_krb5) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_tgetent) \
 	$(LIB_kdfs) \
 	$(LIB_roken)

appl/telnet/telnetd/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
+AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_hcrypto)
 
 libexec_PROGRAMS = telnetd
 
@@ -17,7 +17,7 @@ LDADD = \
 	../libtelnet/libtelnet.a \
 	$(LIB_krb5) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_tgetent) \
 	$(LIB_logwtmp) \
 	$(LIB_logout) \

appl/test/Makefile.am

@@ -37,6 +37,6 @@ nt_gss_client_LDADD = $(gssapi_server_LDADD)
 nt_gss_server_LDADD = $(nt_gss_client_LDADD)
 
 LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)

appl/xnlock/Makefile.am

@@ -27,6 +27,6 @@ LDADD = \
 	$(LIB_kafs) \
 	$(LIB_krb5) \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken) \
 	$(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)

cf/ChangeLog

@@ -1,3 +1,7 @@
+2007-04-19  Love H<>rnquist <20>strand  <lha@it.su.se>
+
+	* version-script.m4: check if ld supports --version-script
+	
 2007-04-11  Love H<>rnquist <20>strand  <lha@it.su.se>
 
 	* roken-frag.m4: drop broken-getnameinfo.m4

cf/crypto.m4

@@ -2,8 +2,7 @@ dnl $Id$
 dnl
 dnl test for crypto libraries:
 dnl - libcrypto (from openssl)
-dnl - libdes (from krb4)
+dnl - own-built libhcrypto
-dnl - own-built libdes
 
 m4_define([test_headers], [
 		#undef KRB5 /* makes md4.h et al unhappy */
@@ -62,7 +61,7 @@ AC_DEFUN([KRB_CRYPTO],[
 crypto_lib=unknown
 AC_WITH_ALL([openssl])
 
-DIR_des=
+DIR_hcrypto=
 
 AC_MSG_CHECKING([for crypto library])
 
@@ -104,35 +103,35 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
 	CFLAGS="$save_CFLAGS"
 	LIBS="$save_LIBS"
 	if test "$ires" -a "$lres"; then
-		INCLUDE_des="$ires"
+		INCLUDE_hcrypto="$ires"
-		LIB_des="$lres"
+		LIB_hcrypto="$lres"
 		crypto_lib=krb4
 		AC_MSG_RESULT([same as krb4])
-		LIB_des_a='$(LIB_des)'
+		LIB_hcrypto_a='$(LIB_hcrypto)'
-		LIB_des_so='$(LIB_des)'
+		LIB_hcrypto_so='$(LIB_hcrypto)'
-		LIB_des_appl='$(LIB_des)'
+		LIB_hcrypto_appl='$(LIB_hcrypto)'
 	fi
 fi
 
 if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
 	save_CFLAGS="$CFLAGS"
 	save_LIBS="$LIBS"
-	INCLUDE_des=
+	INCLUDE_hcrypto=
-	LIB_des=
+	LIB_hcrypto=
 	if test "$with_openssl_include" != ""; then
-		INCLUDE_des="-I${with_openssl_include}"
+		INCLUDE_hcrypto="-I${with_openssl_include}"
 	fi
 	if test "$with_openssl_lib" != ""; then
-		LIB_des="-L${with_openssl_lib}"
+		LIB_hcrypto="-L${with_openssl_lib}"
 	fi
-	CFLAGS="-DHAVE_OPENSSL ${INCLUDE_des} ${CFLAGS}"
+	CFLAGS="-DHAVE_OPENSSL ${INCLUDE_hcrypto} ${CFLAGS}"
-	saved_LIB_des="$LIB_des"
+	saved_LIB_hcrypto="$LIB_hcrypto"
 	for lres in "" "-lnsl -lsocket"; do
-		LIB_des="${saved_LIB_des} -lcrypto $lres"
+		LIB_hcrypto="${saved_LIB_hcrypto} -lcrypto $lres"
-		LIB_des_a="$LIB_des"
+		LIB_hcrypto_a="$LIB_hcrypto"
-		LIB_des_so="$LIB_des"
+		LIB_hcrypto_so="$LIB_hcrypto"
-		LIB_des_appl="$LIB_des"
+		LIB_hcrypto_appl="$LIB_hcrypto"
-		LIBS="${LIBS} ${LIB_des}"
+		LIBS="${LIBS} ${LIB_hcrypto}"
 		AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])], [
 			crypto_lib=libcrypto openssl=yes
 			AC_MSG_RESULT([libcrypto])
@@ -147,13 +146,13 @@ fi
 
 if test "$crypto_lib" = "unknown"; then
 
-  DIR_des='des'
+  DIR_hcrypto='hcrypto'
-  LIB_des='$(top_builddir)/lib/des/libhcrypto.la'
+  LIB_hcrypto='$(top_builddir)/lib/hcrypto/libhcrypto.la'
-  LIB_des_a='$(top_builddir)/lib/des/.libs/libhcrypto.a'
+  LIB_hcrypto_a='$(top_builddir)/lib/hcrypto/.libs/libhcrypto.a'
-  LIB_des_so='$(top_builddir)/lib/des/.libs/libhcrypto.so'
+  LIB_hcrypto_so='$(top_builddir)/lib/hcrypto/.libs/libhcrypto.so'
-  LIB_des_appl="-lhcrypto"
+  LIB_hcrypto_appl="-lhcrypto"
 
-  AC_MSG_RESULT([included libdes])
+  AC_MSG_RESULT([included libhcrypto])
 
 fi
 
@@ -168,10 +167,10 @@ if test "$openssl" = "yes"; then
 fi
 AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = yes)dnl
 
-AC_SUBST(DIR_des)
+AC_SUBST(DIR_hcrypto)
-AC_SUBST(INCLUDE_des)
+AC_SUBST(INCLUDE_hcrypto)
-AC_SUBST(LIB_des)
+AC_SUBST(LIB_hcrypto)
-AC_SUBST(LIB_des_a)
+AC_SUBST(LIB_hcrypto_a)
-AC_SUBST(LIB_des_so)
+AC_SUBST(LIB_hcrypto_so)
-AC_SUBST(LIB_des_appl)
+AC_SUBST(LIB_hcrypto_appl)
 ])

kadmin/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
+AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5
 
 sbin_PROGRAMS = kadmin
 
@@ -65,7 +65,7 @@ LDADD_common = \
 	$(top_builddir)/lib/hdb/libhdb.la \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
 	$(DBLIB)

kcm/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5
 
 libexec_PROGRAMS = kcm
 
@@ -35,7 +35,7 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
 	$(LIB_door_create) \

kdc/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5
 
 lib_LTLIBRARIES = libkdc.la
 
@@ -63,7 +63,7 @@ hprop_LDADD = \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_kdb) $(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
 	$(DBLIB) 
@@ -73,7 +73,7 @@ hpropd_LDADD = \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_kdb) $(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
 	$(DBLIB) 
@@ -89,7 +89,7 @@ libkdc_la_LIBADD = \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_kdb) $(LIB_krb4) \
 	$(top_builddir)/lib/ntlm/libheimntlm.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
 	$(DBLIB) 
@@ -98,7 +98,7 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
 	$(DBLIB)

kpasswd/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_des)
+AM_CPPFLAGS += $(INCLUDE_hcrypto)
 
 man_MANS = kpasswd.1 kpasswdd.8
 
@@ -26,7 +26,7 @@ kpasswdd_LDADD = \
 	$(DBLIB)
 
 LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 

kuser/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5
 
 man_MANS = kinit.1 klist.1 kdestroy.1 kgetcred.1 kimpersonate.1
 
@@ -18,7 +18,7 @@ kinit_LDADD = \
 	$(LIB_kafs) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 
@@ -34,7 +34,7 @@ nodist_kdigest_SOURCES = kdigest-commands.c
 kdigest_LDADD = \
 	$(top_builddir)/lib/ntlm/libheimntlm.la \
 	$(top_builddir)/lib/krb5/libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/sl/libsl.la \
 	$(LIB_roken)
@@ -48,7 +48,7 @@ kdigest-commands.c kdigest-commands.h: kdigest-commands.in
 
 LDADD = \
 	$(top_builddir)/lib/krb5/libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 

lib/Makefile.am

@@ -15,8 +15,8 @@ if COM_ERR
 dir_com_err = com_err
 endif
 if !HAVE_OPENSSL
-dir_des = des
+dir_hcrypto = hcrypto
 endif
 
-SUBDIRS = roken vers editline $(dir_com_err) sl asn1 $(dir_des) hx509 \
+SUBDIRS = roken vers editline $(dir_com_err) sl asn1 $(dir_hcrypto) hx509 \
 	krb5 ntlm kafs gssapi hdb kadm5 auth $(dir_45) $(dir_otp) $(dir_dce)

lib/auth/afskauthlib/Makefile.am

@@ -32,7 +32,7 @@ L = \
 	$(top_builddir)/lib/krb5/libkrb5.la	\
 	$(top_builddir)/lib/asn1/libasn1.la	\
 	$(LIB_krb4)				\
-	$(LIB_des)				\
+	$(LIB_hcrypto)				\
 	$(top_builddir)/lib/roken/libroken.la	\
 	-lc
 
@@ -41,7 +41,7 @@ else
 L = \
 	$(KAFS)	\
 	$(LIB_krb4)				\
-	$(LIB_des)				\
+	$(LIB_hcrypto)				\
 	$(top_builddir)/lib/roken/libroken.la	\
 	-lc
 endif

lib/auth/pam/Makefile.am

@@ -19,14 +19,14 @@ KAFS_S=$(top_builddir)/lib/kafs/.libs/libkafs.so
 L = \
 	$(KAFS)						\
 	$(top_builddir)/lib/krb/.libs/libkrb.a		\
-	$(LIB_des_a)		\
+	$(LIB_hcrypto_a)		\
 	$(top_builddir)/lib/roken/.libs/libroken.a	\
 	-lc
 
 L_shared = \
 	$(KAFS_S)					\
 	$(top_builddir)/lib/krb/.libs/libkrb.so		\
-	$(LIB_des_so)		\
+	$(LIB_hcrypto_so)		\
 	$(top_builddir)/lib/roken/.libs/libroken.so	\
 	$(LIB_getpwnam_r)				\
 	-lc

lib/auth/sia/Makefile.am

@@ -21,7 +21,7 @@ L = \
 	$(top_builddir)/lib/krb5/.libs/libkrb5.a	\
 	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
 	$(LIB_krb4)					\
-	$(LIB_des_a)					\
+	$(LIB_hcrypto_a)					\
 	$(LIB_com_err_a)				\
 	$(top_builddir)/lib/roken/.libs/libroken.a	\
 	$(LIB_getpwnam_r)				\
@@ -32,7 +32,7 @@ L_shared = \
 	$(top_builddir)/lib/krb5/.libs/libkrb5.so	\
 	$(top_builddir)/lib/asn1/.libs/libasn1.so	\
 	$(LIB_krb4)					\
-	$(LIB_des_so)					\
+	$(LIB_hcrypto_so)					\
 	$(LIB_com_err_so)				\
 	$(top_builddir)/lib/roken/.libs/libroken.so	\
 	$(LIB_getpwnam_r)				\
@@ -46,7 +46,7 @@ L = \
 	$(KAFS)						\
 	$(top_builddir)/lib/kadm/.libs/libkadm.a	\
 	$(top_builddir)/lib/krb/.libs/libkrb.a		\
-	$(LIB_des_a)		\
+	$(LIB_hcrypto_a)		\
 	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
 	$(top_builddir)/lib/roken/.libs/libroken.a	\
 	$(LIB_getpwnam_r)				\
@@ -56,7 +56,7 @@ L_shared = \
 	$(KAFS_S)					\
 	$(top_builddir)/lib/kadm/.libs/libkadm.so	\
 	$(top_builddir)/lib/krb/.libs/libkrb.so		\
-	$(LIB_des_so)		\
+	$(LIB_hcrypto_so)		\
 	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
 	$(top_builddir)/lib/roken/.libs/libroken.so	\
 	$(LIB_getpwnam_r)				\

lib/gssapi/Makefile.am

@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS += -I$(srcdir)/../krb5 \
 	-I$(srcdir) \
 	-I$(srcdir)/mech \
-	$(INCLUDE_des) \
+	$(INCLUDE_hcrypto) \
 	$(INCLUDE_krb4)
 
 lib_LTLIBRARIES = libgssapi.la
@@ -201,7 +201,7 @@ libgssapi_la_LIBADD = \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_com_err) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIBADD_roken)
 
 man_MANS = gssapi.3 gss_acquire_cred.3

lib/hcrypto/Makefile.am

@@ -130,7 +130,7 @@ imathsource =			\
 $(libhcrypto_la_OBJECTS): hcrypto-link
 
 hcrypto-link:
-	$(LN_S) $(srcdir)/../des hcrypto
+	$(LN_S) $(srcdir)/../hcrypto hcrypto
 	touch hcrypto-link
 
 do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g'