STABLE14-aix-no-aklog-tsm-without-krb5-20090320

LICENSE IPL10
FIXES 124522

don't build aklog_dynamic_auth without krb5

(cherry picked from commit c1d545dff6483369ade640b27b9ab7baaa6faac5)

diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index b9fa57370260b6e0ee44f3cec8ef048a7633e72b..b9b2294ebfb8f3ebe1f443f2b44261d3b77f7894 100644 (file)
--- a/src/cf/kerberos.m4
+++ b/src/cf/kerberos.m4
@@ -51,9 +51,11 @@ if test X$with_krb5 = Xyes; then
 fi
 
 BUILD_KRB5=no
+MAKE_KRB5=#
 if test X$conf_krb5 = XYES; then
        AC_MSG_RESULT([Configuring support for Kerberos 5 utilities])
        BUILD_KRB5=yes
+       MAKE_KRB5=
        save_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS $KRB5CFLAGS"
        save_LIBS="$LIBS"
@@ -122,6 +124,7 @@ if test "x$ac_cv_krb5_cc_register_exists" = "xyes"; then
 fi
 
 AC_SUBST(BUILD_KRB5)
+AC_SUBST(MAKE_KRB5)
 AC_SUBST(KRB5CFLAGS)
 AC_SUBST(KRB5LIBS)
 

diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in
index a203be845a423ce53b0e8cafc14a98db09f91aa0..c00e417767bf1b3c35e4ee5f7fd0fa4ec3083f4d 100644 (file)
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@@ -58,9 +58,7 @@ AUTH_KRB_OBJS = \
                aix_ktc_krb.o \
 
 AUTHLIBS= \
-               afs_dynamic_auth \
-               aklog_dynamic_auth \
-               afs_dynamic_kerbauth
+               afs_dynamic_auth afs_dynamic_kerbauth @MAKE_KRB5@ aklog_dynamic_auth
 
 IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp 
 LDFLAGS = -eafs_initialize ${IMPORTS} -lsys -lcsys -lc
@@ -120,7 +118,5 @@ ${DEST}/root.client/usr/vice/etc/aklog_dynamic_auth: aklog_dynamic_auth
        ${INSTALL} $? $@
 
 dest: \
-       ${DEST}/root.client/usr/vice/etc/afs_dynamic_auth \
-       ${DEST}/root.client/usr/vice/etc/aklog_dynamic_auth \
-       ${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth
+       ${DEST}/root.client/usr/vice/etc/afs_dynamic_auth ${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth @MAKE_KRB5@ ${DEST}/root.client/usr/vice/etc/aklog_dynamic_auth