[master] Merge branch 'trac3481'

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

diff --cc configure.ac
index 3470d1204423e54915151cd1c544dd0fb9b9e0ed,6e4a9eeccbeb59d68b544509bfddb9ffcfe2abea..860c8c2891a9e0cad4ed1e76cd66db682eb5fdb3
--- 1/configure.ac
--- 2/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 3ffb1b72a7609bb4b17180bef357d3c494ddb6bc,c98da6e2aeac2f94c59a719981da00acd0320ac1..a3c5e1561017dcdef239ffebdf1f70e57bf073ea
--- 1/src/bin/Makefile.am
--- 2/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