Fixes for Heimdal (macOS) builds from Stefan.

[mech_eap.git] / mech_eap / Makefile.am

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index 5f78a77..57b7b3a 100644 (file)
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -1,7 +1,10 @@
 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 mech \
+       README.samba4 NOTES radsec.conf
+
 
 gssincludedir = $(includedir)/gssapi
 gssinclude_HEADERS = gssapi_eap.h
@@ -10,9 +13,9 @@ EAP_CFLAGS = -I$(srcdir)/../libeap/src -I$(srcdir)/../libeap/src/common -I$(srcd
        -I$(srcdir)/../libeap/src/utils
 
 if GSSEAP_ENABLE_ACCEPTOR
-GSSEAP_EXPORTS = mech_eap.exports
+GSSEAP_EXPORTS = $(srcdir)/mech_eap.exports
 else
-GSSEAP_EXPORTS = mech_eap-noacceptor.exports
+GSSEAP_EXPORTS = $(srcdir)/mech_eap-noacceptor.exports
 endif
 
 gssdir = $(libdir)/gss
@@ -33,20 +36,22 @@ mech_eap_la_DEPENDENCIES = $(GSSEAP_EXPORTS)
 
 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 += \
-                       @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 \
                        -export-symbols $(GSSEAP_EXPORTS) -no-undefined \
-                       @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
+                       @KRB5_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@ @OPENSSL_LDFLAGS@
+
 if TARGET_WINDOWS
 mech_eap_la_LDFLAGS += -debug
 endif
 
 mech_eap_la_LIBADD   = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \
-                      @OPENSAML_LIBS@ @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
+                      @OPENSAML_LIBS@ @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@ \
+                      @OPENSSL_LIBS@
 mech_eap_la_SOURCES =                          \
        acquire_cred.c                          \
        acquire_cred_with_password.c            \
@@ -62,6 +67,7 @@ mech_eap_la_SOURCES =                         \
        display_status.c                        \
        duplicate_name.c                        \
        eap_mech.c                              \
+       exchange_meta_data.c                    \
        export_name.c                           \
        export_sec_context.c                    \
        get_mic.c                               \
@@ -82,6 +88,8 @@ mech_eap_la_SOURCES =                         \
        inquire_sec_context_by_oid.c            \
        process_context_token.c                 \
        pseudo_random.c                         \
+       query_mechanism_info.c                  \
+       query_meta_data.c                       \
        radsec_err.c                            \
        release_cred.c                          \
        release_name.c                          \
@@ -99,10 +107,10 @@ mech_eap_la_SOURCES =                      \
        util_krb.c                              \
        util_lucid.c                            \
        util_mech.c                             \
-       util_moonshot.c                         \
        util_name.c                             \
        util_oid.c                              \
        util_ordering.c                         \
+       util_radius.cpp                         \
        util_sm.c                               \
        util_tld.c                              \
        util_token.c                            \
@@ -111,6 +119,7 @@ mech_eap_la_SOURCES =                       \
        wrap_iov.c                              \
        wrap_iov_length.c                       \
        wrap_size_limit.c \
+       gssapi_headerfix.h \
        gssapiP_eap.h \
        util_attr.h \
        util_base64.h \
@@ -121,6 +130,13 @@ mech_eap_la_SOURCES =                      \
        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
 
@@ -135,8 +151,7 @@ mech_eap_la_SOURCES +=                              \
        set_name_attribute.c                    \
        util_attr.cpp                           \
        util_base64.c                           \
-       util_json.cpp                           \
-       util_radius.cpp
+       util_json.cpp
 
 if OPENSAML
 mech_eap_la_SOURCES += util_saml.cpp
@@ -160,7 +175,7 @@ krb5plugins_LTLIBRARIES = radius_ad.la
 radius_ad_la_CFLAGS  = -Werror -Wall -Wunused-parameter \
                        @KRB5_CFLAGS@ $(EAP_CFLAGS) @RADSEC_CFLAGS@ @TARGET_CFLAGS@
 radius_ad_la_LDFLAGS = -avoid-version -module \
-                      -export-symbols radius_ad.exports -no-undefined
+                      -export-symbols $(srcdir)/radius_ad.exports -no-undefined
 radius_ad_la_LIBADD  = @KRB5_LIBS@
 radius_ad_la_SOURCES = util_adshim.c authdata_plugin.h
 endif