X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=65826a692784542772951900626929b36bd3baf5;hb=13912e95340d97177b73d8d8e9d25de3ab6ae5f3;hp=eb3a8372d6f503a2a68254b1735ad59cd2086cb2;hpb=1f273eda615c04331df6849cfbf3cfad069ea8b0;p=mech_eap.orig

diff --git a/Makefile.am b/Makefile.am
index eb3a837..65826a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,24 @@
 AUTOMAKE_OPTIONS = foreign
 
-gssdir = $(libdir)/gss
+gssincludedir = $(includedir)/gssapi
+gssinclude_HEADERS = gssapi_eap.h
 
-gss_LTLIBRARIES = libmech_eap.la
+gssdir = $(libdir)/gss
+gss_LTLIBRARIES = mech_eap.la
 
-libmech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB
-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@ \
-			  @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@
+mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
+mech_eap_la_CFLAGS   = -g -Wall -fno-strict-aliasing \
+			@EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
+mech_eap_la_CXXFLAGS = -g -Wall \
+			@EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5_CFLAGS@ \
+		        @SHIBSP_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@
+mech_eap_la_LDFLAGS  = -avoid-version -module \
+			-export-symbols mech_eap.exports -no-undefined \
+			@EAP_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
+mech_eap_la_LIBADD   = @EAP_LIBS@ @RADSEC_LIBS@ @KRB5_LIBS@ @SHIBSP_LIBS@ \
+		       @SHIBRESOLVER_LIBS@
 
-libmech_eap_la_SOURCES =    			\
+mech_eap_la_SOURCES =    			\
 	accept_sec_context.c			\
 	acquire_cred.c				\
 	acquire_cred_with_password.c		\
@@ -40,12 +43,15 @@ libmech_eap_la_SOURCES =    			\
 	import_sec_context.c			\
 	indicate_mechs.c			\
 	init_sec_context.c			\
+	inquire_attrs_for_mech.c		\
 	inquire_context.c			\
 	inquire_cred.c				\
 	inquire_cred_by_oid.c			\
+	inquire_mech_for_saslname.c		\
 	inquire_mechs_for_name.c		\
 	inquire_name.c				\
 	inquire_names_for_mech.c		\
+	inquire_saslname_for_mech.c		\
 	inquire_sec_context_by_oid.c		\
 	map_name_to_any.c			\
 	process_context_token.c			\
@@ -60,18 +66,22 @@ libmech_eap_la_SOURCES =    			\
 	store_cred.c				\
 	unwrap.c				\
 	unwrap_iov.c				\
+	util_alloc.c				\
+	util_attr.cpp				\
 	util_buffer.c				\
 	util_context.c				\
 	util_cksum.c				\
 	util_cred.c				\
 	util_crypt.c				\
 	util_krb.c				\
+	util_lucid.c				\
 	util_mech.c				\
 	util_name.c				\
 	util_oid.c				\
 	util_ordering.c				\
-	util_radius.c				\
+	util_radius.cpp				\
 	util_saml.cpp				\
+	util_shib.cpp				\
 	util_token.c				\
 	verify_mic.c				\
 	wrap.c					\
@@ -79,3 +89,16 @@ libmech_eap_la_SOURCES =    			\
 	wrap_iov_length.c			\
 	wrap_size_limit.c
 
+if GSSEAP_ENABLE_REAUTH
+mech_eap_la_SOURCES += util_reauth.c
+
+krb5pluginsdir = $(libdir)/krb5/plugins/authdata
+krb5plugins_LTLIBRARIES = radius_ad.la
+
+radius_ad_la_CFLAGS  = -g -Wall -fno-strict-aliasing \
+			  @EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@
+radius_ad_la_LDFLAGS = -avoid-version -module \
+		       -export-symbols radius_ad.exports -no-undefined
+radius_ad_la_LIBADD  = @KRB5_LIBS@
+radius_ad_la_SOURCES = util_adshim.c util_alloc.c
+endif