OpenSSL: Eliminate some options from CFLAGS.

These are already included in opensslconf.h, so there's no need to put
them in CFLAGS too.

diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index eb70965..6b7f4ec 100644 (file)
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -304,8 +304,6 @@ opensslconf.h: opensslconf-${MACHINE_ARCH}.h
        cp ${.ALLSRC} ${.TARGET}
 .endif
 
-MKDEP= -DOPENSSL_DOING_MAKEDEPEND
-
 .include <bsd.lib.mk>
 
 .if defined(WANT_IDEA)

diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 1406dc7..f1aad5b 100644 (file)
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -9,14 +9,6 @@ CFLAGS+=       -DTERMIOS -DANSI_SOURCE
 CFLAGS+=       -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto \
                -I${LCRYPTO_SRC}/crypto/engine -I${.OBJDIR}
 
-CFLAGS+=       -DOPENSSL_NO_GMP
-CFLAGS+=       -DOPENSSL_NO_CMS
-CFLAGS+=       -DOPENSSL_NO_JPAKE
-
-.if !defined(WANT_IDEA)
-CFLAGS+=       -DOPENSSL_NO_IDEA
-.endif
-
 .if ${MACHINE_ARCH} == "i386"
 CFLAGS+= -DL_ENDIAN
 .endif