From c1d545dff6483369ade640b27b9ab7baaa6faac5 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sat, 21 Mar 2009 15:49:07 +0000 Subject: [PATCH] aix-no-aklog-tsm-without-krb5-20090320 LICENSE IPL10 FIXES 124522 don't build aklog_dynamic_auth without krb5 --- src/cf/kerberos.m4 | 3 +++ src/tsm41/Makefile.in | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4 index 0fb4286..c1deb64 100644 --- a/src/cf/kerberos.m4 +++ b/src/cf/kerberos.m4 @@ -56,9 +56,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" @@ -127,6 +129,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 2aed417..45f9a03 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -62,9 +62,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 @@ -114,13 +112,12 @@ aix_auth.o: aix_ident.o: ${srcdir}/aix41_ident.c ${CCRULE} -dest: afs_dynamic_auth afs_dynamic_kerbauth aklog_dynamic_auth +dest: afs_dynamic_auth afs_dynamic_kerbauth @MAKE_KRB5@ aklog_dynamic_auth ${INSTALL} -d ${DEST}/root.client/usr/vice/etc ${INSTALL_PROGRAM} afs_dynamic_auth \ ${DEST}/root.client/usr/vice/etc/afs_dynamic_auth - ${INSTALL_PROGRAM} aklog_dynamic_auth \ - ${DEST}/root.client/usr/vice/etc/aklog_dynamic_auth ${INSTALL_PROGRAM} afs_dynamic_kerbauth \ ${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth + @MAKE_KRB5@ ${INSTALL_PROGRAM} aklog_dynamic_auth ${DEST}/root.client/usr/vice/etc/aklog_dynamic_auth -- 1.9.4