Merge branch 'master' into tlv-mic

diff --combined moonshot/mech_eap/Makefile.am
index e7e5f9f,d6ceac2..161ff9a
--- 1/moonshot/mech_eap/Makefile.am
--- 2/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@@ -28,7 -28,6 +28,7 @@@ mech_eap_la_SOURCES =                         
        acquire_cred_with_password.c            \
        add_cred.c                              \
        add_cred_with_password.c                \
 +      authorize_localname.c                   \
        canonicalize_name.c                     \
        compare_name.c                          \
        context_time.c                          \
@@@ -110,7 -109,7 +110,7 @@@ krb5pluginsdir = $(libdir)/krb5/plugins
  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@