X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=aa222047228dbe35a6b61a6050a1f2204e6db753;hb=b47c10882ea3409098780eb9608d3008c91f076d;hp=7cbe2037d5b38952d4bdc38790e40ff87555d051;hpb=c782e76527626566bb4d6fddf38f83beea0aa72a;p=mech_eap.orig

diff --git a/Makefile.am b/Makefile.am
index 7cbe203..aa22204 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,16 @@ gssdir = $(libdir)/gss
 
 gss_LTLIBRARIES = libmech_eap.la
 
-libmech_eap_la_CFLAGS  = -DBUILD_GSSEAP_LIB -g -Wall -fno-strict-aliasing \
-                         @EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
-libmech_eap_la_LDFLAGS = -export-symbols mech_eap.exports -version-info 0:0:0 \
-                         @EAP_LDFLAGS@ @KRB5_LDFLAGS@ @TARGET_LDFLAGS@
-libmech_eap_la_LIBADD  = @EAP_LIBS@ @KRB5_LIBS@
+libmech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\"
+libmech_eap_la_CFLAGS   = -g -Wall -fno-strict-aliasing \
+			  @EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
+libmech_eap_la_CXXFLAGS = -g -Wall \
+			  @EAP_CFLAGS@ @KRB5_CFLAGS@ @SHIBSP_CXXFLAGS@ \
+			  @SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@
+libmech_eap_la_LDFLAGS  = -export-symbols mech_eap.exports -version-info 0:0:0 \
+			  -no-undefined \
+			  @EAP_LDFLAGS@ @KRB5_LDFLAGS@ @TARGET_LDFLAGS@
+libmech_eap_la_LIBADD   = @EAP_LIBS@ @KRB5_LIBS@ @SHIBSP_LIBS@ @SHIBRESOLVER_LIBS@ -lfreeradius-client
 
 libmech_eap_la_SOURCES =    			\
 	accept_sec_context.c			\
@@ -19,6 +24,7 @@ libmech_eap_la_SOURCES =    			\
 	canonicalize_name.c			\
 	compare_name.c				\
 	context_time.c				\
+	delete_name_attribute.c			\
 	delete_sec_context.c			\
 	display_name.c				\
 	display_name_ext.c			\
@@ -54,6 +60,7 @@ libmech_eap_la_SOURCES =    			\
 	store_cred.c				\
 	unwrap.c				\
 	unwrap_iov.c				\
+	util_attr.cpp				\
 	util_buffer.c				\
 	util_context.c				\
 	util_cksum.c				\
@@ -64,8 +71,9 @@ libmech_eap_la_SOURCES =    			\
 	util_name.c				\
 	util_oid.c				\
 	util_ordering.c				\
-	util_radius.c				\
-	util_saml.c				\
+	util_radius.cpp				\
+	util_saml.cpp				\
+	util_shib.cpp				\
 	util_token.c				\
 	verify_mic.c				\
 	wrap.c					\