Merge branch 'master' of http://www.project-moonshot.org/git/moonshot

Conflicts:
	moonshot/mech_eap/Makefile.am

diff --cc acinclude.m4
Simple merge

diff --cc mech_eap/Makefile.am
index 720f79e,8c6f64c..23de6af
--- 1/mech_eap/Makefile.am
--- 2/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@@ -42,7 -42,7 +42,7 @@@ mech_eap_la_CXXFLAGS += 
                        @TARGET_CFLAGS@ $(EAP_CFLAGS)
  mech_eap_la_LDFLAGS  = -avoid-version -module \
                        -export-symbols $(GSSEAP_EXPORTS) -no-undefined \
-                       @KRB5_LDFLAGS@ @RADSEC_LDFLAGS@ @OPENSSL_LDFLAGS@ @TARGET_LDFLAGS@
 -                      @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
++                      @KRB5_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
  if TARGET_WINDOWS
  mech_eap_la_LDFLAGS += -debug
  endif