Merge remote-tracking branch 'origin/windows'

diff --combined configure.ac
index 3d77b93,ef7bc28..039ab50
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,13 -1,15 +1,15 @@@
  AC_PREREQ([2.61])
  AC_INIT([mech_eap], [0.1], [bugs@project-moonshot.org])
- dnl AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR([build-aux])
+ 
  dnl AM_INIT_AUTOMAKE([silent-rules])
  AC_USE_SYSTEM_EXTENSIONS
  AC_GNU_SOURCE
  AM_INIT_AUTOMAKE
  AM_PROG_CC_C_O
  AM_MAINTAINER_MODE()
 -LT_PREREQ([2.4])
 +LT_PREREQ([2.2])
  LT_INIT([dlopen disable-static win32-dll])
  
  dnl AC_PROG_CC
@@@ -71,20 -73,13 +73,20 @@@ AC_SUBST(TARGET_CFLAGS
  AC_SUBST(TARGET_LDFLAGS)
  AX_CHECK_WINDOWS
  AX_CHECK_KRB5
 -AM_CONDITIONAL(HEIMDAL, test "x$heimdal" != "xno")
 -dnl AX_CHECK_EAP
 -if test "x$acceptor" = "xyes" ; then
 +AX_CHECK_OPENSAML
 +AM_CONDITIONAL(OPENSAML, test "x_$check_opensaml_dir" != "x_no")
 +
 +AX_CHECK_SHIBRESOLVER
 +AM_CONDITIONAL(SHIBRESOLVER, test "x_$check_shibresolver_dir" != "x_no")
 +if test x_$found_shibresolver = x_yes; then
    AX_CHECK_SHIBSP
 -  AX_CHECK_SHIBRESOLVER
 +fi
 +
 +if test "x$acceptor" = "xyes" ; then
    AX_CHECK_RADSEC
    AX_CHECK_JANSSON
  fi
 +
 +AX_CHECK_LIBMOONSHOT
  AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile])
  AC_OUTPUT