Allow configuring to not install specific scripts

When not installing a script, also stop its documentation, example
files etc.

configure.ac

@@ -36,6 +36,36 @@ AC_ARG_ENABLE([iprange],
               [enable_iprange="yes"])
 AM_CONDITIONAL([ENABLE_IPRANGE], [test "${enable_iprange}" = "yes"])
 
+AC_ARG_ENABLE([firehol],
+              [AS_HELP_STRING([--disable-firehol], [disable firehol installation @<:@enabled@:>@])],
+              ,
+              [enable_firehol="yes"])
+AM_CONDITIONAL([ENABLE_FIREHOL], [test "${enable_firehol}" = "yes"])
+
+AC_ARG_ENABLE([fireqos],
+              [AS_HELP_STRING([--disable-fireqos], [disable fireqos installation @<:@enabled@:>@])],
+              ,
+              [enable_fireqos="yes"])
+AM_CONDITIONAL([ENABLE_FIREQOS], [test "${enable_fireqos}" = "yes"])
+
+AC_ARG_ENABLE([link-balancer],
+              [AS_HELP_STRING([--disable-link-balancer], [disable link-balancer installation @<:@enabled@:>@])],
+              ,
+              [enable_link_balancer="yes"])
+AM_CONDITIONAL([ENABLE_LINK_BALANCER], [test "${enable_link_balancer}" = "yes"])
+
+AC_ARG_ENABLE([update-ipsets],
+              [AS_HELP_STRING([--disable-update-ipsets], [disable update-ipsets installation @<:@enabled@:>@])],
+              ,
+              [enable_update_ipsets="yes"])
+AM_CONDITIONAL([ENABLE_UPDATE_IPSETS], [test "${enable_update_ipsets}" = "yes"])
+
+AC_ARG_ENABLE([vnetbuild],
+              [AS_HELP_STRING([--disable-vnetbuild], [disable vnetbuild installation @<:@enabled@:>@])],
+              ,
+              [enable_vnetbuild="yes"])
+AM_CONDITIONAL([ENABLE_VNETBUILD], [test "${enable_vnetbuild}" = "yes"])
+
 if test x"$USE_MAINTAINER_MODE" = xyes; then
 AC_MSG_NOTICE(***************** MAINTAINER MODE *****************)
 PACKAGE_BUILT_DATE=$(date '+%d %b %Y')

contrib/Makefile.am

@@ -2,12 +2,22 @@
 
 contribdir = $(docdir)/contrib
 
+servicefiles =
+
+if ENABLE_FIREHOL
+
 contrib_SCRIPTS = \
 	dnsbl-ipset.sh
 
-contrib_DATA = \
-	firehol.service \
-	fireqos.service
+servicefiles += firehol.service
+
+endif
+
+if ENABLE_FIREQOS
+servicefiles += fireqos.service
+endif
+
+contrib_DATA = README $(servicefiles)
 
 EXTRA_DIST = \
 	$(contrib_SCRIPTS) \

contrib/README

