More no-xxx option tweaks.

apps/speed.c

diff --git a/apps/speed.c b/apps/speed.c
index d369245..3cfb4db 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -123,9 +123,11 @@
 #endif
 #ifndef NO_MD5
 #include <openssl/md5.h>
-#include <openssl/hmac.h>
-#include <openssl/evp.h>
 #endif
+#ifndef NO_HMAC
+#include <openssl/hmac.h>
+#endif
+#include <openssl/evp.h>
 #ifndef NO_SHA
 #include <openssl/sha.h>
 #endif
@@ -756,7 +758,7 @@
 		}
 #endif
 
-#ifndef NO_MD5
+#if !defined(NO_MD5) && !defined(NO_HMAC)
 	if (doit[D_HMAC])
 		{
 		HMAC_CTX hctx;