diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-02-19 17:06:34 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-02-19 17:06:34 +0100 |
| commit | cf1b7d96647d55e533f779e476e3d4371f40445a (patch) | |
| tree | f7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/mdc2 | |
| parent | Remove temporary files when done. (diff) | |
| download | openssl-cf1b7d96647d55e533f779e476e3d4371f40445a.tar.xz openssl-cf1b7d96647d55e533f779e476e3d4371f40445a.zip | |
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.
Diffstat (limited to 'crypto/mdc2')
| -rw-r--r-- | crypto/mdc2/Makefile.ssl | 6 | ||||
| -rw-r--r-- | crypto/mdc2/mdc2.h | 2 | ||||
| -rw-r--r-- | crypto/mdc2/mdc2test.c | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/crypto/mdc2/Makefile.ssl b/crypto/mdc2/Makefile.ssl index 4b1b3e3696..b86234df9f 100644 --- a/crypto/mdc2/Makefile.ssl +++ b/crypto/mdc2/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 @@ -86,6 +87,7 @@ mdc2_one.o: ../../include/openssl/err.h ../../include/openssl/lhash.h mdc2_one.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h mdc2_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -mdc2_one.o: ../cryptlib.h +mdc2_one.o: ../cryptlib.h mdc2_one.c mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h +mdc2dgst.o: mdc2dgst.c diff --git a/crypto/mdc2/mdc2.h b/crypto/mdc2/mdc2.h index 5da8da72f5..a23f58afaf 100644 --- a/crypto/mdc2/mdc2.h +++ b/crypto/mdc2/mdc2.h @@ -65,7 +65,7 @@ extern "C" { #endif -#ifdef NO_MDC2 +#ifdef OPENSSL_NO_MDC2 #error MDC2 is disabled. #endif diff --git a/crypto/mdc2/mdc2test.c b/crypto/mdc2/mdc2test.c index 46c25aeff4..6a50e9debe 100644 --- a/crypto/mdc2/mdc2test.c +++ b/crypto/mdc2/mdc2test.c @@ -60,11 +60,11 @@ #include <stdlib.h> #include <string.h> -#if defined(NO_DES) && !defined(NO_MDC2) -#define NO_MDC2 +#if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2) +#define OPENSSL_NO_MDC2 #endif -#ifdef NO_MDC2 +#ifdef OPENSSL_NO_MDC2 int main(int argc, char *argv[]) { printf("No MDC2 support\n"); |