From cf1b7d96647d55e533f779e476e3d4371f40445a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 19 Feb 2001 16:06:34 +0000 Subject: Make all configuration macros available for application by making sure they are available in opensslconf.h, by giving them names starting with "OPENSSL_" to avoid conflicts with other packages and by making sure e_os2.h will cover all platform-specific cases together with opensslconf.h. I've checked fairly well that nothing breaks with this (apart from external software that will adapt if they have used something like NO_KRB5), but I can't guarantee it completely, so a review of this change would be a good thing. --- crypto/rc2/Makefile.ssl | 13 +++++++------ crypto/rc2/rc2.h | 2 +- crypto/rc2/rc2test.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'crypto/rc2') diff --git a/crypto/rc2/Makefile.ssl b/crypto/rc2/Makefile.ssl index 6966e01b6f..6f0d93842e 100644 --- a/crypto/rc2/Makefile.ssl +++ b/crypto/rc2/Makefile.ssl @@ -11,7 +11,8 @@ INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl MAKE= make -f Makefile.ssl -MAKEDEPEND= $(TOP)/util/domd $(TOP) +MAKEDEPPROG= makedepend +MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile.ssl AR= ar r @@ -80,12 +81,12 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. rc2_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2_cbc.o: rc2_locl.h +rc2_cbc.o: rc2_cbc.c rc2_locl.h rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rc2_ecb.o: ../../include/openssl/rc2.h rc2_locl.h +rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h rc2_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2_skey.o: rc2_locl.h +rc2_skey.o: rc2_locl.h rc2_skey.c rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2cfb64.o: rc2_locl.h +rc2cfb64.o: rc2_locl.h rc2cfb64.c rc2ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2ofb64.o: rc2_locl.h +rc2ofb64.o: rc2_locl.h rc2ofb64.c diff --git a/crypto/rc2/rc2.h b/crypto/rc2/rc2.h index 076c0a067c..7816b454dc 100644 --- a/crypto/rc2/rc2.h +++ b/crypto/rc2/rc2.h @@ -59,7 +59,7 @@ #ifndef HEADER_RC2_H #define HEADER_RC2_H -#ifdef NO_RC2 +#ifdef OPENSSL_NO_RC2 #error RC2 is disabled. #endif diff --git a/crypto/rc2/rc2test.c b/crypto/rc2/rc2test.c index 521269ded1..d9a2a0a1cb 100644 --- a/crypto/rc2/rc2test.c +++ b/crypto/rc2/rc2test.c @@ -63,7 +63,7 @@ #include #include -#ifdef NO_RC2 +#ifdef OPENSSL_NO_RC2 int main(int argc, char *argv[]) { printf("No RC2 support\n"); -- cgit v1.2.3