From 9e45a5ca19a6b0cc39f2ba45e385dc3ab9b116b0 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 8 Jan 2016 07:01:00 -0600
Subject: [PATCH] buildsystem: further cleanup

---
 Makefile.in            |  1 -
 authd/Makefile.in      |  1 -
 bandb/Makefile.in      |  1 -
 configure              | 12 ------------
 configure.ac           | 14 --------------
 doc/Makefile.in        |  1 -
 extensions/Makefile.in |  1 -
 help/Makefile.in       |  1 -
 ircd/Makefile.in       |  1 -
 modules/Makefile.in    |  1 -
 ssld/Makefile.in       |  1 -
 tools/Makefile.in      |  1 -
 12 files changed, 36 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 315d8600..b372c89d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -332,7 +332,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/authd/Makefile.in b/authd/Makefile.in
index bf27a7b6..a50e2586 100644
--- a/authd/Makefile.in
+++ b/authd/Makefile.in
@@ -290,7 +290,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/bandb/Makefile.in b/bandb/Makefile.in
index 810f7682..63bfdfc5 100644
--- a/bandb/Makefile.in
+++ b/bandb/Makefile.in
@@ -295,7 +295,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/configure b/configure
index 870206f6..a2caf9c3 100755
--- a/configure
+++ b/configure
@@ -668,7 +668,6 @@ PKG_CONFIG
 ZLIB_LD
 ENCSPEED
 ALLOCA
-VICONF
 CRYPT_LIB
 PKGLIBEXECDIR
 pkglibexecdir
@@ -13456,9 +13455,6 @@ eval "LTDLOPEN=\"$libname_spec\""
 
 
 build_ltdl=$with_included_ltdl
-#if test x"$build_ltdl" = x"yes"; then
-#	AC_CONFIG_SUBDIRS([libltdl])
-#fi
  if test x"$build_ltdl" = x"yes"; then
   BUILD_LTDL_TRUE=
   BUILD_LTDL_FALSE='#'
@@ -15077,14 +15073,6 @@ fi
 
 
 
-if test "$ac_cv_header_sys_wait_h" = yes -o "$ac_cv_header_wait_h" = yes; then
-	VICONF=viconf
-			else
-	VICONF=""
-fi
-
-
-
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if ${ac_cv_c_bigendian+:} false; then :
diff --git a/configure.ac b/configure.ac
index 8f1fe319..1ba3a04c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,6 @@ LT_CONFIG_LTDL_DIR([libltdl])
 LTDL_INIT
 
 build_ltdl=$with_included_ltdl
-#if test x"$build_ltdl" = x"yes"; then
-#	AC_CONFIG_SUBDIRS([libltdl])
-#fi
 AM_CONDITIONAL([BUILD_LTDL], [test x"$build_ltdl" = x"yes"])
 
 if test "$ac_cv_c_compiler_gnu" = yes; then
@@ -167,17 +164,6 @@ fi
 
 AC_SUBST(CRYPT_LIB)
 
-if test "$ac_cv_header_sys_wait_h" = yes -o "$ac_cv_header_wait_h" = yes; then
-	VICONF=viconf
-	dnl We need one of the above to build viconf. Just a sanity check,
-	dnl we don't want to stop people from building the rest of ircd
-	dnl just because they can't build viconf.
-else
-	VICONF=""
-fi
-
-AC_SUBST(VICONF)
-
 AC_C_BIGENDIAN
 
 dnl Check for stdarg.h - if we can't find it, halt configure
diff --git a/doc/Makefile.in b/doc/Makefile.in
index af2d020e..8d7a6a76 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -237,7 +237,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 4191a8b4..0639b26c 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -519,7 +519,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/help/Makefile.in b/help/Makefile.in
index ddeb851b..01cb0a92 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -241,7 +241,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index 5acd8673..516651f7 100644
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -355,7 +355,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 492b4771..e60e0c25 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -585,7 +585,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/ssld/Makefile.in b/ssld/Makefile.in
index 1255f920..d7cf4a63 100644
--- a/ssld/Makefile.in
+++ b/ssld/Makefile.in
@@ -289,7 +289,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 10b9038a..207da77d 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -289,7 +289,6 @@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
 STRIP = @STRIP@
 TOUCH = @TOUCH@
 VERSION = @VERSION@
-VICONF = @VICONF@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_LD = @ZLIB_LD@