[master] Merge branch 'trac3480'

configure.ac

@@ -1389,8 +1389,6 @@ AC_CONFIG_FILES([compatcheck/Makefile
                  src/bin/keactrl/tests/keactrl_tests.sh
                  src/bin/keactrl/tests/Makefile
                  src/bin/Makefile
-                 src/bin/sockcreator/Makefile
-                 src/bin/sockcreator/tests/Makefile
                  src/hooks/dhcp/Makefile
                  src/hooks/dhcp/user_chk/Makefile
                  src/hooks/dhcp/user_chk/tests/Makefile

src/bin/Makefile.am

@@ -1,5 +1,5 @@
 # The following build order must be maintained.
-SUBDIRS = sockcreator dhcp4 dhcp6 d2
+SUBDIRS = dhcp4 dhcp6 d2
 
 if CONFIG_BACKEND_JSON
 SUBDIRS += keactrl

src/bin/sockcreator/README

@@ -1,3 +1,8 @@
+Aguust 2014: As of Kea 0.9, this code is not built.  It is currently uncertain
+whether it will be needed in a future version Kea, so it is being retained
+in the repository for now: it may be deleted in the future.
+
+
 The socket creator
 ==================