[src/trunk]: src/external/bsd/tcpdump Fix MKCRYPTO=no build

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d210c949ebf1
branches:  trunk
changeset: 816302:d210c949ebf1
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 29 19:45:14 2016 +0000

description:
Fix MKCRYPTO=no build

diffstat:

 external/bsd/tcpdump/bin/Makefile     |  4 ++--
 external/bsd/tcpdump/include/config.h |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 01132f2682aa -r d210c949ebf1 external/bsd/tcpdump/bin/Makefile
--- a/external/bsd/tcpdump/bin/Makefile Wed Jun 29 19:36:56 2016 +0000
+++ b/external/bsd/tcpdump/bin/Makefile Wed Jun 29 19:45:14 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2015/03/31 21:59:35 christos Exp $     
+#      $NetBSD: Makefile,v 1.14 2016/06/29 19:45:14 christos Exp $     
 
 WARNS?=        1       # XXX: need to cleanup later
 
@@ -183,7 +183,7 @@
 .endif
 
 .if (${MKCRYPTO} != "no")
-CPPFLAGS+=-DHAVE_LIBCRYPTO=1 
+CPPFLAGS+=-DHAVE_LIBCRYPTO=1 -DHAVE_OPENSSL_EVP_H 
 LDADD+=        -lcrypto -lcrypt
 DPADD+=        ${LIBCRYPTO} ${LIBCRYPT}
 .endif
diff -r 01132f2682aa -r d210c949ebf1 external/bsd/tcpdump/include/config.h
--- a/external/bsd/tcpdump/include/config.h     Wed Jun 29 19:36:56 2016 +0000
+++ b/external/bsd/tcpdump/include/config.h     Wed Jun 29 19:45:14 2016 +0000
@@ -60,7 +60,8 @@
 /* #undef HAVE_LIBCAP_NG */
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
-#define HAVE_LIBCRYPTO 1
+/* in the Makefile */
+/* #undef HAVE_LIBCRYPTO */
 
 /* Define to 1 if you have the `rpc' library (-lrpc). */
 /* #undef HAVE_LIBRPC */
@@ -87,7 +88,8 @@
 #define HAVE_OPENAT 1
 
 /* Define to 1 if you have the <openssl/evp.h> header file. */
-#define HAVE_OPENSSL_EVP_H 1
+/* in the Makefile */
+/* #undef HAVE_OPENSSL_EVP_H */
 
 /* if there's an os_proto.h for this platform, to use additional prototypes */
 /* #undef HAVE_OS_PROTO_H */