Merge remote branch 'origin/libradsec-new-client' into HEAD

Conflicts:
	lib/Makefile.am
	lib/configure.ac

diff --cc lib/Makefile.am
index 9d8249c,51aebf9..791c6d5
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -1,9 -1,8 +1,10 @@@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
  
- SUBDIRS = . examples include 
 -SUBDIRS = radius . include examples
++SUBDIRS = . examples include radius
 +DIST_SUBDIRS=tests ${SUBDIRS}
 +
+ 
  INCLUDES = -I$(srcdir)/include
  AM_CFLAGS = -Wall -g
  
@@@ -36,23 -36,6 +38,24 @@@ libradsec_la_SOURCES += 
        rsp_tlscommon.c
  endif
  
 -libradsec_la_LIBADD = radius/libradsec-radius.la
 +libradsec_la_SOURCES += compat.h \
 +      conn.h \
 +      debug.h \
 +      err.h \
 +      event.h \
 +      packet.h \
 +      peer.h \
 +      rsp_debug.h\
 +      rsp_hash.h \
 +      rsp_list.h \
 +      rsp_tlscommon.h \
 +      rsp_util.h \
 +      tcp.h \
 +      tls.h \
 +      udp.h
 +
  libradsec_la_LDFLAGS = -version-info 0:0:0 -export-symbols radsec.sym
- libradsec_la_CFLAGS = $(AM_CFLAGS) -Werror # -DDEBUG -DDEBUG_LEVENT 
 -libradsec_la_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -Werror # -DDEBUG -DDEBUG_LEVENT 
++libradsec_la_CFLAGS = $(AM_CFLAGS) -I. -I./include -Werror # -DDEBUG -DDEBUG_LEVENT 
 +
 +EXTRA_DIST = libradsec.spec radsec.sym
++libradsec_la_LIBADD = radius/libradsec-radius.la

diff --cc lib/configure.ac
index 0df726d,9b1d304..0602f03
--- 1/lib/configure.ac
--- 2/lib/configure.ac
+++ b/lib/configure.ac
@@@ -42,7 -41,8 +41,7 @@@ AC_TYPE_UINT8_
  # Checks for library functions.
  AC_CHECK_FUNCS([memset socket strdup strerror strrchr])
  
- AC_CONFIG_FILES([Makefile libradsec.spec
 -AC_CONFIG_FILES([Makefile
 -               radius/Makefile
++AC_CONFIG_FILES([Makefile libradsec.spec radius/Makefile
                 include/Makefile
                   examples/Makefile
                   tests/Makefile])

diff --cc lib/tcp.c
Simple merge