From cf00b33fcc2840de5e4fe78181929f4c4634f98a Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Wed, 6 Oct 2010 23:21:07 +0200 Subject: [PATCH] check for libradsec --- Makefile.am | 10 +++++----- acinclude.m4 | 38 ++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index c4af967..2370ef4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,14 +8,14 @@ gss_LTLIBRARIES = mech_eap.la mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" mech_eap_la_CFLAGS = -g -Wall -fno-strict-aliasing \ - @EAP_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@ + @EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5_CFLAGS@ @TARGET_CFLAGS@ mech_eap_la_CXXFLAGS = -g -Wall \ - @EAP_CFLAGS@ @KRB5_CFLAGS@ @SHIBSP_CXXFLAGS@ \ - @SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@ + @EAP_CFLAGS@ @RADSEC_CFLAGS@ @KRB5_CFLAGS@ \ + @SHIBSP_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @TARGET_CFLAGS@ mech_eap_la_LDFLAGS = -avoid-version -module \ -export-symbols mech_eap.exports -no-undefined \ - @EAP_LDFLAGS@ @TARGET_LDFLAGS@ -mech_eap_la_LIBADD = @EAP_LIBS@ @KRB5_LIBS@ @SHIBSP_LIBS@ \ + @EAP_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@ +mech_eap_la_LIBADD = @EAP_LIBS@ @RADSEC_LIBS@ @KRB5_LIBS@ @SHIBSP_LIBS@ \ @SHIBRESOLVER_LIBS@ -lfreeradius-client mech_eap_la_SOURCES = \ diff --git a/acinclude.m4 b/acinclude.m4 index c4aa334..fe9254b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -178,3 +178,41 @@ else AC_SUBST(SHIBRESOLVER_LIBS) fi ])dnl + +AC_DEFUN([AX_CHECK_RADSEC], +[AC_MSG_CHECKING(for radsec) +RADSEC_DIR= +found_radsec="no" +AC_ARG_WITH(radsec, + AC_HELP_STRING([--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 + radsecdir="$dir" + if test -f "$dir/include/radsec/radsec.h"; then + found_radsec="yes"; + RADSEC_DIR="${radsecdir}" + RADSEC_CFLAGS="-I$radsecdir/include"; + break; + fi +done +AC_MSG_RESULT($found_radsec) +if test x_$found_radsec != x_yes; then + AC_MSG_ERROR([ +---------------------------------------------------------------------- + Cannot find radsec libraries. + + Please install libradsec or specify installation directory with + --with-radsec=(dir). +---------------------------------------------------------------------- +]) +else + printf "radsec found in $radsecdir\n"; + RADSEC_LIBS="-lradsec"; + RADSEC_LDFLAGS="-L$$radsecdir/lib"; + AC_SUBST(RADSEC_CLFAGS) + AC_SUBST(RADSEC_LDFLAGS) + AC_SUBST(RADSEC_LIBS) +fi +])dnl diff --git a/configure.ac b/configure.ac index 43ca2ec..9967ee4 100644 --- a/configure.ac +++ b/configure.ac @@ -49,5 +49,6 @@ AX_CHECK_KRB5 AX_CHECK_EAP AX_CHECK_SHIBSP AX_CHECK_SHIBRESOLVER +AX_CHECK_RADSEC AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- 2.1.4