projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
[mech_eap.orig]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
2370ef4
..
533a2d4
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-6,17
+6,17
@@
gssinclude_HEADERS = gssapi_eap.h
gssdir = $(libdir)/gss
gss_LTLIBRARIES = mech_eap.la
gssdir = $(libdir)/gss
gss_LTLIBRARIES = mech_eap.la
-mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\"
+mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\"
-DDATAROOTDIR=\"${datarootdir}\"
mech_eap_la_CFLAGS = -g -Wall -fno-strict-aliasing \
mech_eap_la_CFLAGS = -g -Wall -fno-strict-aliasing \
- @
EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5
_CFLAGS@ @TARGET_CFLAGS@
+ @
KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC
_CFLAGS@ @TARGET_CFLAGS@
mech_eap_la_CXXFLAGS = -g -Wall \
mech_eap_la_CXXFLAGS = -g -Wall \
- @
EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5
_CFLAGS@ \
+ @
KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC
_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@
@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@
-lfreeradius-client
+mech_eap_la_LIBADD = @
KRB5_LIBS@ @EAP_LIBS@ @RADSEC
_LIBS@ @SHIBSP_LIBS@ \
+ @SHIBRESOLVER_LIBS@
mech_eap_la_SOURCES = \
accept_sec_context.c \
mech_eap_la_SOURCES = \
accept_sec_context.c \
@@
-39,6
+39,7
@@
mech_eap_la_SOURCES = \
export_sec_context.c \
get_mic.c \
get_name_attribute.c \
export_sec_context.c \
get_mic.c \
get_name_attribute.c \
+ gsseap_err.c \
import_name.c \
import_sec_context.c \
indicate_mechs.c \
import_name.c \
import_sec_context.c \
indicate_mechs.c \
@@
-56,6
+57,7
@@
mech_eap_la_SOURCES = \
map_name_to_any.c \
process_context_token.c \
pseudo_random.c \
map_name_to_any.c \
process_context_token.c \
pseudo_random.c \
+ radsec_err.c \
release_any_name_mapping.c \
release_cred.c \
release_name.c \
release_any_name_mapping.c \
release_cred.c \
release_name.c \
@@
-72,6
+74,7
@@
mech_eap_la_SOURCES = \
util_cksum.c \
util_cred.c \
util_crypt.c \
util_cksum.c \
util_cred.c \
util_crypt.c \
+ util_exts.c \
util_krb.c \
util_lucid.c \
util_mech.c \
util_krb.c \
util_lucid.c \
util_mech.c \
@@
-91,6
+94,7
@@
mech_eap_la_SOURCES = \
if GSSEAP_ENABLE_REAUTH
mech_eap_la_SOURCES += util_reauth.c
if GSSEAP_ENABLE_REAUTH
mech_eap_la_SOURCES += util_reauth.c
+if !HEIMDAL
krb5pluginsdir = $(libdir)/krb5/plugins/authdata
krb5plugins_LTLIBRARIES = radius_ad.la
krb5pluginsdir = $(libdir)/krb5/plugins/authdata
krb5plugins_LTLIBRARIES = radius_ad.la
@@
-101,3
+105,17
@@
radius_ad_la_LDFLAGS = -avoid-version -module \
radius_ad_la_LIBADD = @KRB5_LIBS@
radius_ad_la_SOURCES = util_adshim.c
endif
radius_ad_la_LIBADD = @KRB5_LIBS@
radius_ad_la_SOURCES = util_adshim.c
endif
+endif
+
+gsseap_err.h: gsseap_err.et
+ $(COMPILE_ET) $<
+
+gsseap_err.c: gsseap_err.h
+
+radsec_err.h: radsec_err.et
+ $(COMPILE_ET) $<
+
+radsec_err.c: radsec_err.h
+
+clean-generic:
+ rm -f gsseap_err.[ch] radsec_err.[ch]