Link aklog against LIB_hcrypto

This was the last place where libafshcrypto.a was explicitly referenced,
preventing the use of an out-of-tree hcrypto library.

We will continue to need to build the in-tree code to produce a
libafshcrypto_lwp.a library for use in LWP applications, until we
do not have any more LWP applications, but some systems (such as
Debian) have a desire to avoid bundled libraries, so we should
facilitate the use of an external libhcrypto where possible.

Many consumers of libafshcrypto_lwp.a will be removed when the
LWP versions of various modules are removed after 1.8 is branched.

Change-Id: I23049866caae9c16ffb2ec32c5e7b058465a26ba
Reviewed-on: http://gerrit.openafs.org/11480
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: D Brashear <shadow@your-file-system.com>
Tested-by: D Brashear <shadow@your-file-system.com>

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index 725738d..51d0994 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -11,12 +11,13 @@ MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER
 MODULE_LDFLAGS=@KRB5_LDFLAGS@
 
 AKLIBS= ${LIBS} $(LDFLAGS_krb5) $(LIB_krb5) @AKLOG_KRB5_LIBS@
-AFSLIBS= ${TOP_LIBDIR}/libafshcrypto.a \
+AFSLIBS= \
         $(top_builddir)/src/ptserver/liboafs_prot.la \
         $(top_builddir)/src/rxkad/liboafs_rxkad.la \
         $(top_builddir)/src/cmd/liboafs_cmd.la \
         $(top_builddir)/src/opr/liboafs_opr.la \
          $(top_builddir)/src/util/liboafs_util.la
+LT_libs = $(LDFLAGS_roken) $(LIB_roken) $(LDFLAGS_hcrypto) $(LIB_hcrypto)
 
 SRCS=  aklog.c krb_util.c linked_list.c
 OBJS=   aklog.o krb_util.o linked_list.o
@@ -24,14 +25,14 @@ OBJS=   aklog.o krb_util.o linked_list.o
 all: aklog asetkey klog
 
 aklog: ${OBJS} ${AFSLIBS}
-       $(LT_LDRULE_static) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
+       $(LT_LDRULE_static) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LT_libs) ${MT_LIBS}
 
 asetkey: asetkey.o ${AFSLIBS}
-       $(LT_LDRULE_static) asetkey.o ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
+       $(LT_LDRULE_static) asetkey.o ${AKLIBS} ${AFSLIBS} $(LT_libs) ${MT_LIBS}
 
 klog:  klog.o skipwrap.o ${AFSLIBS}
        $(LT_LDRULE_static) klog.o skipwrap.o \
-               ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
+               ${AKLIBS} ${AFSLIBS} $(LT_libs) ${MT_LIBS}
 
 #
 # Installation targets