Merge tag 'libradsec-0.0.5' into debian
authorSam Hartman <hartmans@painless-security.com>
Wed, 12 Feb 2014 02:17:19 +0000 (21:17 -0500)
committerSam Hartman <hartmans@painless-security.com>
Wed, 12 Feb 2014 02:17:19 +0000 (21:17 -0500)
libradsec-0.0.5

Conflicts:
lib/conf.c
lib/radius/Makefile.am

1  2 
lib/Makefile.am
lib/radius/Makefile.am

diff --cc lib/Makefile.am
Simple merge
@@@ -1,9 -1,7 +1,8 @@@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
  
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
 +BUILT_SOURCES = dictionaries.c
+ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
  AM_CFLAGS = -Wall -g
  
  noinst_LTLIBRARIES = libradsec-radius.la