On (19/06/14 20:06), Nikolai Kondrashov wrote:
Hi everyone,
Here is the cherry-pick of "build: Switch back to DISTCHECK_CONFIGURE_FLAGS"
to sssd-1-11.
Nick
From a8d7d75cb286b82ee5ab15effe5380f100c6b857 Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Mon, 16 Jun 2014 19:39:25 +0300
Subject: [PATCH 1/1] 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 <lslebodn(a)redhat.com>
(cherry picked from commit c6e39e15178675d0779e0ae855245774a09b4eb5)
Conflicts:
Makefile.am
---
Makefile.am | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4fcbd52..03452cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,11 @@ if HAVE_DEVSHM
extra_distcheck_flags += --with-test-dir=/dev/shm
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
ACK for 1-11 branch
LS