From owner-svn-src-head@FreeBSD.ORG  Sat Apr 28 11:02:33 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 943CA106566B;
	Sat, 28 Apr 2012 11:02:33 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EBDA8FC12;
	Sat, 28 Apr 2012 11:02:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3SB2Xr6057616;
	Sat, 28 Apr 2012 11:02:33 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3SB2XOr057614;
	Sat, 28 Apr 2012 11:02:33 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201204281102.q3SB2XOr057614@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 28 Apr 2012 11:02:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234758 - head/usr.sbin/wpa/hostapd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2012 11:02:33 -0000

Author: bschmidt
Date: Sat Apr 28 11:02:32 2012
New Revision: 234758
URL: http://svn.freebsd.org/changeset/base/234758

Log:
  not only the file names have changed from eap_xxx.c to eap_server_xxx.c,
  the defines too
  
  MFC after:	2 weeks

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

Modified: head/usr.sbin/wpa/hostapd/Makefile
==============================================================================
--- head/usr.sbin/wpa/hostapd/Makefile	Sat Apr 28 11:01:12 2012	(r234757)
+++ head/usr.sbin/wpa/hostapd/Makefile	Sat Apr 28 11:02:32 2012	(r234758)
@@ -106,13 +106,13 @@ SRCS+=	dump_state.c \
 	eap_server_ttls.c \
 	tls_openssl.c
 
-.if !empty(CFLAGS:M*-DEAP_AKA)
+.if !empty(CFLAGS:M*-DEAP_SERVER_AKA)
 NEED_SIM_COMMON=	true
 NEED_SHA256=	true
 SRCS+=	eap_server_aka.c
 .endif
 
-.if !empty(CFLAGS:M*-DEAP_SIM)
+.if !empty(CFLAGS:M*-DEAP_SERVER_SIM)
 NEED_SIM_COMMON=	true
 SRCS+=	eap_server_sim.c
 .endif
@@ -124,7 +124,7 @@ NEED_AES_CBC=	true
 NEED_FIPS186_2_PRF=	true
 .endif
 
-.if !empty(CFLAGS:M*-DEAP_GPSK)
+.if !empty(CFLAGS:M*-DEAP_SERVER_GPSK)
 CFLAGS+=-DEAP_GPSK_SHA256
 SRCS+=	eap_server_gpsk.c \
 	eap_gpsk_common.c
@@ -132,12 +132,12 @@ NEED_SHA256=	true
 NEED_AES_OMAC1=	true
 .endif
 
-.if !empty(CFLAGS:M*-DEAP_PAX)
+.if !empty(CFLAGS:M*-DEAP_SERVER_PAX)
 SRCS+=	eap_server_pax.c \
 	eap_pax_common.c
 .endif
 
-.if !empty(CFLAGS:M*-DEAP_SAKE)
+.if !empty(CFLAGS:M*-DEAP_SERVER_SAKE)
 SRCS+=	eap_server_sake.c \
 	eap_sake_common.c
 .endif