From: Francis Dupont <fdupont@isc.org>
Date: Sat, 6 Oct 2018 10:24:33 +0000 (+0200)
Subject: [65-libyang-control-socket_rebased] Rebased on master after pool merge
X-Git-Tag: 165-netbsd-8-fixes_base^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16cabe7f7ab8aa060e5259b8cdbe65fce3ecc67c;p=thirdparty%2Fkea.git

[65-libyang-control-socket_rebased] Rebased on master after pool merge
---

16cabe7f7ab8aa060e5259b8cdbe65fce3ecc67c
diff --cc src/lib/yang/Makefile.am
index bc7d227481,7fb92ac286..dd3ebb1f43
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -31,9 -31,9 +33,10 @@@ libkea_yang_include_HEADERS = 
  	adaptor.h \
  	sysrepo_error.h \
  	translator.h \
+ 	translator_control_socket.h \
  	translator_option_data.h \
 -	translator_option_def.h
 +	translator_option_def.h \
 +	translator_pool.h
  
  EXTRA_DIST = yang.dox
  # Distribute yang models.
diff --cc src/lib/yang/tests/Makefile.am
index 58018a599b,4ad44d831a..155789f4f4
--- a/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,9 -20,9 +20,10 @@@ TESTS += run_unittest
  run_unittests_SOURCES  = adaptor_unittests.cc
  run_unittests_SOURCES += sysrepo_setup.h
  run_unittests_SOURCES += translator_unittests.cc
+ run_unittests_SOURCES += translator_control_socket_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
  run_unittests_SOURCES += translator_option_def_unittests.cc
 +run_unittests_SOURCES += translator_pool_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)