Author: bschmidt
Date: Sat Apr 28 11:01:12 2012
New Revision: 234757
URL: http://svn.freebsd.org/changeset/base/234757

Log:
  enable EAP_GTC and EAP_OTP to match upstream's default configuration
  
  MFC after:    2 weeks

Modified:
  head/usr.sbin/wpa/wpa_supplicant/Makefile

Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- head/usr.sbin/wpa/wpa_supplicant/Makefile   Sat Apr 28 10:59:29 2012        
(r234756)
+++ head/usr.sbin/wpa/wpa_supplicant/Makefile   Sat Apr 28 11:01:12 2012        
(r234757)
@@ -81,9 +81,11 @@ LDADD+=${WPA_SUPPLICANT_LDADD}
 
 .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
 
-CFLAGS+=-DEAP_LEAP \
+CFLAGS+=-DEAP_GTC \
+       -DEAP_LEAP \
        -DEAP_MD5 \
        -DEAP_MSCHAPv2 \
+       -DEAP_OTP \
        -DEAP_PEAP \
        -DEAP_PSK \
        -DEAP_TLS \
@@ -96,10 +98,12 @@ SRCS+=      chap.c \
        crypto_openssl.c \
        eap.c \
        eap_common.c \
+       eap_gtc.c \
        eap_leap.c \
        eap_md5.c \
        eap_methods.c \
        eap_mschapv2.c \
+       eap_otp.c \
        eap_peap.c \
        eap_peap_common.c \
        eap_psk.c \
@@ -112,14 +116,6 @@ SRCS+=     chap.c \
        mschapv2.c \
        tls_openssl.c
 
-.if !empty(CFLAGS:M*-DEAP_GTC)
-SRCS+= eap_gtc.c
-.endif
-
-.if !empty(CFLAGS:M*-DEAP_OTP)
-SRCS+= eap_otp.c
-.endif
-
 .if !empty(CFLAGS:M*-DEAP_AKA)
 NEED_SIM_COMMON=       true
 SRCS+= eap_aka.c
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to