diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
| commit | 530043377ee6f39b9ca95c13f6260602e6fe7674 (patch) | |
| tree | 28fd4b42c486d7097c4cd537d90042bb5fda3852 /src/config | |
| parent | e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e (diff) | |
| download | krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.gz krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.xz krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.zip | |
Fix Windows build
Repair the Windows build. Tested with the prepare-on-Unix method.
Some specific changes include:
* Removed the IPC finalizer (no longer used after r20787) from
ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency
chain for the pingtest build in ccapi/test. Also updated pingtest
to use the k5_ipc_stream interfaces since cci_stream is gone.
* Reverted the apparently non-functional r20277.
* klist -V prints just "Kerberos for Windows", since it has no access
to PACKAGE_NAME and PACKAGE_VERSION from autoconf. This should be
addressed correctly.
* krb5, telnet, gssftp, and NIM are removed from the build.
* Some files had CRLFs; these were replaced with LFs and the
svn:eol-style property set on the files. Otherwise the CRLFs became
CRCRLFs after the zip transfer.
* Windows does not have opendir/readdir, so added Windows code to
prof_parse.c for includedir. Probable fodder for a libkrb5support
portability shim.
ticket: 6826
target_version: 1.9
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24533 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/pre.in | 4 | ||||
| -rw-r--r-- | src/config/win-pre.in | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/config/pre.in b/src/config/pre.in index 8efa54913f..de08645550 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -411,6 +411,10 @@ TCL_RPATH = @TCL_RPATH@ TCL_MAYBE_RPATH = @TCL_MAYBE_RPATH@ TCL_INCLUDES = @TCL_INCLUDES@ +# Crypto and PRNG back-end selections +CRYPTO_IMPL = @CRYPTO_IMPL@ +PRNG_ALG = @PRNG_ALG@ + # error table rules # ### /* these are invoked as $(...) foo.et, which works, but could be better */ diff --git a/src/config/win-pre.in b/src/config/win-pre.in index 52f0e5b475..a71d88da3e 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -228,6 +228,9 @@ MFLAGS=$(MAKEFLAGS) MAKE=-$(MAKE) !endif +CRYPTO_IMPL = builtin +PRNG_ALG = yarrow + CFLAGS = $(CCOPTS) ALL_CFLAGS = $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS) |