From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 8 Apr 2006 06:52:21 +0000 (+0000)
Subject: Move definitions of KRB5_PRIVATE and KRB5_DEPRECATED from autoconf.h
X-Git-Tag: krb5-1.5-alpha1~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=befa9f2d7069f826d2f49c458bf73d82132c36ba;p=krb5.git

Move definitions of KRB5_PRIVATE and KRB5_DEPRECATED from autoconf.h
to $(ALL_CFLAGS).

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 867094fdd..0789acaa0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-08  Ken Raeburn  <raeburn@mit.edu>
+
+	* aclocal.m4 (CONFIG_RULES): Don't define KRB5_PRIVATE or
+	KRB5_DEPRECATED.
+
 2006-04-05  Tom Yu  <tlyu@mit.edu>
 
 	* configure.in: Add prerequisites (application-defined macros) for
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 72ee9b20d..8001a9345 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -81,8 +81,8 @@ KRB5_AC_CHOOSE_ET dnl
 KRB5_AC_CHOOSE_SS dnl
 KRB5_AC_CHOOSE_DB dnl
 dnl allow stuff in tree to access deprecated/private stuff for now
-AC_DEFINE([KRB5_PRIVATE], 1, [Define only if building in-tree])
-AC_DEFINE([KRB5_DEPRECATED], 1, [Define only if building in-tree])
+dnl AC_DEFINE([KRB5_PRIVATE], 1, [Define only if building in-tree])
+dnl AC_DEFINE([KRB5_DEPRECATED], 1, [Define only if building in-tree])
 AC_C_CONST dnl
 WITH_NETLIB dnl
 WITH_HESIOD dnl
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index fbbb4d867..ccd89e12c 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-08  Ken Raeburn  <raeburn@mit.edu>
+
+	* pre.in (ALL_CFLAGS): Always define KRB5_DEPRECATED and
+	KRB5_PRIVATE.
+
 2006-03-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* wconfig.pl: New file.
diff --git a/src/config/pre.in b/src/config/pre.in
index de7f6d455..bea1c7a86 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -158,6 +158,7 @@ FAKELIBDIR=$(FAKEPREFIX)/lib
 # PTHREAD_CFLAGS set by configure, not included in CFLAGS so that we
 #		don't pull the pthreads library into shared libraries
 ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
+	-DKRB5_DEPRECATED=1 -DKRB5_PRIVATE=1 \
 	$(CPPFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
 
 CFLAGS = @CFLAGS@