X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=acinclude.m4;h=aaf604a270d62a522042d032829582a59b649abe;hp=6f43261fb91f0d09712894aea714f4adf6268a9a;hb=HEAD;hpb=61a89c5caecb797c32dcbe712313dfd0ebcc5558

diff --git a/acinclude.m4 b/acinclude.m4
index 6f43261..aaf604a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -56,8 +56,9 @@ else
 	AC_CHECK_LIB(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_LIBS")
 	AC_CHECK_LIB(krb5, gss_inquire_attrs_for_mech, [AC_DEFINE_UNQUOTED([HAVE_GSS_INQUIRE_ATTRS_FOR_MECH], 1, [Define if GSS-API library supports RFC 5587])], [], "$KRB5_LIBS")
 	AC_CHECK_LIB(krb5, gss_krb5_import_cred, [AC_DEFINE_UNQUOTED([HAVE_GSS_KRB5_IMPORT_CRED], 1, [Define if GSS-API library supports gss_krb5_import_cred])], [], "$KRB5_LIBS")
-	AC_CHECK_LIB(krb5, heimdal_version, [AC_DEFINE_UNQUOTED([HAVE_HEIMDAL_VERSION], 1, [Define if building against Heimdal Kerberos implementation]), heimdal=yes], [heimdal=no], "$KRB5_LIBS")
-	AM_CONDITIONAL(HEIMDAL, test "x$heimdal" != "xno")
+  AC_CHECK_LIB(krb5, heimdal_version, [AC_DEFINE_UNQUOTED([HAVE_HEIMDAL_VERSION], 1, [Define if building against Heimdal Kerberos implementation])  heimdal=yes], [heimdal=no], "$KRB5_LIBS")
+  AM_CONDITIONAL(HEIMDAL, test "x$heimdal" != "xno")
+  AC_CHECK_TYPE(gss_const_name_t, [AC_DEFINE([MECHEAP_GSS_CONST_NAME_T_IS_POINTER], 1, [Define if gss_const_name_t is a pointer. Broken krb5 10.x headers define it as a struct.])], [], [[#include <gssapi/gssapi.h>"]])
 fi
 ])dnl
 
@@ -118,7 +119,7 @@ else
 -DEAP_SERVER_GPSK \
 -DEAP_SERVER_GPSK_SHA256 \
 -DIEEE8021X_EAPOL";
-	EAP_LIBS="-leap -lutils -lcrypto -ltls";
+	EAP_LIBS="-leap -lutils -lcrypto -ltls -lssl";
 	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)
@@ -252,6 +253,44 @@ fi
 fi
 ])dnl
 
+AC_DEFUN([AX_CHECK_OPENSSL],
+[AC_MSG_CHECKING(for OpenSSL)
+OPENSSL_DIR=
+found_openssl="no"
+AC_ARG_WITH(openssl,
+    AC_HELP_STRING([--with-openssl],
+       [Use OpenSSL (in specified installation directory)]),
+    [check_openssl_dir="$withval"],
+    [check_openssl_dir=])
+for dir in $check_openssl_dir $prefix /usr /usr/local ; do
+   openssldir="$dir"
+   if test -f "$dir/include/openssl/opensslv.h"; then
+     found_openssl="yes";
+     OPENSSL_DIR="${openssldir}"
+     OPENSSL_CFLAGS="-I$openssldir/include";
+     break;
+   fi
+done
+AC_MSG_RESULT($found_openssl)
+if test x_$found_openssl != x_yes; then
+   AC_MSG_ERROR([
+----------------------------------------------------------------------
+  Cannot find OpenSSL libraries.
+
+  Please install libssl or specify installation directory with
+  --with-openssl=(dir).
+----------------------------------------------------------------------
+])
+else
+	printf "OpenSSL found in $openssldir\n";
+	OPENSSL_LIBS="-lssl -lcrypto";
+	OPENSSL_LDFLAGS="-L$openssldir/lib";
+	AC_SUBST(OPENSSL_CFLAGS)
+	AC_SUBST(OPENSSL_LDFLAGS)
+	AC_SUBST(OPENSSL_LIBS)
+fi
+])dnl
+
 AC_DEFUN([AX_CHECK_RADSEC],
 [AC_MSG_CHECKING(for radsec)
 RADSEC_DIR=