Search srcdir and objdir paths for rxkad includes

The addition of rxkad-k5 support in 1.6.5 introduced dependencies
on rxkad to the auth and afsauthent libraries.  However, the rxkad
headers used are both source files and generated files, so we must
add both the source and build tree rxkad directories to the include
search path.

This is a 1.6-only change, since on master we are using libtool
and do not need to reach into other parts of the source tree
to rebuild certain files into these libraries.

Change-Id: I819095a3e0ac259bba43205d0462659cbd2c6f03
Reviewed-on: http://gerrit.openafs.org/10736
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index c1cf575f63cfa419111b25afde50f74ca803fe85..1110b692815b472974c89d5c97f2a8159066535f 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -69,7 +69,7 @@ akimpersonate.o: akimpersonate.c ${INCLS}
        ${CCOBJ} ${CFLAGS} -c ${srcdir}/akimpersonate.c @KRB5_CPPFLAGS@
 
 akimpersonate_v5gen.o: akimpersonate_v5gen.c ${INCLS}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/akimpersonate_v5gen.c @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad
+       ${CCOBJ} ${CFLAGS} -c ${srcdir}/akimpersonate_v5gen.c @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad -I../rxkad
 
 userok.o: userok.c ${INCLS}
 cellconfig.o: cellconfig.c ${INCLS}

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index 6cc645aab75642eb79facc7e2663937d40988c85..2204e7bc7479588592469f34d72504add2937d76 100644 (file)
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -154,7 +154,7 @@ akimpersonate.o: ${AUTH}/akimpersonate.c
        ${CCRULE} -I../auth @KRB5_CPPFLAGS@
 
 akimpersonate_v5gen.o: ${AUTH}/akimpersonate_v5gen.c
-       ${CCRULE} -I../auth @KRB5_CPPFLAGS@ -I../rxkad
+       ${CCRULE} -I../auth @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad -I../rxkad
 
 ktc_errors.o: ${AUTH}/ktc_errors.c
        ${CCRULE}

diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index 6d6a86bb268fdfa9e33bb87dfdc1c6e4f00d26b1..923bdb61731e12d32194a10cd970c47bbb7fdc83 100644 (file)
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -206,7 +206,7 @@ akimpersonate.o: ${AUTH}/akimpersonate.c
        ${CCRULE} @KRB5_CPPFLAGS@
 
 akimpersonate_v5gen.o: ${AUTH}/akimpersonate_v5gen.c
-       ${CCRULE} @KRB5_CPPFLAGS@ -I../rxkad
+       ${CCRULE} @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad -I../rxkad
 
 ktc_errors.o: ${AUTH}/ktc_errors.c
        ${CCRULE}