diff options
| author | Sam Hartman <hartmans@mit.edu> | 2011-09-19 00:58:48 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2011-09-19 00:58:48 +0000 |
| commit | 1bea93afe54270b3ecddcf869ca6472fa5ccde3c (patch) | |
| tree | 833a776c897c0c616ac14588fe6f7fb434c88b43 /src/config | |
| parent | e3cc5d5ece7593084a252e03f77a6fe5b3a9edc0 (diff) | |
| download | krb5-1bea93afe54270b3ecddcf869ca6472fa5ccde3c.tar.gz krb5-1bea93afe54270b3ecddcf869ca6472fa5ccde3c.tar.xz krb5-1bea93afe54270b3ecddcf869ca6472fa5ccde3c.zip | |
Protect autoconf #defines (HAVE_FOO, et al) in win-mac.h with #ifdef KRB5_PRIVATE add -DKRB5_PRIVATE to CPPFLAGS in win-pre.in and to ALL_CXXFLAGS and ALL_CFLAGS in pre.in
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Signed-off-by: Sam Hartman <hartmans@debian.org>
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25199 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/pre.in | 2 | ||||
| -rw-r--r-- | src/config/win-pre.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/config/pre.in b/src/config/pre.in index e009deaf0..01f102e62 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -156,9 +156,11 @@ FAKELIBDIR=$(FAKEPREFIX)/lib # don't pull the pthreads library into shared libraries ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \ -DKRB5_DEPRECATED=1 \ + -DKRB5_PRIVATE \ $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS) ALL_CXXFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \ -DKRB5_DEPRECATED=1 \ + -DKRB5_PRIVATE \ $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS) CFLAGS = @CFLAGS@ diff --git a/src/config/win-pre.in b/src/config/win-pre.in index d992d9599..ff79095fd 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -130,7 +130,7 @@ KFWFLAGS=-DUSE_LEASH=1 CC=cl PDB_OPTS=-Fd$(OUTPRE)\ -FD -CPPFLAGS=-I$(top_srcdir)\include -I$(top_srcdir)\include\krb5 $(DNSFLAGS) -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -D_CRT_SECURE_NO_DEPRECATE $(KFWFLAGS) $(TIME_T_FLAGS) +CPPFLAGS=-I$(top_srcdir)\include -I$(top_srcdir)\include\krb5 $(DNSFLAGS) -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -DKRB5_PRIVATE -D_CRT_SECURE_NO_DEPRECATE $(KFWFLAGS) $(TIME_T_FLAGS) CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF) LOPTS=-nologo -incremental:no |