[PATCH setup 5/7] Fix building inilint

[Jon Turney]

Fix Makefile.am for inilint
Always build inilint, so it doesn't rust again
---
 Makefile.am  | 24 ++----------------------
 configure.ac | 13 -------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0ef3d6e..04bb668 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,10 +33,7 @@ AM_CPPFLAGS = -DLZMA_API_STATIC -I$(srcdir)/libgetopt++/include \
 
 inilex_CXXFLAGS:=-Wno-sign-compare
 
-noinst_PROGRAMS = @SETUP@$(EXEEXT) @INILINT@
-
-EXTRA_PROGRAMS = inilint
-## noinst_PROGRAMS +=inilint
+noinst_PROGRAMS = @SETUP@$(EXEEXT) inilint
 
 EXTRA_DIST = \
 	CHANGES \
@@ -62,34 +59,17 @@ CLEANFILES = setup_version.c
 
 inilint_LDADD = \
 	libgetopt++/libgetopt++.la
+
 inilint_SOURCES = \
 	CliParseFeedback.cc \
 	CliParseFeedback.h \
-	filemanip.cc \
-	filemanip.h \
-	find.cc \
-	find.h \
-	FindVisitor.cc \
-	FindVisitor.h \
 	LogSingleton.cc \
 	LogSingleton.h \
 	IniDBBuilder.h \
 	inilintmain.cc \
 	inilex.ll \
 	iniparse.yy \
-	io_stream.h \
-	io_stream.cc \
-	io_stream_file.h \
-	io_stream_file.cc \
-	IOStreamProvider.h \
-	mkdir.cc \
-	mkdir.h \
-	mklink2.cc \
-	PackageSpecification.cc \
-	PackageSpecification.h \
 	PackageTrust.h \
-	csu_util/rfc1738.cc \
-	csu_util/rfc1738.h \
 	String++.cc \
 	String++.h
 
diff --git a/configure.ac b/configure.ac
index 08fe16b..ab6f3ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,19 +23,6 @@ dnl AM_CONFIG_HEADER(include/autoconf.h)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES(yes)])
 AC_CONFIG_SRCDIR([Makefile.in])
 
-AC_MSG_CHECKING([Whether to build inilint])
-AC_ARG_ENABLE(inilint,
-	    AC_HELP_STRING([--enable-inilint],
-			   [Build the inilint tool]),
-	    ac_cv_enable_inilint=$enableval, ac_cv_enable_inilint=no)
-AC_MSG_RESULT([$ac_cv_enable_inilint])
-if test $ac_cv_enable_inilint = yes; then
-  INILINT="inilint\$(EXEEXT)"
-else
-  INILINT=
-fi
-AC_SUBST(INILINT)
-
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
 AM_PROG_CC_C_O
-- 
2.21.0