diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 31 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | radsecproxy.conf.5.xml | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
6 files changed, 27 insertions, 24 deletions
@@ -1,3 +1,8 @@ +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. diff --git a/Makefile.am b/Makefile.am index b9a9b8f..174d37f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,26 @@ 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,31 +51,18 @@ 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 $< @@ -1,4 +1,4 @@ -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 diff --git a/configure.ac b/configure.ac index 66bee68..a74a054 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,7 @@ -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, diff --git a/radsecproxy.conf.5.xml b/radsecproxy.conf.5.xml index 4db6672..4fb9476 100644 --- a/radsecproxy.conf.5.xml +++ b/radsecproxy.conf.5.xml @@ -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> diff --git a/tests/Makefile.am b/tests/Makefile.am index a58aa1e..2a7c339 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,11 +1,11 @@ -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) |