From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 28 Dec 2009 00:21:00 +0000 (+0000)
Subject: Include prof_int.h in init_ctx.c instead of init_os_ctx.c,
X-Git-Tag: krb5-1.8-alpha1~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d595dd3cdf2cb986b0ffe978c78c847cb1a8294d;p=krb5.git

Include prof_int.h in init_ctx.c instead of init_os_ctx.c,
corresponding to the moved use of profile_copy in r23484.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23519 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 507be6e80..c5dc49adc 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -3,7 +3,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-LOCALINCLUDES = -I$(srcdir)/../os -I$(top_srcdir)
+LOCALINCLUDES = -I$(srcdir)/../os -I$(top_srcdir) -I$(top_srcdir)/util/profile
 DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\"
 
 ##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 3bdbdd508..c5c29ca3e 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -54,6 +54,7 @@
  */
 
 #include "k5-int.h"
+#include "prof_int.h"        /* XXX for profile_copy, not public yet */
 #include <ctype.h>
 #include "brand.c"
 /* There has to be a better way for windows... */
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 8a410ea34..8788c897a 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -5,7 +5,6 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\"
-LOCALINCLUDES=-I$(top_srcdir)/util/profile
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=os
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index 0b89740ed..70841a42f 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -31,7 +31,6 @@
 
 #include "k5-int.h"
 #include "os-proto.h"
-#include "prof_int.h"        /* XXX for profile_copy, not public yet */
 
 #ifdef USE_KIM
 #include "kim_library_private.h"