X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=acinclude.m4;h=f8a7efb39661a2c2fe499e0997d8743554dabb67;hb=3e8ad5e079b54db722a97f41d45e098e80fad863;hp=2cff774e8778d2112bc36583418f7e4d1fff09e7;hpb=07c30f8b470c931dbf814eb2a9cb10e33c35129d;p=mech_eap.git

diff --git a/acinclude.m4 b/acinclude.m4
index 2cff774..f8a7efb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,12 +9,13 @@ AC_ARG_WITH(krb5,
        [Use krb5 (in specified installation directory)]),
     [check_krb5_dir="$withval"],
     [check_krb5_dir=])
-for dir in $check_krb5_dir /usr /usr/local ; do
+for dir in $check_krb5_dir $prefix /usr /usr/local ; do
    krb5dir="$dir"
    if test -x "$dir/bin/krb5-config"; then
      found_krb5="yes";
      KRB5_CFLAGS=`$dir/bin/krb5-config gssapi --cflags`;
      KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`;
+     COMPILE_ET="$dir/bin/compile_et";
      break;
    fi
 done
@@ -32,9 +33,12 @@ else
 	printf "Kerberos found in $krb5dir\n";
 	AC_SUBST(KRB5_CFLAGS)
 	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_LIBS")
-	AC_CHECK_LIB(gssapi_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(gssapi_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_SUBST(COMPILE_ET)
+	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")
 fi
 ])dnl
 
@@ -47,7 +51,7 @@ AC_ARG_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
+for dir in $check_eap_dir $prefix /usr /usr/local ../libeap ; do
    eapdir="$dir"
    if test -f "$dir/src/eap_peer/eap.h"; then
      found_eap="yes";
@@ -112,7 +116,7 @@ AC_ARG_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
+for dir in $check_shibsp_dir $prefix /usr /usr/local ; do
    shibspdir="$dir"
    if test -f "$dir/include/shibsp/SPConfig.h"; then
      found_shibsp="yes";
@@ -133,7 +137,7 @@ if test x_$found_shibsp != x_yes; then
 ])
 else
 	printf "Shibboleth found in $shibspdir\n";
-	SHIBSP_LIBS="-lshibsp -llog4shib -lsaml -lxml-security-c -lxmltooling -lxerces-c";
+	SHIBSP_LIBS="-lshibsp  -lsaml -lxml-security-c -lxmltooling -lxerces-c";
 	SHIBSP_LDFLAGS="-L$shibspdir/lib";
 	AC_SUBST(SHIBSP_CXXFLAGS)
 	AC_SUBST(SHIBSP_LDFLAGS)
@@ -150,7 +154,7 @@ AC_ARG_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
+for dir in $check_shibresolver_dir $prefix /usr /usr/local ; do
    shibresolverdir="$dir"
    if test -f "$dir/include/shibresolver/resolver.h"; then
      found_shibresolver="yes";
@@ -188,7 +192,7 @@ AC_ARG_WITH(radsec,
        [Use radsec (in specified installation directory)]),
     [check_radsec_dir="$withval"],
     [check_radsec_dir=])
-for dir in $check_radsec_dir /usr /usr/local ; do
+for dir in $check_radsec_dir $prefix /usr /usr/local ; do
    radsecdir="$dir"
    if test -f "$dir/include/radsec/radsec.h"; then
      found_radsec="yes";
@@ -216,3 +220,81 @@ else
 	AC_SUBST(RADSEC_LIBS)
 fi
 ])dnl
+
+AC_DEFUN([AX_CHECK_JANSSON],
+[AC_MSG_CHECKING(for jansson)
+JANSSON_DIR=
+found_jansson="no"
+AC_ARG_WITH(jansson,
+    AC_HELP_STRING([--with-jansson],
+       [Use jansson (in specified installation directory)]),
+    [check_jansson_dir="$withval"],
+    [check_jansson_dir=])
+for dir in $check_jansson_dir $prefix /usr /usr/local ; do
+   janssondir="$dir"
+   if test -f "$dir/include/jansson.h"; then
+     found_jansson="yes";
+     JANSSON_DIR="${janssondir}"
+     JANSSON_CFLAGS="-I$janssondir/include";
+     break;
+   fi
+done
+AC_MSG_RESULT($found_jansson)
+if test x_$found_jansson != x_yes; then
+   AC_MSG_ERROR([
+----------------------------------------------------------------------
+  Cannot find jansson libraries.
+
+  Please install libjansson or specify installation directory with
+  --with-jansson=(dir).
+----------------------------------------------------------------------
+])
+else
+	printf "jansson found in $janssondir\n";
+	JANSSON_LIBS="-ljansson";
+	JANSSON_LDFLAGS="-L$janssondir/lib";
+	AC_SUBST(JANSSON_CFLAGS)
+	AC_SUBST(JANSSON_LDFLAGS)
+	AC_SUBST(JANSSON_LIBS)
+fi
+])dnl
+
+AC_DEFUN([AX_CHECK_LIBMOONSHOT],
+[AC_MSG_CHECKING(for Moonshot identity selector implementation)
+LIBMOONSHOT_DIR=
+found_libmoonshot="no"
+AC_ARG_WITH(libmoonshot,
+    AC_HELP_STRING([--with-libmoonshot],
+       [Use libmoonshot (in specified installation directory)]),
+    [check_libmoonshot_dir="$withval"],
+    [check_libmoonshot_dir=])
+for dir in $check_libmoonshot_dir $prefix /usr /usr/local ../../moonshot-ui/libmoonshot ; do
+   libmoonshotdir="$dir"
+   if test -f "$dir/include/libmoonshot.h"; then
+     found_libmoonshot="yes";
+     LIBMOONSHOT_DIR="${libmoonshotdir}"
+     LIBMOONSHOT_CFLAGS="-I$libmoonshotdir/include";
+     break;
+   fi
+done
+AC_MSG_RESULT($found_libmoonshot)
+if test x_$found_libmoonshot != x_yes; then
+   AC_MSG_ERROR([
+----------------------------------------------------------------------
+  Cannot find Moonshot identity selector libraries.
+
+  Please install wpa_supplicant or specify installation directory with
+  --with-libmoonshot=(dir).
+----------------------------------------------------------------------
+])
+else
+	printf "libmoonshot found in $libmoonshotdir\n";
+	LIBMOONSHOT_LIBS="-lmoonshot";
+	LIBMOONSHOT_LDFLAGS="-L$libmoonshot/lib";
+	AC_SUBST(LIBMOONSHOT_CFLAGS)
+	AC_SUBST(LIBMOONSHOT_LDFLAGS)
+	AC_SUBST(LIBMOONSHOT_LIBS)
+	AC_CHECK_LIB(moonshot, moonshot_get_identity, [AC_DEFINE_UNQUOTED([HAVE_MOONSHOT_GET_IDENTITY], 1, [Define if Moonshot identity selector is available])], [], "$LIBMOONSHOT_LIBS")
+fi
+])dnl
+