diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
| commit | cf1b7d96647d55e533f779e476e3d4371f40445a (patch) | |
| tree | f7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/idea | |
| parent | 649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff) | |
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/idea')
| -rw-r--r-- | crypto/idea/Makefile.ssl | 13 | ||||
| -rw-r--r-- | crypto/idea/idea.h | 2 | ||||
| -rw-r--r-- | crypto/idea/ideatest.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/crypto/idea/Makefile.ssl b/crypto/idea/Makefile.ssl index d29bcd6874..f2138ee3dc 100644 --- a/crypto/idea/Makefile.ssl +++ b/crypto/idea/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. i_cbc.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_cbc.o: idea_lcl.h +i_cbc.o: i_cbc.c idea_lcl.h i_cfb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_cfb64.o: idea_lcl.h +i_cfb64.o: i_cfb64.c idea_lcl.h i_ecb.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_ecb.o: ../../include/openssl/opensslv.h idea_lcl.h +i_ecb.o: ../../include/openssl/opensslv.h i_ecb.c idea_lcl.h i_ofb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_ofb64.o: idea_lcl.h +i_ofb64.o: i_ofb64.c idea_lcl.h i_skey.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_skey.o: idea_lcl.h +i_skey.o: i_skey.c idea_lcl.h diff --git a/crypto/idea/idea.h b/crypto/idea/idea.h index f14adf8398..67132414ee 100644 --- a/crypto/idea/idea.h +++ b/crypto/idea/idea.h @@ -59,7 +59,7 @@ #ifndef HEADER_IDEA_H #define HEADER_IDEA_H -#ifdef NO_IDEA +#ifdef OPENSSL_NO_IDEA #error IDEA is disabled. #endif diff --git a/crypto/idea/ideatest.c b/crypto/idea/ideatest.c index 64b9353e41..2c16f95b8a 100644 --- a/crypto/idea/ideatest.c +++ b/crypto/idea/ideatest.c @@ -60,7 +60,7 @@ #include <string.h> #include <stdlib.h> -#ifdef NO_IDEA +#ifdef OPENSSL_NO_IDEA int main(int argc, char *argv[]) { printf("No IDEA support\n"); |