build: Introduce a new contrib/ directory

.circleci/config.yml

@@ -16,6 +16,7 @@ parameters:
   configure_args:
     type: string
     default: |
+        --with-contrib \
         --with-unwind \
         --enable-developer-warnings \
         --enable-debugging-symbols \

Makefile.am

@@ -2,6 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 -I .
 
 SUBDIRS = include lib bin vmod etc doc man
 
+if WITH_CONTRIB
+SUBDIRS += contrib
+endif
+
 TESTS = tools/magic_check.sh
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -35,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
     --enable-developer-warnings \
     --enable-debugging-symbols \
     --enable-dependency-tracking \
+    --with-contrib \
     CFLAGS="$(EXTCFLAGS)"
 
 if WITH_UNWIND

autogen.des

@@ -35,4 +35,5 @@ $SRCDIR/configure \
     --enable-debugging-symbols \
     --enable-dependency-tracking \
     --with-persistent-storage \
+    --with-contrib \
     "$@"

configure.ac

@@ -924,4 +924,18 @@ AC_CONFIG_FILES([
     varnishapi-uninstalled.pc
     vmod/Makefile
 ])
+
+AC_ARG_WITH([contrib],
+	[AS_HELP_STRING([--with-contrib],
+		[Build Varnish with external contributions.])])
+
+AM_CONDITIONAL([WITH_CONTRIB], [test "$with_contrib" = yes])
+
+AM_COND_IF([WITH_CONTRIB], [
+	AC_DEFINE([WITH_CONTRIB], [1],
+		[Define to 1 when Varnish is built with contributions.])
+
+	AC_CONFIG_FILES([contrib/Makefile])
+])
+
 AC_OUTPUT

contrib/Makefile.am

+#
+
+