Module Name:    src
Committed By:   spz
Date:           Tue Jul  5 10:03:10 UTC 2011

Modified Files:
        src/tests/crypto/libcrypto/idea: Makefile
        src/tests/crypto/libcrypto/mdc2: Makefile
        src/tests/crypto/libcrypto/rc5: Makefile

Log Message:
give the idea, rc5 and mdc2 checks a chance of working if they are defined
to be compiled


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/idea/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/mdc2/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/rc5/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/crypto/libcrypto/idea/Makefile
diff -u src/tests/crypto/libcrypto/idea/Makefile:1.2 src/tests/crypto/libcrypto/idea/Makefile:1.3
--- src/tests/crypto/libcrypto/idea/Makefile:1.2	Sun Jun 12 16:16:26 2011
+++ src/tests/crypto/libcrypto/idea/Makefile	Tue Jul  5 10:03:09 2011
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2011/06/12 16:16:26 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:09 spz Exp $
 
 HELPER_NAME=	ideatest
 HELPER_DIR=	idea
 
-LDADD+=		-Wl,--no-fatal-warnings
-
 .include <bsd.init.mk>
+
+.if ${MKCRYPTO_IDEA} != "no"
+LDADD= -lcrypto_idea -lcrypto
+.else
+CPPFLAGS+= -DOPENSSL_NO_IDEA
+.endif
+
+LDADD+=		-Wl,--no-fatal-warnings

Index: src/tests/crypto/libcrypto/mdc2/Makefile
diff -u src/tests/crypto/libcrypto/mdc2/Makefile:1.2 src/tests/crypto/libcrypto/mdc2/Makefile:1.3
--- src/tests/crypto/libcrypto/mdc2/Makefile:1.2	Sun Jun 12 16:16:26 2011
+++ src/tests/crypto/libcrypto/mdc2/Makefile	Tue Jul  5 10:03:10 2011
@@ -1,6 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2011/06/12 16:16:26 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:10 spz Exp $
 
 HELPER_NAME=	mdc2test
 HELPER_DIR=	mdc2
 
 .include <bsd.init.mk>
+
+.if ${MKCRYPTO_MDC2} != "no"
+LDADD= -lcrypto_mdc2 -lcrypto
+.else
+CPPFLAGS+= -DOPENSSL_NO_MDC2
+.endif
+
+LDADD+=         -Wl,--no-fatal-warnings

Index: src/tests/crypto/libcrypto/rc5/Makefile
diff -u src/tests/crypto/libcrypto/rc5/Makefile:1.2 src/tests/crypto/libcrypto/rc5/Makefile:1.3
--- src/tests/crypto/libcrypto/rc5/Makefile:1.2	Sun Jun 12 16:16:27 2011
+++ src/tests/crypto/libcrypto/rc5/Makefile	Tue Jul  5 10:03:10 2011
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2011/06/12 16:16:27 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:10 spz Exp $
 
 HELPER_NAME=	rc5test
 HELPER_DIR=	rc5
 
-LDADD+=		-Wl,--no-fatal-warnings
-
 .include <bsd.init.mk>
+
+.if ${MKCRYPTO_RC5} != "no"
+LDADD= -lcrypto_rc5 -lcrypto
+.else
+CPPFLAGS+= -DOPENSSL_NO_RC5
+.endif
+
+LDADD+=		-Wl,--no-fatal-warnings

Reply via email to