More work on initial implementation

[mech_eap.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index c376194..cd51aab 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,7 +1,7 @@
 dnl Based on the one from the Boinc project by Reinhard
 
 AC_DEFUN([AX_CHECK_KRB5],
-[AC_MSG_CHECKING(for Kerberos)
+[AC_MSG_CHECKING(for GSS-API and Kerberos implementation)
 KRB5_DIR=
 found_krb5="no"
 AC_ARG_WITH(krb5,
@@ -13,22 +13,16 @@ for dir in $check_krb5_dir /usr /usr/local ; do
    krb5dir="$dir"
    if test -f "$dir/include/krb5.h"; then
      found_krb5="yes";
-     krb5_DIR="${krb5dir}"
-     krb5_CFLAGS="-I$krb5dir/include";
+     KRB5_DIR="${krb5dir}"
+     KRB5_CFLAGS="-I$krb5dir/include";
      break;
    fi
-   if test -f "$dir/include/krb5.h"; then
-     found_krb5="yes";
-     krb5_DIR="${krb5dir}"
-     krb5_CFLAGS="-I$krb5dir/include/";
-     break
-   fi
 done
 AC_MSG_RESULT($found_krb5)
 if test x_$found_krb5 != x_yes; then
    AC_MSG_ERROR([
 ----------------------------------------------------------------------
-  Cannot find krb5 libraries.
+  Cannot find GSS-API/Kerberos libraries.
 
   Please install MIT or Heimdal or specify installation directory with
   --with-krb5=(dir).
@@ -36,10 +30,49 @@ 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";
+       KRB5_LIBS="-lgssapi_krb5 -lkrb5";
+        KRB5_LDFLAGS="-L$krb5dir/lib";
        AC_SUBST(KRB5_CFLAGS)
        AC_SUBST(KRB5_LDFLAGS)
        AC_SUBST(KRB5_LIBS)
 fi
 ])dnl
+
+AC_DEFUN([AX_CHECK_EAP],
+[AC_MSG_CHECKING(for EAP implementation)
+EAP_DIR=
+found_eap="no"
+AC_ARG_WITH(eap,
+    AC_HELP_STRING([--with-eap],
+       [Use eap (in specified installation directory)]),
+    [check_eap_dir="$withval"],
+    [check_eap_dir=])
+for dir in $check_eap_dir /usr /usr/local ; do
+   eapdir="$dir"
+   if test -f "$dir/src/eap_peer/eap.h"; then
+     found_eap="yes";
+     EAP_DIR="${eapdir}"
+     EAP_CFLAGS="-I$eapdir/src/common -I$eapdir/src -I$eapdir/src/utils";
+     break;
+   fi
+done
+AC_MSG_RESULT($found_eap)
+if test x_$found_eap != x_yes; then
+   AC_MSG_ERROR([
+----------------------------------------------------------------------
+  Cannot find EAP libraries.
+
+  Please install wpa_supplicant or specify installation directory with
+  --with-eap=(dir).
+----------------------------------------------------------------------
+])
+else
+        printf "EAP found in $eapdir\n";
+       EAP_LIBS="-leap";
+        EAP_LDFLAGS="-L$eapdir/eap_example";
+       AC_SUBST(EAP_CFLAGS)
+       AC_SUBST(EAP_LDFLAGS)
+       AC_SUBST(EAP_LIBS)
+fi
+])dnl
+