make possible build without OpenSAML and/or Shib

[moonshot.git] / moonshot / configure.ac

diff --git a/moonshot/configure.ac b/moonshot/configure.ac
index 4bbffd5..957a5bf 100644 (file)
--- a/moonshot/configure.ac
+++ b/moonshot/configure.ac
@@ -1,13 +1,16 @@
 AC_PREREQ([2.61])
 AC_INIT([mech_eap], [0.1], [bugs@project-moonshot.org])
 dnl AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([silent-rules])
+dnl AM_INIT_AUTOMAKE([silent-rules])
+AM_INIT_AUTOMAKE
 LT_PREREQ([2.2])
 LT_INIT([dlopen disable-static])
 
 AC_PROG_CC
 AC_PROG_CXX
 AC_CONFIG_HEADERS([config.h])
+AC_CHECK_HEADERS(stdarg.h stdio.h stdint.h sys/param.h)
+AC_REPLACE_FUNCS(vasprintf)
 AC_GNU_SOURCE
 
 dnl Check if we're on Solaris and set CFLAGS accordingly
@@ -48,9 +51,13 @@ AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AX_CHECK_KRB5
 dnl AX_CHECK_EAP
-AX_CHECK_SHIBSP
+AX_CHECK_OPENSAML
 AX_CHECK_SHIBRESOLVER
+if test x_$found_shibresolver = x_yes; then
+  AX_CHECK_SHIBSP
+fi
 AX_CHECK_RADSEC
 AX_CHECK_JANSSON
+AX_CHECK_LIBMOONSHOT
 AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile])
 AC_OUTPUT