summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/aclocal.m44
-rw-r--r--src/config/ChangeLog5
-rw-r--r--src/config/pre.in1
4 files changed, 13 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 867094fdd4..0789acaa06 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 72ee9b20dd..8001a9345f 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 fbbb4d8670..ccd89e12cc 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 de7f6d4552..bea1c7a86e 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@