[25683] in CVS-changelog-for-Kerberos-V5
svn rev #25173: trunk/src/ config/ lib/apputils/ util/
daemon@ATHENA.MIT.EDU (ghudson@mit.edu)
Wed Sep 14 11:22:16 2011
Date: Wed, 14 Sep 2011 11:22:11 -0400
From: ghudson@mit.edu
Message-Id: <201109141522.p8EFMBAS011319@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25173
Commit By: ghudson
Log Message:
Fix verto-k5ev.h dependencies for system libverto.
When we build with the internal verto, we include verto-k5ev.h in
order to create loops. When we build with the system verto, we don't
include that header file. Add depfix logic and pre.in variables to
avoid depending on verto-k5ev.h for a system verto build.
Changed Files:
U trunk/src/config/pre.in
U trunk/src/lib/apputils/deps
U trunk/src/util/depfix.pl
Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in 2011-09-12 16:08:04 UTC (rev 25172)
+++ trunk/src/config/pre.in 2011-09-14 15:22:11 UTC (rev 25173)
@@ -367,6 +367,9 @@
VERTO_DEPS = $(VERTO_DEPS-@VERTO_VERSION@)
VERTO_DEPS-sys =
VERTO_DEPS-k5 = $(BUILDTOP)/include/verto.h
+VERTO_K5EV_DEPS = $(VERTO_K5EV_DEPS-@VERTO_VERSION@)
+VERTO_K5EV_DEPS-sys =
+VERTO_K5EV_DEPS-k5 = $(BUILDTOP)/include/verto-k5ev.h
# LIBS gets substituted in... e.g. -lnsl -lsocket
Modified: trunk/src/lib/apputils/deps
===================================================================
--- trunk/src/lib/apputils/deps 2011-09-12 16:08:04 UTC (rev 25172)
+++ trunk/src/lib/apputils/deps 2011-09-14 15:22:11 UTC (rev 25173)
@@ -16,19 +16,19 @@
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \
$(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
- $(BUILDTOP)/include/verto-k5ev.h $(COM_ERR_DEPS) $(VERTO_DEPS) \
- $(top_srcdir)/include/adm_proto.h $(top_srcdir)/include/fake-addrinfo.h \
- $(top_srcdir)/include/foreachaddr.h $(top_srcdir)/include/gssrpc/auth.h \
- $(top_srcdir)/include/gssrpc/auth_gss.h $(top_srcdir)/include/gssrpc/auth_unix.h \
- $(top_srcdir)/include/gssrpc/clnt.h $(top_srcdir)/include/gssrpc/rename.h \
- $(top_srcdir)/include/gssrpc/rpc.h $(top_srcdir)/include/gssrpc/rpc_msg.h \
- $(top_srcdir)/include/gssrpc/svc.h $(top_srcdir)/include/gssrpc/svc_auth.h \
- $(top_srcdir)/include/gssrpc/xdr.h $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/net-server.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h net-server.c
+ $(COM_ERR_DEPS) $(VERTO_DEPS) $(VERTO_K5EV_DEPS) $(top_srcdir)/include/adm_proto.h \
+ $(top_srcdir)/include/fake-addrinfo.h $(top_srcdir)/include/foreachaddr.h \
+ $(top_srcdir)/include/gssrpc/auth.h $(top_srcdir)/include/gssrpc/auth_gss.h \
+ $(top_srcdir)/include/gssrpc/auth_unix.h $(top_srcdir)/include/gssrpc/clnt.h \
+ $(top_srcdir)/include/gssrpc/rename.h $(top_srcdir)/include/gssrpc/rpc.h \
+ $(top_srcdir)/include/gssrpc/rpc_msg.h $(top_srcdir)/include/gssrpc/svc.h \
+ $(top_srcdir)/include/gssrpc/svc_auth.h $(top_srcdir)/include/gssrpc/xdr.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/net-server.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ net-server.c
Modified: trunk/src/util/depfix.pl
===================================================================
--- trunk/src/util/depfix.pl 2011-09-12 16:08:04 UTC (rev 25172)
+++ trunk/src/util/depfix.pl 2011-09-14 15:22:11 UTC (rev 25173)
@@ -141,6 +141,7 @@
s;\$\(BUILDTOP\)/include/com_err.h ;\$(COM_ERR_DEPS) ;g;
s;\$\(BUILDTOP\)/include/ss/ss.h \$\(BUILDTOP\)/include/ss/ss_err.h ;\$(SS_DEPS) ;g;
s;\$\(BUILDTOP\)/include/db-config.h \$\(BUILDTOP\)/include/db.h ;\$(DB_DEPS) ;g;
+ s;\$\(BUILDTOP\)/include/verto-k5ev.h ;\$(VERTO_K5EV_DEPS) ;g;
s;\$\(BUILDTOP\)/include/verto.h ;\$(VERTO_DEPS) ;g;
$_ = &uniquify($_);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
