Build rxgk support into libafsrpc

Add a dependency on the appropriate $(GSSAPI_LIBS) and link in the
librxgk_pic.la helper. Careful control of what functions are exposed
allows static linking to continue to work when rxgk is disabled,
though a stub is needed for the case of rxgk_GetServerInfo, so that
there is a symbol present to satisfy the export symbol list.

Consumers of libafsrpc.a need not be modified in accordance
with this change.

Change-Id: I76c0329ba842fb0d4d66534810b114a0813c90a0
Reviewed-on: https://gerrit.openafs.org/10591
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/Makefile.in b/Makefile.in
index 60c28f6..41ca655 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -565,7 +565,7 @@ afsmonitor: cmd comerr gtx xstat
 tests: rxtests ubiktests rpctestlib viced
 
 # pthread based user space RX library
-libafsrpc: comerr fsint hcrypto lwp rx rxkad rxstat sys util
+libafsrpc: comerr fsint hcrypto lwp rx rxkad rxstat sys util rxgk
        +case ${SYS_NAME} in \
        sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \
        ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index dc03648..a037ed8 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -25,11 +25,10 @@ LT_objs = \
        $(top_builddir)/src/rxstat/librxstat_pic.la \
        $(top_builddir)/src/sys/libafsrpc_sys.la \
        $(top_builddir)/src/lwp/liblwpcompat_pic.la \
-       $(top_builddir)/src/opr/libopr_pic.la
+       $(top_builddir)/src/opr/libopr_pic.la \
+       @RXGK_LIBS_RPC@
 
-LT_deps =
-
-LT_libs = $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS)
+LT_libs = $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) $(RXGK_GSSAPI_LIBS)
 
 all: libafsrpc.la libafsrpc.a libafsrpc_pic.la \
        $(TOP_LIBDIR)/libafsrpc.a \

diff --git a/src/libafsrpc/libafsrpc.la.sym b/src/libafsrpc/libafsrpc.la.sym
index fbd7af9..8204dbe 100644 (file)
--- a/src/libafsrpc/libafsrpc.la.sym
+++ b/src/libafsrpc/libafsrpc.la.sym
@@ -156,6 +156,7 @@ rx_tranquil
 rxevent_Init
 rxevent_Post
 rxevent_debugFile
+rxgk_GetServerInfo
 rxi_Alloc
 rxi_AllocDataBuf
 rxi_Free