Pull in libeap and build against a libtool convenience library for it.
+++ /dev/null
-Subproject commit e586e8f88968dae297e9f013f67518d21b1f12e0
--- /dev/null
+Makefile.in
+aclocal.m4
+autom4te.cache
+configure
+config.*
+ltmain.sh
+libtool
+depcomp
--- /dev/null
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = libeap mech_eap
AC_PREREQ([2.61])
AC_INIT([mech_eap], [0.1], [bugs@project-moonshot.org])
dnl AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules])
LT_PREREQ([2.2])
LT_INIT([dlopen disable-static])
AC_SUBST(TARGET_CFLAGS)
AC_SUBST(TARGET_LDFLAGS)
AX_CHECK_KRB5
-AX_CHECK_EAP
+dnl AX_CHECK_EAP
AX_CHECK_SHIBSP
AX_CHECK_SHIBRESOLVER
AX_CHECK_RADSEC
AX_CHECK_JANSSON
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile])
AC_OUTPUT
--- /dev/null
+Subproject commit 13e043b06fb487b4a312e93b08388eaa280a278a
gssincludedir = $(includedir)/gssapi
gssinclude_HEADERS = gssapi_eap.h
+EAP_CFLAGS = -I$(srcdir)/../libeap/src -I$(srcdir)/../libeap/src/common -I$(srcdir)/../libeap/src/eap_common \
+ -I$(srcdir)/../libeap/src/utils -DIEEE8021X_EAPOL
+
gssdir = $(libdir)/gss
gss_LTLIBRARIES = mech_eap.la
mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
mech_eap_la_CFLAGS = -Werror -Wall -Wunused-parameter \
- @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
+ @KRB5_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
- @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ \
- @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@
+ @KRB5_CFLAGS@ @RADSEC_CFLAGS@ \
+ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@ $(EAP_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 = @KRB5_LIBS@ @EAP_LIBS@ @RADSEC_LIBS@ \
+mech_eap_la_LIBADD = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \
@SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
mech_eap_la_SOURCES = \
clean-generic:
rm -f gsseap_err.[ch] radsec_err.[ch]
+