From c6e39e15178675d0779e0ae855245774a09b4eb5 Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Mon, 16 Jun 2014 19:39:25 +0300 Subject: build: Switch back to DISTCHECK_CONFIGURE_FLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch back to using DISTCHECK_CONFIGURE_FLAGS instead of the AM_-version in Makefile.am, as the latter is not supported by Automake version in RHEL6. Instead, use a special variable AUX_DISTCHECK_CONFIGURE_FLAGS to augment distcheck target configure flags from the command line. Reviewed-by: Lukáš Slebodník --- Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index c256c3c8..91142b39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,11 @@ if WITH_JOURNALD extra_distcheck_flags += --with-syslog=journald endif -AM_DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \ - --disable-dbus-tests \ - --enable-all-experimental-features \ - $(extra_distcheck_flags) +DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \ + --disable-dbus-tests \ + --enable-all-experimental-features \ + $(extra_distcheck_flags) \ + $(AUX_DISTCHECK_CONFIGURE_FLAGS) SUBDIRS = po -- cgit