From: Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Date: Wed, 30 Nov 2011 18:33:33 +0000 (+0000)
Subject: Merge branch 'master' of http://www.project-moonshot.org/git/moonshot
X-Git-Tag: tr-beta1~53
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=15667b85ab88615f0ee1693a39333f755f0974f7

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

Conflicts:
	moonshot/mech_eap/Makefile.am
---

15667b85ab88615f0ee1693a39333f755f0974f7
diff --cc moonshot/mech_eap/Makefile.am
index 720f79e,8c6f64c..23de6af
--- a/moonshot/mech_eap/Makefile.am
+++ b/moonshot/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