From: Stephen Morris <stephen@isc.org>
Date: Fri, 1 Aug 2014 19:22:30 +0000 (+0100)
Subject: [master] Merge branch 'trac3481'
X-Git-Tag: trac3482_base~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d101aed6156a993476fa1164f0b0ec8395f5886c;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3481'

Conflicts:
	configure.ac
	src/bin/Makefile.am
---

d101aed6156a993476fa1164f0b0ec8395f5886c
diff --cc configure.ac
index 3470d12044,6e4a9eeccb..860c8c2891
--- a/configure.ac
+++ b/configure.ac
@@@ -1382,13 -1384,18 +1384,16 @@@ AC_CONFIG_FILES([compatcheck/Makefil
                   src/bin/dhcp6/tests/marker_file.h
                   src/bin/dhcp6/tests/test_data_files_config.h
                   src/bin/dhcp6/tests/test_libraries.h
-                  src/bin/keactrl/keactrl
+                  src/bin/keactrl/Makefile
                   src/bin/keactrl/kea.conf
+                  src/bin/keactrl/keactrl
                   src/bin/keactrl/keactrl.conf
-                  src/bin/keactrl/Makefile
-                  src/bin/keactrl/tests/keactrl_tests.sh
                   src/bin/keactrl/tests/Makefile
-                  src/bin/Makefile
+                  src/bin/keactrl/tests/keactrl_tests.sh
+                  src/bin/perfdhcp/Makefile
+                  src/bin/perfdhcp/tests/Makefile
+                  src/bin/perfdhcp/tests/testdata/Makefile
 -                 src/bin/sockcreator/Makefile
 -                 src/bin/sockcreator/tests/Makefile
+                  src/hooks/Makefile
                   src/hooks/dhcp/Makefile
                   src/hooks/dhcp/user_chk/Makefile
                   src/hooks/dhcp/user_chk/tests/Makefile
diff --cc src/bin/Makefile.am
index 3ffb1b72a7,c98da6e2ae..a3c5e15610
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@@ -1,5 -1,5 +1,5 @@@
  # The following build order must be maintained.
- SUBDIRS = dhcp4 dhcp6 d2
 -SUBDIRS = sockcreator dhcp4 dhcp6 d2 perfdhcp
++SUBDIRS = dhcp4 dhcp6 d2 perfdhcp
  
  if CONFIG_BACKEND_JSON
  SUBDIRS += keactrl