diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-04-08 06:52:21 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-04-08 06:52:21 +0000 |
| commit | befa9f2d7069f826d2f49c458bf73d82132c36ba (patch) | |
| tree | 92ea25bf9ec49cf6a4d6437ad40c7ea4e5bcb956 /src | |
| parent | ea9539073b7b1fd23f7b8c8a1317b45bcb4f4599 (diff) | |
| download | krb5-befa9f2d7069f826d2f49c458bf73d82132c36ba.tar.gz krb5-befa9f2d7069f826d2f49c458bf73d82132c36ba.tar.xz krb5-befa9f2d7069f826d2f49c458bf73d82132c36ba.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/aclocal.m4 | 4 | ||||
| -rw-r--r-- | src/config/ChangeLog | 5 | ||||
| -rw-r--r-- | src/config/pre.in | 1 |
4 files changed, 13 insertions, 2 deletions
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@ |