Merge pull request #310 from opensourcerouting/thread-prep

MT preparations

diff --cc configure.ac
Simple merge

diff --cc lib/Makefile.am
index 14b7130c8a8d796ccff52eb65c256fa968ef1f09,d7a4439d5aeee1f75f242263483599bbddb8b161..75947e61465f1a7c2e3d26dedbd2a28a97ca113e
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -40,20 -37,8 +40,21 @@@ BUILT_SOURCES = route_types.h gitversio
  
  libfrr_la_LIBADD = @LIBCAP@
  
 +if SNMP
 +lib_LTLIBRARIES +=  libfrrsnmp.la
 +endif
 +
 +libfrrsnmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 +libfrrsnmp_la_LDFLAGS = -version-info 0:0:0
 +libfrrsnmp_la_LIBADD = libfrr.la $(SNMP_LIBS)
 +libfrrsnmp_la_SOURCES = \
 +      agentx.c \
 +      smux.c \
 +      snmp.c \
 +      #end
 +
  pkginclude_HEADERS = \
+       frratomic.h \
        buffer.h checksum.h filter.h getopt.h hash.h \
        if.h linklist.h log.h \
        graph.h command_match.h \

diff --cc lib/log.c
Simple merge