From 016f03a8232813999a2be3f948bbf75e5d579191 Mon Sep 17 00:00:00 2001
From: sam <sam@FreeBSD.org>
Date: Sat, 10 Nov 2007 20:26:08 +0000
Subject: fix building w/ WITHOUT_WPA_SUPPLICANT_EAPOL

MFC after:	1 week
---
 usr.sbin/wpa/wpa_supplicant/Makefile | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'usr.sbin/wpa/wpa_supplicant')

diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index f6b18d5..9dd9536 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -102,25 +102,36 @@ SRCS+=	eap_pax.c eap_pax_common.c
 SRCS+=	eap_sake.c eap_sake_common.c
 .endif
 
-.if defined(NEED_SHA256)
-CFLAGS+=-DINTERNAL_SHA256
-SRCS+=	sha256.c
-.endif
-
 # NB: requires patch to openssl
 #CFLAGS+= -DEAP_FAST
 #SRCS+=	eap_fast.c
 
-DPADD+= ${LIBSSL} ${LIBCRYPTO}
-LDADD+= -lssl -lcrypto
+NEED_LIBSSL=	true
 .else
 CFLAGS+= -DEAP_TLS_NONE
+SRCS+=	tls_none.c
+.endif
+
+.endif
+
+#
+# Configure crypto/cipher support.
+#
+# EAPOL support requires openssl in which case we use their
+# cipher code.  Otherwise we use our internal versions.
+#
+.if !defined(NEED_LIBSSL)
 CFLAGS+= -DINTERNAL_AES
 CFLAGS+= -DINTERNAL_SHA1
 CFLAGS+= -DINTERNAL_MD5
-SRCS+=	tls_none.c
+.else
+DPADD+= ${LIBSSL} ${LIBCRYPTO}
+LDADD+= -lssl -lcrypto
 .endif
 
+.if defined(NEED_SHA256)
+CFLAGS+=-DINTERNAL_SHA256
+SRCS+=	sha256.c
 .endif
 
 .include <bsd.prog.mk>
-- 
cgit v1.1