diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-01-19 10:20:28 +0100 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-01-30 10:55:49 -0800 |
| commit | c46070189e4d9a71f7884dad06ee48b935c591e9 (patch) | |
| tree | 679eaebbe78b5f89f3a448050dac0cc6a227aed4 /configure.ac | |
| parent | 64132200590a9310ea221524e13db8a09bd89313 (diff) | |
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 <argp.h> header available.
BUG: 1183538
Change-Id: Iedd67139ec83f0076e24ed0d575f9053ac1a94ec
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9463
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
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]) |