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 867094fdd4eb8fdc5c786bfa4864d281a944bab2..0789acaa06da831ca960208e6385f0b8a994d920 100644 (file)
--- 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 72ee9b20dda982c767b7b7b6a0cfa991fde15875..8001a9345fd287dba5176bfa8465534d1dc2a79c 100644 (file)
--- 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 fbbb4d867084bd423c11363798c3e15c5d49f4af..ccd89e12cc6ccdefadddf716c83c2762e7c60ab7 100644 (file)
--- 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 de7f6d4552ef0f9c23cad7b4f5a325c8beac9a40..bea1c7a86e832b293c10bb16ac2ee06f7bd4f7b9 100644 (file)
--- 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@