From c46070189e4d9a71f7884dad06ee48b935c591e9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 19 Jan 2015 10:20:28 +0100 Subject: build: do not include automake/autoconf cache in the 'make dist' tarball Remove the caches from the 'dist-hook' target that 'make dist' executes. Also, there is no need to run ./configure inside contrib/argp-standalone if it will not get used. configure.ac has been modified to only configure the contrib/argp-standalone sources for distributions that do not have the header available. BUG: 1183538 Change-Id: Iedd67139ec83f0076e24ed0d575f9053ac1a94ec Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/9463 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index cfb0267209f..7967363ba53 100644 --- a/configure.ac +++ b/configure.ac @@ -758,10 +758,10 @@ AC_SUBST(UNITTEST_LDFLAGS) dnl Check for argp AC_CHECK_HEADER([argp.h], AC_DEFINE(HAVE_ARGP, 1, [have argp])) -AC_CONFIG_SUBDIRS(contrib/argp-standalone) BUILD_ARGP_STANDALONE=no if test "x${ac_cv_header_argp_h}" = "xno"; then + AC_CONFIG_SUBDIRS(contrib/argp-standalone) BUILD_ARGP_STANDALONE=yes ARGP_STANDALONE_CPPFLAGS='-I${top_srcdir}/contrib/argp-standalone' ARGP_STANDALONE_LDADD='${top_builddir}/contrib/argp-standalone/libargp.a' @@ -966,7 +966,6 @@ if test "x${GF_HOST_OS}" != "xGF_LINUX_HOST_OS" ; then UMOUNTD_SUBDIR="contrib/umountd" fi AC_SUBST(UMOUNTD_SUBDIR) - # enable/disable QEMU AM_CONDITIONAL([ENABLE_QEMU_BLOCK], [test x$BUILD_QEMU_BLOCK = xyes]) -- cgit