@@ -4,6 +4,4 @@ Manage IPSETs using iptables logging and DNSBL lookups:
    dnsbl-ipset.sh
 
 Example systemd services (see https://github.com/firehol/firehol/issues/17)
-from Arch linux:
-   firehol.service
-   fireqos.service
+from Arch linux: PROGNAME.service

doc/firehol/Makefile.am

@@ -117,6 +117,8 @@ MANUALMARKDOWN_GENERATED = \
 	contents.md \
 	firehol-services.5.md
 
+if ENABLE_FIREHOL
+
 if ENABLE_DOC
 
 dochtml_DATA = \
@@ -135,6 +137,8 @@ man_MANS = \
 
 endif
 
+endif
+
 if MAINTAINER_MODE
 
 MKSERVICELINKS = ${top_srcdir}/doc/tools/mkservicelinks

doc/fireqos/Makefile.am

@@ -94,6 +94,8 @@ MANUALMAN_GENERATED_INDIRECT = \
 	man/man5/fireqos-tsize.5 \
 	man/man5/fireqos-udp.5
 
+if ENABLE_FIREQOS
+
 if ENABLE_DOC
 
 dochtml_DATA = \
@@ -112,6 +114,8 @@ man_MANS = \
 
 endif
 
+endif
+
 if MAINTAINER_MODE
 
 MKSERVICELINKS = ${top_srcdir}/doc/tools/mkservicelinks

doc/vnetbuild/Makefile.am

@@ -30,6 +30,8 @@ MANUALMAN_GENERATED_INDIRECT = \
 	man/man5/vnetbuild-route.5 \
 	man/man5/vnetbuild-switch.5
 
+if ENABLE_VNETBUILD
+
 if ENABLE_DOC
 
 dochtml_DATA = \
@@ -48,6 +50,8 @@ man_MANS = \
 
 endif
 
+endif
+
 if MAINTAINER_MODE
 
 MKSERVICELINKS = ${top_srcdir}/doc/tools/mkservicelinks

etc/Makefile.am

@@ -3,15 +3,24 @@
 fireholconfdir = $(sysconfdir)/firehol
 servicesconfdir = $(sysconfdir)/firehol/services
 
-fireholconf_DATA = \
-	firehol.conf.example \
-	fireqos.conf.example
+conffiles=
+
+if ENABLE_FIREHOL
 
 servicesconf_DATA = \
 	bittorrent.conf.example
 
+conffiles += firehol.conf.example
+
+endif
+
+if ENABLE_FIREQOS
+conffiles += fireqos.conf.example
+endif
+
+fireholconf_DATA = $(conffiles)
+
 EXTRA_DIST = \
 	firehol.conf.example \
 	bittorrent.conf.example \
-	fireqos.conf.example \
-	fireqos-multiple-organizations.conf.example
+	fireqos.conf.example

examples/Makefile.am

@@ -2,18 +2,39 @@
 
 examplesdir = $(docdir)/examples
 
+conffiles =
+
+if ENABLE_FIREHOL
+
 examples_SCRIPTS = \
 	adblock.sh
 
-examples_DATA = \
+conffiles += \
 	server-dmz.conf \
 	client-all.conf \
 	lan-gateway.conf \
 	office.conf \
-	icmpv6.conf \
+	icmpv6.conf
+
+endif
+
+if ENABLE_FIREQOS
+
+conffiles += \
+	fireqos.conf \
+	fireqos-multiple-organizations.conf
+
+endif
+
+if ENABLE_VNETBUILD
+
+conffiles += \
 	vnetbuild.conf \
-	vnetbuild-simple.conf \
-	fireqos.conf
+	vnetbuild-simple.conf
+
+endif
+
+examples_DATA = $(conffiles)
 
 EXTRA_DIST = \
 	$(examples_DATA) \

packaging/check-contents

@@ -32,5 +32,18 @@ fi
 
 mkdir $MYTMP/unpack
 tar xfzC "$2" $MYTMP/unpack
-diff -r "$1" $MYTMP/unpack/* | grep "^Only"
-
+diff -r "$1" $MYTMP/unpack/* | grep "^Only" | sed \
+	-e '/: autom4te\.cache$/d' \
+	-e '/: \.deps$/d' \
+	-e '/: \.git$/d' \
+	-e '/: \.gitattributes$/d' \
+	-e '/: \.gitignore$/d' \
+	-e '/: config\.log$/d' \
+	-e '/: config\.status$/d' \
+	-e '/: Makefile$/d' \
+	-e '/: tmp-anchor-links$/d' \
+	-e '/: tmp-manproc$/d' \
+	-e '/: firehol.*\.tar\.\(gz\|bz2\|xz\)$/d' \
+	-e '/: unittest$/d' \
+	-e '/sbin: \(firehol\|fireqos\|link-balancer\)$/d' \
+	-e '/sbin: \(update-ipsets\|vnetbuild\)$/d'

sbin/Makefile.am

@@ -1,6 +1,27 @@
 # Process this file with automake to produce Makefile.in
 
-sbin_SCRIPTS = firehol fireqos link-balancer update-ipsets vnetbuild
+scripts =
+if ENABLE_FIREHOL
+scripts += firehol
+endif
+
+if ENABLE_FIREQOS
+scripts += fireqos
+endif
+
+if ENABLE_LINK_BALANCER
+scripts += link-balancer
+endif
+
+if ENABLE_UPDATE_IPSETS
+scripts += update-ipsets
+endif
+
+if ENABLE_VNETBUILD
+scripts += vnetbuild
+endif
+
+sbin_SCRIPTS = $(scripts)
 
 if ENABLE_IPRANGE