X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=configure.ac;h=cc8653e33a8a2c0c25eeaf609957811b4abf1fe7;hp=d08a2c06500f789d7efb04fd9179941f6894ee30;hb=HEAD;hpb=1b67be5e5bbc2b32d95b00c2e9f9c46f9e3426c8

diff --git a/configure.ac b/configure.ac
index d08a2c0..cc8653e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,10 @@
 AC_PREREQ([2.61])
-AC_INIT([mech_eap], [0.1], [bugs@project-moonshot.org])
-dnl AC_CONFIG_MACRO_DIR([m4])
+AC_INIT([mech_eap], [1.0.1], [bugs@project-moonshot.org])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+
 dnl AM_INIT_AUTOMAKE([silent-rules])
 AC_USE_SYSTEM_EXTENSIONS
-AC_GNU_SOURCE
 AM_INIT_AUTOMAKE
 AM_PROG_CC_C_O
 AM_MAINTAINER_MODE()
@@ -13,8 +14,9 @@ LT_INIT([dlopen disable-static win32-dll])
 dnl AC_PROG_CC
 AC_PROG_CXX
 AC_CONFIG_HEADERS([config.h])
-AC_CHECK_HEADERS(stdarg.h stdio.h stdint.h sys/param.h)
+AC_CHECK_HEADERS(stdarg.h stdio.h stdint.h sys/param.h stdlib.h)
 AC_REPLACE_FUNCS(vasprintf)
+AC_CHECK_FUNCS([ secure_getenv])
 
 dnl Check if we're on Solaris and set CFLAGS accordingly
 dnl AC_CANONICAL_TARGET
@@ -71,13 +73,23 @@ AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AX_CHECK_WINDOWS
 AX_CHECK_KRB5
-AM_CONDITIONAL(HEIMDAL, test "x$heimdal" != "xno")
-dnl AX_CHECK_EAP
-if test "x$acceptor" = "xyes" ; then
+AX_CHECK_OPENSAML
+AM_CONDITIONAL(OPENSAML, test "x_$check_opensaml_dir" != "x_no")
+
+AX_CHECK_SHIBRESOLVER
+AM_CONDITIONAL(SHIBRESOLVER, test "x_$check_shibresolver_dir" != "x_no")
+if test x_$found_shibresolver = x_yes; then
   AX_CHECK_SHIBSP
-  AX_CHECK_SHIBRESOLVER
+fi
+
+AX_CHECK_OPENSSL
+
+if test "x$acceptor" = "xyes" ; then
   AX_CHECK_RADSEC
   AX_CHECK_JANSSON
 fi
-AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile])
+
+AX_CHECK_LIBMOONSHOT
+AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile
+			  mech_eap.spec])
 AC_OUTPUT