From: Linus Nordberg <linus@nordberg.se>
Date: Fri, 17 May 2013 08:50:11 +0000 (+0200)
Subject: Merge branch 'libradsec-add-avp-2' into libradsec
X-Git-Tag: libradsec-0.0.4~11
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=bc7b85e8e4fa2e0e8d31bca161b2ad1a01ccafc5

Merge branch 'libradsec-add-avp-2' into libradsec

Conflicts:
	lib/Makefile.am
---

bc7b85e8e4fa2e0e8d31bca161b2ad1a01ccafc5
diff --cc lib/Makefile.am
index 237294a,ab1a47e..769e7ab
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -48,24 -47,8 +48,24 @@@ els
  libradsec_la_SOURCES += md5.c
  endif
  
 -EXTRA_DIST = HACKING LICENSE
 +libradsec_la_SOURCES += \
 +	compat.h \
 +	conn.h \
 +	debug.h \
 +	err.h \
 +	event.h \
 +	md5.h \
 +	packet.h \
 +	peer.h \
 +	radsec.h \
 +	tcp.h \
 +	tls.h \
 +	udp.h \
 +	util.h
 +
 +EXTRA_DIST = HACKING LICENSE libradsec.spec radsec.sym
 +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tls --enable-tls-psk
  
  libradsec_la_LIBADD = radsecproxy/libradsec-radsecproxy.la radius/libradsec-radius.la
- libradsec_la_LDFLAGS = -version-info 0:0:0 -export-symbols $(srcdir)/radsec.sym
 -libradsec_la_LDFLAGS = -version-info 1:0:1 -export-symbols radsec.sym
++libradsec_la_LDFLAGS = -version-info 1:0:1 -export-symbols $(srcdir)/radsec.sym
  libradsec_la_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -Werror # -DDEBUG -DDEBUG_LEVENT