Merge branch 'master' into tlv-mic

diff --git a/moonshot/libeap b/moonshot/libeap
index c6c1392..6fab6ed 160000 (submodule)
--- a/moonshot/libeap
+++ b/moonshot/libeap
@@ -1 +1 @@
-Subproject commit c6c13928e5304a63d4bf1b6960caa1104f674579
+Subproject commit 6fab6ed9540dce79b7a0f227a7c87f7a427052c8

diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am
index e7e5f9f..161ff9a 100644 (file)
--- a/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@ -110,7 +110,7 @@ krb5pluginsdir = $(libdir)/krb5/plugins/authdata
 krb5plugins_LTLIBRARIES = radius_ad.la
 
 radius_ad_la_CFLAGS  = -Werror -Wall -Wunused-parameter \
-                       @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
+                       @KRB5_CFLAGS@ $(EAP_CFLAGS) @RADSEC_CFLAGS@ @TARGET_CFLAGS@
 radius_ad_la_LDFLAGS = -avoid-version -module \
                       -export-symbols radius_ad.exports -no-undefined
 radius_ad_la_LIBADD  = @KRB5_LIBS@