Commit 85df2f02 authored by Linus Nordberg's avatar Linus Nordberg

Merge branch 'master' into fticks_syslog2

parents 70fa9c5f ef8e142b
2011-12-12 1.6-dev
Bug fixes:
- Stop the autoconfery from warning about defining variables
conditionally and unconditionally.
2011-10-08 1.5
New features:
- Support for F-Ticks logging.
......
AUTOMAKE_OPTIONS = foreign
if WANT_FTICKS
fticks_sources = fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
fticks_programs = radsecproxy-hash
radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
endif
if HAVE_DOCBOOK2X_MAN
GENMANPAGES = radsecproxy.conf.5
endif
SUBDIRS = tests
sbin_PROGRAMS = radsecproxy
bin_PROGRAMS = radsecproxy-conf
bin_PROGRAMS = radsecproxy-conf $(fticks_programs)
noinst_LIBRARIES = librsp.a
radsecproxy_SOURCES = main.c
librsp_a_SOURCES = \
$(fticks_sources) \
debug.c debug.h \
dtls.c dtls.h \
gconfig.c gconfig.h \
......@@ -39,30 +51,17 @@ radsecproxy_LDADD = librsp.a @SSL_LIBS@
radsecproxy_conf_LDFLAGS = @TARGET_LDFLAGS@
####################
if HAVE_DOCBOOK2X_MAN
GENMANPAGES = radsecproxy.conf.5
endif
dist_man_MANS = radsecproxy.1 radsecproxy-hash.1 $(GENMANPAGES)
EXTRA_DIST = \
configure Makefile.in tests/Makefile.in \
compile config.guess config.sub install-sh missing depcomp
EXTRA_DIST += \
LICENSE THANKS \
configure Makefile.in tests/Makefile.in \
compile config.guess config.sub install-sh missing depcomp \
radsecproxy.conf.5.xml radsecproxy.conf-example \
tools/README tools/naptr-eduroam.sh tools/radsec-dynsrv.sh
DISTCHECK_CONFIGURE_FLAGS = --enable-fticks
####################
if WANT_FTICKS
librsp_a_SOURCES += fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
bin_PROGRAMS += radsecproxy-hash
radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
endif
####################
radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
docbook2x-man $<
......
This is radsecproxy 1.5 from Oct 8 2011.
This is unreleasead radsecproxy 1.6-dev.
radsecproxy is a generic RADIUS proxy that supports both UDP and TLS
(RadSec) RADIUS transports. There is also experimental support for
......
AC_INIT(radsecproxy, 1.5, radsecproxy@uninett.no)
AC_INIT(radsecproxy, 1.6-dev, radsecproxy@uninett.no)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_RANLIB
udp=yes
AC_ARG_ENABLE(udp,
......
......@@ -2,14 +2,14 @@
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<refentry>
<refentryinfo>
<date>2011-10-08</date>
<date>2012-12-12</date>
</refentryinfo>
<refmeta>
<refentrytitle>
<application>radsecproxy.conf</application>
</refentrytitle>
<manvolnum>5</manvolnum>
<refmiscinfo>radsecproxy 1.5</refmiscinfo>
<refmiscinfo>radsecproxy 1.6-dev</refmiscinfo>
</refmeta>
<refnamediv>
<refname>
......
check_PROGRAMS =
AUTOMAKE_OPTIONS = foreign
if WANT_FTICKS
check_PROGRAMS += t_fticks
fticks_programs = t_fticks
endif
check_PROGRAMS = $(fticks_programs)
AM_CFLAGS = -g -Wall -Werror @TARGET_CFLAGS@
AM_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
LDADD = $(top_builddir)/librsp.a @SSL_LIBS@
TESTS = $(check_PROGRAMS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment