X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=acinclude.m4;h=eab00b4ecfca96ed0d228537a356e496978b215e;hb=fa210a112d16848a282d662f16f9b8589dd371df;hp=ba85af3d4b91acd01819e8cafed9a33690f0ceca;hpb=7db57acddeddad5f96d16288b3776baf6c10c0b1;p=mech_eap.orig

diff --git a/acinclude.m4 b/acinclude.m4
index ba85af3..eab00b4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,7 +9,7 @@ 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";
@@ -51,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";
@@ -116,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";
@@ -137,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)
@@ -154,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";
@@ -192,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";
@@ -220,3 +220,41 @@ 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