Add automake subdir-options for modules

The automake project is apparently changing behavior in their next
major version and warning everyone who relies on subdir-options to add
it explicitly.

diff --git a/build/modmake.rulesam b/build/modmake.rulesam
index 51e2f809c23be6215d70baef74d7912c9b45ddfd..aa36997bd82fc3b8bf6202ccae54f2e7641b3c90 100644 (file)
--- a/build/modmake.rulesam
+++ b/build/modmake.rulesam
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS = foreign subdir-objects
 AM_CFLAGS   = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
 AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
 AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS)

diff --git a/src/mod/applications/mod_curl/Makefile.am b/src/mod/applications/mod_curl/Makefile.am
index 26715339e3da36de048e63394714aeb129152df4..6e0debb65fa54cc7a8dd30f7723e7317f6e43dab 100644 (file)
--- a/src/mod/applications/mod_curl/Makefile.am
+++ b/src/mod/applications/mod_curl/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/build/modmake.rulesam
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS += foreign
 MODNAME=mod_curl
 
 JSON_C=json-c-0.9

diff --git a/src/mod/languages/mod_v8/Makefile.am b/src/mod/languages/mod_v8/Makefile.am
index 7355a47251cfd6cb02e82702dad061c4e325491a..59181650a3af18d082141d650d2164dc75933db7 100644 (file)
--- a/src/mod/languages/mod_v8/Makefile.am
+++ b/src/mod/languages/mod_v8/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/build/modmake.rulesam
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS += foreign
 
 # V8 version to use
 V8=v8-3.24.14