X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=acinclude.m4;h=4e15e0e10f2577fb1aa406e302d9b62d8e94ec9c;hb=d3586fddc2afb973dcc83daf1f3247e28b27abb4;hp=cd51aab1cf6546dc4928463eccfad15240755f55;hpb=6800e2157097202a9e1e8ff414fb484ef4607bde;p=mech_eap.orig

diff --git a/acinclude.m4 b/acinclude.m4
index cd51aab..4e15e0e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -29,12 +29,13 @@ if test x_$found_krb5 != x_yes; then
 ----------------------------------------------------------------------
 ])
 else
-        printf "Kerberos found in $krb5dir\n";
-	KRB5_LIBS="-lgssapi_krb5 -lkrb5";
-        KRB5_LDFLAGS="-L$krb5dir/lib";
+	printf "Kerberos found in $krb5dir\n";
+	KRB5_LIBS="-lgssapi_krb5 -lkrb5 -lk5crypto";
+	KRB5_LDFLAGS="-L$krb5dir/lib";
 	AC_SUBST(KRB5_CFLAGS)
 	AC_SUBST(KRB5_LDFLAGS)
 	AC_SUBST(KRB5_LIBS)
+	AC_CHECK_LIB(gssapi_krb5, GSS_C_NT_COMPOSITE_EXPORT, [AC_DEFINE_UNQUOTED([HAVE_GSS_C_NT_COMPOSITE_EXPORT], 1, [Define if GSS-API library supports recent naming extensions draft])], [], "$KRB5_LDFLAGS")
 fi
 ])dnl
 
@@ -67,12 +68,114 @@ if test x_$found_eap != x_yes; then
 ----------------------------------------------------------------------
 ])
 else
-        printf "EAP found in $eapdir\n";
-	EAP_LIBS="-leap";
-        EAP_LDFLAGS="-L$eapdir/eap_example";
+	printf "EAP found in $eapdir\n";
+	EAP_CFLAGS="$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";
+	EAP_LIBS="-leap -lutils -lcrypto -ltls";
+	EAP_LDFLAGS="-L$eapdir/eap_example -L$eapdir/src/utils -L$eapdir/src/crypto -L$eapdir/src/tls";
 	AC_SUBST(EAP_CFLAGS)
 	AC_SUBST(EAP_LDFLAGS)
 	AC_SUBST(EAP_LIBS)
 fi
 ])dnl
 
+AC_DEFUN([AX_CHECK_SHIBSP],
+[AC_MSG_CHECKING(for Shibboleth implementation)
+SHIBSP_DIR=
+found_shibsp="no"
+AC_ARG_WITH(shibsp,
+    AC_HELP_STRING([--with-shibsp],
+       [Use shibspboleth (in specified installation directory)]),
+    [check_shibsp_dir="$withval"],
+    [check_shibsp_dir=])
+for dir in $check_shibsp_dir /usr /usr/local ; do
+   shibspdir="$dir"
+   if test -f "$dir/include/shibsp/SPConfig.h"; then
+     found_shibsp="yes";
+     SHIBSP_DIR="${shibspdir}"
+     SHIBSP_CXXFLAGS="-I$shibspdir/include";
+     break;
+   fi
+done
+AC_MSG_RESULT($found_shibsp)
+if test x_$found_shibsp != x_yes; then
+   AC_MSG_ERROR([
+----------------------------------------------------------------------
+  Cannot find Shibboleth/OpenSAML libraries.
+
+  Please install Shibboleth or specify installation directory with
+  --with-shibsp=(dir).
+----------------------------------------------------------------------
+])
+else
+	printf "Shibboleth found in $shibspdir\n";
+	SHIBSP_LIBS="-lshibsp -llog4shib -lsaml -lxml-security-c -lxmltooling -lxerces-c";
+	SHIBSP_LDFLAGS="-L$shibspdir/lib";
+	AC_SUBST(SHIBSP_CXXFLAGS)
+	AC_SUBST(SHIBSP_LDFLAGS)
+	AC_SUBST(SHIBSP_LIBS)
+fi
+])dnl
+
+AC_DEFUN([AX_CHECK_SHIBRESOLVER],
+[AC_MSG_CHECKING(for Shibboleth resolver implementation)
+SHIBRESOLVER_DIR=
+found_shibresolver="no"
+AC_ARG_WITH(shibresolver,
+    AC_HELP_STRING([--with-shibresolver],
+       [Use Shibboleth resolver (in specified installation directory)]),
+    [check_shibresolver_dir="$withval"],
+    [check_shibresolver_dir=])
+for dir in $check_shibresolver_dir /usr /usr/local ; do
+   shibresolverdir="$dir"
+   if test -f "$dir/include/shibresolver/resolver.h"; then
+     found_shibresolver="yes";
+     SHIBRESOLVER_DIR="${shibresolverdir}"
+     SHIBRESOLVER_CXXFLAGS="-I$shibresolverdir/include";
+     break;
+   fi
+done
+AC_MSG_RESULT($found_shibresolver)
+if test x_$found_shibresolver != x_yes; then
+   AC_MSG_ERROR([
+----------------------------------------------------------------------
+  Cannot find Shibboleth resolver libraries.
+
+  Please install Shibboleth or specify installation directory with
+  --with-shibresolver=(dir).
+----------------------------------------------------------------------
+])
+else
+	printf "Shibboleth resolver found in $shibresolverdir\n";
+	SHIBRESOLVER_LIBS="-lshibresolver";
+	SHIBRESOLVER_LDFLAGS="-L$shibresolverdir/lib";
+	AC_SUBST(SHIBRESOLVER_CXXFLAGS)
+	AC_SUBST(SHIBRESOLVER_LDFLAGS)
+	AC_SUBST(SHIBRESOLVER_LIBS)
+fi
+])dnl