From e6ec9b3c61f566b40bb38600d009cce0c834e607 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sat, 8 Mar 2014 00:26:19 +0000 Subject: [PATCH] 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. --- build/modmake.rulesam | 1 + src/mod/applications/mod_curl/Makefile.am | 2 +- src/mod/languages/mod_v8/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/modmake.rulesam b/build/modmake.rulesam index 51e2f809c2..aa36997bd8 100644 --- 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 26715339e3..6e0debb65f 100644 --- 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 7355a47251..59181650a3 100644 --- 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