Unix builds: Reference krb5 libs in standard way

Use $(LIB_krb5) and $(LDFLAGS_krb5) to reference the Kerberos
library and linker flags, rather than directly using an autoconf
substitution. This brings us in line with the way other libraries
are handled.

Change-Id: Icda16833abea32440a5c307c39eb06b32613b06a
Reviewed-on: http://gerrit.openafs.org/7583
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index 01eb1df..af5dfb5 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -9,7 +9,7 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER
 
-AKLIBS= ${LIBS} @KRB5_LDFLAGS@ @KRB5_LIBS@
+AKLIBS= ${LIBS} $(LDFLAGS_krb5) $(LIB_krb5)
 AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
          ${TOP_LIBDIR}/libafsrpc.a \
         ${TOP_LIBDIR}/libafshcrypto.a \

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 8990a47..b8e7ea5 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -54,12 +54,14 @@ KERN_OPTMZ = @KERN_OPTMZ@
 LD = @LD@
 LDFLAGS_roken = @LDFLAGS_roken@
 LDFLAGS_hcrypto = @LDFLAGS_hcrypto@
+LDFLAGS_krb5 = @KRB5_LDFLAGS@
 LEX = @LEX@
 LIB_AFSDB = @LIB_AFSDB@
 LIB_crypt = @LIB_crypt@
 LIB_curses = @LIB_curses@
 LIB_hcrypto = @LIB_hcrypto@
 LIB_roken = @LIB_roken@
+LIB_krb5 = @KRB5_LIBS@
 LIBS = @LIBS@
 LIB_LIBINTL = @LIB_libintl@
 LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@

diff --git a/src/libafscp/Makefile.in b/src/libafscp/Makefile.in
index 01bd16e..359db60 100644 (file)
--- a/src/libafscp/Makefile.in
+++ b/src/libafscp/Makefile.in
@@ -5,7 +5,6 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 #for debugging:
 #CFLAGS += -DAFSCP_DEBUG
 KRB5CFLAGS = @KRB5_CPPFLAGS@
-KRB5LIBS = @KRB5_LIBS@
 
 LIBOBJS = \
        afscp_callback.o \

diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in
index 378d3b6..1bb6cf7 100644 (file)
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@@ -74,7 +74,8 @@ clean:
 
 aklog_dynamic_auth: ${AUTH_KRB5_OBJS} ${AFSLIBS} ${AUTHFILES}
        $(LD) -o $@ ${AUTH_KRB5_OBJS} $(AFSLIBS) ${AUTHFILES} \
-               @KRB5_LIBS@ $(LDFLAGS_roken) $(LIB_roken) ${XLIBS} ${AKLDFLAGS}
+               $(LDFLAGS_krb5) $(LIB_krb5) \
+               $(LDFLAGS_roken) $(LIB_roken) ${XLIBS} ${AKLDFLAGS}
 
 afs_dynamic_auth: ${AUTH_OBJS} ${AFSLIBS} ${AUTHFILES}
        $(LD) -o $@ ${AUTH_OBJS} $(AFSLIBS) ${AUTHFILES} \

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index fc27aa5..162867f 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -10,7 +10,6 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.lwp
 
 KRB5CFLAGS = @KRB5_CPPFLAGS@
-KRB5LIBS = @KRB5_LIBS@
 
 INCLS=${TOP_INCDIR}/afs/afsint.h \
        ${TOP_INCDIR}/afs/cmd.h \
@@ -96,7 +95,8 @@ afscbint.ss.o: ../fsint/afscbint.ss.c
 
 afsio: afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS}
        $(MT_CC) $(PTH_LDFLAGS) $(AFS_CFLAGS) -o afsio afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS} \
-               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} ${KRB5LIBS}
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} \
+               $(LDFLAGS_krb5) $(LIB_krb5)
 
 livesys.o: livesys.c ${INCLS} AFS_component_version_number.c