From 9fc754f4395a42f05234c5dc9d27e44b7e4fccf6 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sun, 2 Apr 2006 00:22:59 +0000 Subject: [PATCH] don't use configure-defined macros on command line, use autoconf.h only git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17830 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/ChangeLog | 4 ++++ src/lib/crypto/Makefile.in | 1 + src/lib/crypto/aes/ChangeLog | 4 ++++ src/lib/crypto/aes/Makefile.in | 1 + src/lib/crypto/arcfour/ChangeLog | 4 ++++ src/lib/crypto/arcfour/Makefile.in | 1 + src/lib/crypto/crc32/ChangeLog | 4 ++++ src/lib/crypto/crc32/Makefile.in | 1 + src/lib/crypto/des/ChangeLog | 4 ++++ src/lib/crypto/des/Makefile.in | 1 + src/lib/crypto/dk/ChangeLog | 4 ++++ src/lib/crypto/dk/Makefile.in | 1 + src/lib/crypto/enc_provider/ChangeLog | 4 ++++ src/lib/crypto/enc_provider/Makefile.in | 1 + src/lib/crypto/hash_provider/ChangeLog | 4 ++++ src/lib/crypto/hash_provider/Makefile.in | 1 + src/lib/crypto/keyhash_provider/ChangeLog | 4 ++++ src/lib/crypto/keyhash_provider/Makefile.in | 1 + src/lib/crypto/md4/ChangeLog | 4 ++++ src/lib/crypto/md4/Makefile.in | 1 + src/lib/crypto/md5/ChangeLog | 4 ++++ src/lib/crypto/md5/Makefile.in | 1 + src/lib/crypto/old/ChangeLog | 4 ++++ src/lib/crypto/old/Makefile.in | 1 + src/lib/crypto/raw/ChangeLog | 4 ++++ src/lib/crypto/raw/Makefile.in | 1 + src/lib/crypto/sha1/ChangeLog | 4 ++++ src/lib/crypto/sha1/Makefile.in | 1 + src/lib/crypto/yarrow/ChangeLog | 4 ++++ src/lib/crypto/yarrow/Makefile.in | 1 + 30 files changed, 75 insertions(+) diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 66c87632f..7c837afb1 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2006-01-17 Ken Raeburn * Makefile.in (t_nfold$(EXEEXT)): Include support library. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 4de098c07..7835d0961 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -12,6 +12,7 @@ LOCALINCLUDES = -I$(srcdir)/enc_provider \ RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) +DEFS= EXTRADEPSRCS=\ $(srcdir)/t_nfold.c \ diff --git a/src/lib/crypto/aes/ChangeLog b/src/lib/crypto/aes/ChangeLog index 699042caa..2c277d203 100644 --- a/src/lib/crypto/aes/ChangeLog +++ b/src/lib/crypto/aes/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2006-03-30 Ken Raeburn * aesopt.h: Include autoconf.h. diff --git a/src/lib/crypto/aes/Makefile.in b/src/lib/crypto/aes/Makefile.in index b60fe46bb..2a52a3337 100644 --- a/src/lib/crypto/aes/Makefile.in +++ b/src/lib/crypto/aes/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/crypto/aes mydir=aes BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../dk +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=aes diff --git a/src/lib/crypto/arcfour/ChangeLog b/src/lib/crypto/arcfour/ChangeLog index 1eaac886c..fb2680c4d 100644 --- a/src/lib/crypto/arcfour/ChangeLog +++ b/src/lib/crypto/arcfour/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2005-10-19 Ken Raeburn * arcfour_s2k.c (asctouni): Counter should be size_t, like len. diff --git a/src/lib/crypto/arcfour/Makefile.in b/src/lib/crypto/arcfour/Makefile.in index 0503551d8..0a823d5a5 100644 --- a/src/lib/crypto/arcfour/Makefile.in +++ b/src/lib/crypto/arcfour/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/crypto/arcfour mydir=arcfour BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../md4 +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=arcfour diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index a61fb7966..b8712ac79 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2005-12-02 Ken Raeburn * Makefile.in (t_crc): Build against support library. diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index ef0d6bb6b..8088887d8 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -2,6 +2,7 @@ thisconfigdir=./.. myfulldir=lib/crypto/crc32 mydir=crc32 BUILDTOP=$(REL)..$(S)..$(S).. +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=crc32 diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 5aee62fc2..12505a2ae 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2006-01-17 Ken Raeburn * Makefile.in (destest$(EXEEXT)): Include support library. diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 145767577..137f905b5 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -2,6 +2,7 @@ thisconfigdir=./.. myfulldir=lib/crypto/des mydir=des BUILDTOP=$(REL)..$(S)..$(S).. +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=des diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog index 5e9886700..570658035 100644 --- a/src/lib/crypto/dk/ChangeLog +++ b/src/lib/crypto/dk/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2005-05-19 Sam Hartman * dk_prf.c (krb5int_dk_prf): Use k5crypto versions of keyblock memory management diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in index 7891f7e76..95a9387f1 100644 --- a/src/lib/crypto/dk/Makefile.in +++ b/src/lib/crypto/dk/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/crypto/dk mydir=dk BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=dk diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog index cd6256953..b79611f43 100644 --- a/src/lib/crypto/enc_provider/ChangeLog +++ b/src/lib/crypto/enc_provider/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2005-07-02 Ken Raeburn * rc4.c: Renamed from arcfour.c. diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in index 850da10cf..1d3cfb45b 100644 --- a/src/lib/crypto/enc_provider/Makefile.in +++ b/src/lib/crypto/enc_provider/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/crypto/enc_provider mydir=enc_provider BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../arcfour -I$(srcdir)/../aes +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=enc_provider diff --git a/src/lib/crypto/hash_provider/ChangeLog b/src/lib/crypto/hash_provider/ChangeLog index d1fa65733..f09c84ceb 100644 --- a/src/lib/crypto/hash_provider/ChangeLog +++ b/src/lib/crypto/hash_provider/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2003-07-22 Ken Raeburn * hash_crc32.c (k5_crc32_hash_size, k5_crc32_block_size): diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in index ff5c40069..dec89ff47 100644 --- a/src/lib/crypto/hash_provider/Makefile.in +++ b/src/lib/crypto/hash_provider/Makefile.in @@ -4,6 +4,7 @@ mydir=hash_provider BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../crc32 -I$(srcdir)/../md4 \ -I$(srcdir)/../md5 -I$(srcdir)/../sha1 +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=hash_provider diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog index 6f442b1f3..e5d74330e 100644 --- a/src/lib/crypto/keyhash_provider/ChangeLog +++ b/src/lib/crypto/keyhash_provider/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2004-05-13 Ken Raeburn * Makefile.in (t_cksum4, t_cksum5): Link test programs against diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in index e0f4376d4..8ededb954 100644 --- a/src/lib/crypto/keyhash_provider/Makefile.in +++ b/src/lib/crypto/keyhash_provider/Makefile.in @@ -5,6 +5,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../md4 \ -I$(srcdir)/../md5 -I$(srcdir)/../arcfour \ -I$(srcdir)/../hash_provider +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=keyhash_provider diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index 5537d8570..7fc3b00de 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2006-01-17 Ken Raeburn * Makefile.in (t_mddriver): Include support library. Use diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index 43eb12a3d..7d4dcdef7 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/crypto/md4 mydir=md4 BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir) +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=md4 diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index bd9a81712..e807323db 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2006-01-17 Ken Raeburn * Makefile.in (t_mddriver): Include support library. Use diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 9732f399c..cdd753c27 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -2,6 +2,7 @@ thisconfigdir=./.. myfulldir=lib/crypto/md5 mydir=md5 BUILDTOP=$(REL)..$(S)..$(S).. +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=md5 diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog index 34d257f6c..af8d94374 100644 --- a/src/lib/crypto/old/ChangeLog +++ b/src/lib/crypto/old/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2004-02-18 Ken Raeburn * des_stringtokey.c: Use ANSI C style function definitions. diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in index 439a6c89e..e8e0e8577 100644 --- a/src/lib/crypto/old/Makefile.in +++ b/src/lib/crypto/old/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/crypto/old mydir=old BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../des +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=old diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog index 937242118..311cade1c 100644 --- a/src/lib/crypto/raw/ChangeLog +++ b/src/lib/crypto/raw/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2004-02-18 Ken Raeburn * raw_decrypt.c, raw_encrypt.c: Use ANSI C style function diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in index 015b1e89f..90e0e40ec 100644 --- a/src/lib/crypto/raw/Makefile.in +++ b/src/lib/crypto/raw/Makefile.in @@ -2,6 +2,7 @@ thisconfigdir=./.. myfulldir=lib/crypto/raw mydir=raw BUILDTOP=$(REL)..$(S)..$(S).. +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=raw diff --git a/src/lib/crypto/sha1/ChangeLog b/src/lib/crypto/sha1/ChangeLog index f072402de..8c473b5e6 100644 --- a/src/lib/crypto/sha1/ChangeLog +++ b/src/lib/crypto/sha1/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2006-03-30 Ken Raeburn * shs.c: Include shs.h first. diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in index ad1f240b0..558537e3c 100644 --- a/src/lib/crypto/sha1/Makefile.in +++ b/src/lib/crypto/sha1/Makefile.in @@ -2,6 +2,7 @@ thisconfigdir=./.. myfulldir=lib/crypto/sha1 mydir=sha1 BUILDTOP=$(REL)..$(S)..$(S).. +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=sha1 diff --git a/src/lib/crypto/yarrow/ChangeLog b/src/lib/crypto/yarrow/ChangeLog index 1f9f68ae0..b38b00946 100644 --- a/src/lib/crypto/yarrow/ChangeLog +++ b/src/lib/crypto/yarrow/ChangeLog @@ -1,3 +1,7 @@ +2006-04-01 Ken Raeburn + + * Makefile.in (DEFS): Make empty. + 2006-03-11 Ken Raeburn * ytypes.h: Don't look for autoconf.h in krb5/. diff --git a/src/lib/crypto/yarrow/Makefile.in b/src/lib/crypto/yarrow/Makefile.in index ac94b49d4..6fbb29300 100644 --- a/src/lib/crypto/yarrow/Makefile.in +++ b/src/lib/crypto/yarrow/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/crypto/yarrow mydir=yarrow BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../sha1 -I$(srcdir)/../enc_provider +DEFS= ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=yarrow -- 2.26.2