Changes to Autoconf/Automake configuration files for windows port.

[mech_eap.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index ba85af3..05322a1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,7 +9,14 @@ 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
+AM_COND_IF(TARGET_WINDOWS,[
+   found_krb5="yes"
+   krb5dir=$check_krb5_dir
+   KRB5_CFLAGS=-I"$check_krb5_dir/include"
+   KRB5_LIBS="-L$check_krb5_dir/lib/ -lkrb5_32 -lgssapi32"
+   COMPILE_ET=
+],
+[for dir in $check_krb5_dir $prefix /usr /usr/local ; do
    krb5dir="$dir"
    if test -x "$dir/bin/krb5-config"; then
      found_krb5="yes";
@@ -18,7 +25,7 @@ for dir in $check_krb5_dir /usr /usr/local ; do
      COMPILE_ET="$dir/bin/compile_et";
      break;
    fi
-done
+done])
 AC_MSG_RESULT($found_krb5)
 if test x_$found_krb5 != x_yes; then
    AC_MSG_ERROR([
@@ -34,9 +41,9 @@ else
        AC_SUBST(KRB5_CFLAGS)
        AC_SUBST(KRB5_LIBS)
        AC_SUBST(COMPILE_ET)
-       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_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
@@ -51,7 +58,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 +123,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 +144,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 +161,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";
@@ -183,6 +190,15 @@ else
 fi
 ])dnl
 
+AC_DEFUN([AX_CHECK_WINDOWS],
+[AC_MSG_CHECKING(for windows)
+target_windows="no"
+AC_CHECK_HEADER(windows.h,[target_windows="yes"],[target_windows="no"])
+AC_MSG_RESULT($target_windows)
+AM_CONDITIONAL(TARGET_WINDOWS,test "x$target_windows" == "xyes")
+])dnl
+
+
 AC_DEFUN([AX_CHECK_RADSEC],
 [AC_MSG_CHECKING(for radsec)
 RADSEC_DIR=
@@ -192,7 +208,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 +236,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