Windows fixes for mech_eap Makefile

define CONFIG_NATIVE_WINDOWS, not CONFIG_WIN32_DEFAULTS.
hand-specify link rule on windows; libtool does not properly recognize import
libraries and is generally more trouble than it is worth.

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index 02dd9f2..81a4b96 100644 (file)
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -21,13 +21,17 @@ endif
 gssdir = $(libdir)/gss
 gss_LTLIBRARIES = mech_eap.la
 
+EAP_CFLAGS += -DEAP_TLS -DEAP_PEAP -DEAP_TTLS -DEAP_MD5 -DEAP_MSCHAPv2 -DEAP_GTC -DEAP_OTP -DEAP_LEAP -DEAP_PSK -DEAP_PAX -DEAP_SAKE -DEAP_GPSK -DEAP_GPSK_SHA256 -DEAP_SERVER_IDENTITY -DEAP_SERVER_TLS -DEAP_SERVER_PEAP -DEAP_SERVER_TTLS -DEAP_SERVER_MD5 -DEAP_SERVER_MSCHAPV2 -DEAP_SERVER_GTC -DEAP_SERVER_PSK -DEAP_SERVER_PAX -DEAP_SERVER_SAKE -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256 -DIEEE8021X_EAPOL
 if TARGET_WINDOWS
-EAP_CFLAGS += -DCONFIG_WIN32_DEFAULTS -DUSE_INTERNAL_CRYPTO
-OS_LIBS = -lshell32 -ladvapi32 -lws2_32 -lcomerr32
+EAP_CFLAGS += -DCONFIG_NATIVE_WINDOWS -DCONFIG_ANSI_C_EXTRA
+OS_LIBS = shell32.lib advapi32.lib ws2_32.lib crypt32.lib User32.lib Gdi32.lib
 mech_eap_la_CFLAGS   = -Zi
 mech_eap_la_CXXFLAGS = -Zi
+mech_eap.la: $(mech_eap_la_OBJECTS) $(mech_eap_la_DEPENDENCIES) $(EXTRA_mech_eap_la_DEPENDENCIES)
+       cat mech_eap.def.header $(GSSEAP_EXPORTS) > mech_eap.def
+       link -DEBUG -DLL -OUT:mech_eap.dll -DEF:mech_eap.def .libs/*.obj $(KRB5_LIBS) $(OPENSSL_LIBS) ../libeap/.libs/libeap.lib $(OS_LIBS)
+       touch mech_eap.la
 else
-EAP_CFLAGS += -DEAP_TLS -DEAP_PEAP -DEAP_TTLS -DEAP_MD5 -DEAP_MSCHAPv2 -DEAP_GTC -DEAP_OTP -DEAP_LEAP -DEAP_PSK -DEAP_PAX -DEAP_SAKE -DEAP_GPSK -DEAP_GPSK_SHA256 -DEAP_SERVER_IDENTITY -DEAP_SERVER_TLS -DEAP_SERVER_PEAP -DEAP_SERVER_TTLS -DEAP_SERVER_MD5 -DEAP_SERVER_MSCHAPV2 -DEAP_SERVER_GTC -DEAP_SERVER_PSK -DEAP_SERVER_PAX -DEAP_SERVER_SAKE -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256 -DIEEE8021X_EAPOL
 OS_LIBS =
 mech_eap_la_CFLAGS   = -Werror -Wall -Wunused-parameter
 mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter