Skip to content

Commit

Permalink
Make the autoconfery slightly less miserable. Also, bump version.
Browse files Browse the repository at this point in the history
Get rid of warnings about defining variables conditionally and unconditionally.
Don't redefine EXTRA_DIST with a spurious space in it.
  • Loading branch information
Linus Nordberg committed Dec 12, 2011
1 parent c17e44d commit 7595c6d
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 22 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
31 changes: 15 additions & 16 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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 $<
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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
Expand Down
4 changes: 2 additions & 2 deletions radsecproxy.conf.5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
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@
Expand Down

0 comments on commit 7595c6d

Please sign in to comment.