[#227] References to client/relay code removed in configure/Makefile

3 files changed, 4 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index ed692a50..19719d7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,8 @@ EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \
 	     doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \
 	     doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/libtool.dox \
 	     doc/devel/mainpage.dox doc/devel/omapi.dox doc/devel/qa.dox \
-	     client/tests/Atffile common/tests/Atffile server/tests/Atffile \
-	     client/tests/Kyuafile common/tests/Kyuafile server/tests/Kyuafile \
+	     common/tests/Atffile server/tests/Atffile \
+	     common/tests/Kyuafile server/tests/Kyuafile \
          m4/README CONTRIBUTING.md
 
 if HAVE_BINDDIR
@@ -38,7 +38,7 @@ endif
 
 # Use an autoconf substitution vs an automake conditional here
 # to fool automake when the bind directory does not exist.
-SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server
+SUBDIRS = @BINDSUBDIR@ includes tests common omapip dhcpctl server
 
 DIST_SUBDIRS = $(SUBDIRS) keama
 
diff --git a/configure b/configure
index 66e1b8c5..2cc6e2c9 100755
--- a/configure
+++ b/configure
@@ -7566,7 +7566,7 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h
   fi
 
 
-ac_config_files="$ac_config_files Makefile client/Makefile client/tests/Makefile common/Makefile.am common/Makefile common/tests/Makefile dhcpctl/Makefile.am dhcpctl/Makefile includes/Makefile keama/Makefile omapip/Makefile.am omapip/Makefile relay/Makefile relay/tests/Makefile server/Makefile tests/Makefile.am tests/Makefile tests/unittest.sh server/tests/Makefile doc/devel/doxyfile"
+ac_config_files="$ac_config_files Makefile common/Makefile.am common/Makefile common/tests/Makefile dhcpctl/Makefile.am dhcpctl/Makefile includes/Makefile keama/Makefile omapip/Makefile.am omapip/Makefile server/Makefile tests/Makefile.am tests/Makefile tests/unittest.sh server/tests/Makefile doc/devel/doxyfile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8318,8 +8318,6 @@ do
     "includes/config.h") CONFIG_HEADERS="$CONFIG_HEADERS includes/config.h" ;;
     "$srcdir/bind/Makefile") CONFIG_FILES="$CONFIG_FILES $srcdir/bind/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "client/Makefile") CONFIG_FILES="$CONFIG_FILES client/Makefile" ;;
-    "client/tests/Makefile") CONFIG_FILES="$CONFIG_FILES client/tests/Makefile" ;;
     "common/Makefile.am") CONFIG_FILES="$CONFIG_FILES common/Makefile.am" ;;
     "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
     "common/tests/Makefile") CONFIG_FILES="$CONFIG_FILES common/tests/Makefile" ;;
@@ -8329,8 +8327,6 @@ do
     "keama/Makefile") CONFIG_FILES="$CONFIG_FILES keama/Makefile" ;;
     "omapip/Makefile.am") CONFIG_FILES="$CONFIG_FILES omapip/Makefile.am" ;;
     "omapip/Makefile") CONFIG_FILES="$CONFIG_FILES omapip/Makefile" ;;
-    "relay/Makefile") CONFIG_FILES="$CONFIG_FILES relay/Makefile" ;;
-    "relay/tests/Makefile") CONFIG_FILES="$CONFIG_FILES relay/tests/Makefile" ;;
     "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
     "tests/Makefile.am") CONFIG_FILES="$CONFIG_FILES tests/Makefile.am" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index b2c306b7..b22f4586 100644
--- a/configure.ac
+++ b/configure.ac
@@ -992,8 +992,6 @@ AC_C_FLEXIBLE_ARRAY_MEMBER
 
 AC_CONFIG_FILES([
   Makefile
-  client/Makefile
-  client/tests/Makefile
   common/Makefile.am
   common/Makefile
   common/tests/Makefile
@@ -1003,8 +1001,6 @@ AC_CONFIG_FILES([
   keama/Makefile
   omapip/Makefile.am
   omapip/Makefile
-  relay/Makefile
-  relay/tests/Makefile
   server/Makefile
   tests/Makefile.am
   tests/Makefile