projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Support EAP-TLS in Moonshot (requires OpenSSL)"
[mech_eap.orig]
/
mech_eap
/
Makefile.am
diff --git
a/mech_eap/Makefile.am
b/mech_eap/Makefile.am
index
cb66fe8
..
8c6f64c
100644
(file)
--- a/
mech_eap/Makefile.am
+++ b/
mech_eap/Makefile.am
@@
-1,7
+1,9
@@
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = gsseap_err.et radsec_err.et \
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = gsseap_err.et radsec_err.et \
- mech_eap.exports mech_eap-noacceptor.exports
+ mech_eap.exports mech_eap-noacceptor.exports radius_ad.exports \
+ LICENSE AUTHORS
+
gssincludedir = $(includedir)/gssapi
gssinclude_HEADERS = gssapi_eap.h
gssincludedir = $(includedir)/gssapi
gssinclude_HEADERS = gssapi_eap.h
@@
-33,9
+35,9
@@
mech_eap_la_DEPENDENCIES = $(GSSEAP_EXPORTS)
mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
mech_eap_la_CFLAGS += \
mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
mech_eap_la_CFLAGS += \
- @KRB5_CFLAGS@
@RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
+ @KRB5_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
mech_eap_la_CXXFLAGS += \
mech_eap_la_CXXFLAGS += \
- @KRB5_CFLAGS@
@RADSEC_CFLAGS@ \
+ @KRB5_CFLAGS@ @RADSEC_CFLAGS@ \
@OPENSAML_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ \
@TARGET_CFLAGS@ $(EAP_CFLAGS)
mech_eap_la_LDFLAGS = -avoid-version -module \
@OPENSAML_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ \
@TARGET_CFLAGS@ $(EAP_CFLAGS)
mech_eap_la_LDFLAGS = -avoid-version -module \
@@
-102,7
+104,6
@@
mech_eap_la_SOURCES = \
util_krb.c \
util_lucid.c \
util_mech.c \
util_krb.c \
util_lucid.c \
util_mech.c \
- util_moonshot.c \
util_name.c \
util_oid.c \
util_ordering.c \
util_name.c \
util_oid.c \
util_ordering.c \
@@
-124,6
+125,13
@@
mech_eap_la_SOURCES = \
util_saml.h \
util_shib.h
util_saml.h \
util_shib.h
+if LIBMOONSHOT
+mech_eap_la_SOURCES += util_moonshot.c
+mech_eap_la_CFLAGS += @LIBMOONSHOT_CFLAGS@
+mech_eap_la_LDFLAGS += @LIBMOONSHOT_LDFLAGS@
+mech_eap_la_LIBADD += @LIBMOONSHOT_LIBS@
+endif
+
if GSSEAP_ENABLE_ACCEPTOR
if GSSEAP_ENABLE_ACCEPTOR