From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 6 Dec 2010 21:41:33 +0000 (-0600)
Subject: tubik: Link with libafsauthent
X-Git-Tag: openafs-devel-1_7_1~1138
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=8f7ae51c6145f4c284298a1dcc6efd5562246243

tubik: Link with libafsauthent

libubik_pthread.a requires libafsauthent.a, since we make use of
afsconf_* functions. Add libafsauthent to LIBS and make tubik depend
on it.

Remove linking to liblwp while we're here, as we should not be using
any LWP code.

Change-Id: Ie028fedfbc3e7a8a78dc69a2c38be99eb72602da
Reviewed-on: http://gerrit.openafs.org/3464
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/Makefile.in b/Makefile.in
index b154736..9ef9f80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,7 +216,7 @@ auth: cmd comerr hcrypto lwp rx rxkad audit sys_depinstall auth_depinstall
 ubik: cmd comerr auth ubik_depinstall sys
 	+${COMPILE_PART1} ubik ${COMPILE_PART2}
 
-tubik: ubik libafsrpc
+tubik: ubik libafsrpc libafsauthent
 	+[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
 		${COMPILE_PART1} tubik ${COMPILE_PART2} ;; \
diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index e98f242..7ba412f 100644
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -33,7 +33,7 @@ UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
        volparse.o flipbase64.o softsig.o hostparse.o snprintf.o \
        pthread_glock.o
 
-LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/liblwp.a \
+LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
      ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/libsys.a ${XLIBS} ${MT_LIBS}