diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-02-26 14:15:07 +0100 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-02-26 13:17:12 -0800 |
| commit | 526448e784317e3c9ec72e1641f82b28959b696d (patch) | |
| tree | e6f292fefdadb090a11047ad563681c25173f3d2 | |
| parent | 3242a1f79abd27743da9ff3209be49df5474b4b3 (diff) | |
configure: argp-standalone is always built, even when not needed
This patch still configures argp, i.e. creates Makefile in
/contrib/argp-standalone, for the `make dist`, but there's no reason
to compile it when it's not going to be linked into anything.
Backport of commit 09d2dcac3a238cfe6bde1a7aed06facfa16caf20:
> Change-Id: Id0fcb717b5821d8a4c176e6274339f46b3a4a249
> BUG: 1086773
> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
> Reviewed-on: http://review.gluster.org/7440
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-by: Anand Avati <avati@redhat.com>
Change-Id: Id0fcb717b5821d8a4c176e6274339f46b3a4a249
BUG: 1191006
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9761
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 0b65c68e778..5ff1b65adeb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,9 +3,10 @@ EXTRA_DIST = autogen.sh \ INSTALL README AUTHORS THANKS NEWS \ glusterfs.spec glusterfs-api.pc.in libgfchangelog.pc.in \ run-tests.sh \ + argp-standalone \ $(shell find $(top_srcdir)/tests -type f -print) -SUBDIRS = argp-standalone libglusterfs rpc api xlators glusterfsd \ +SUBDIRS = $(ARGP_STANDALONE_DIR) libglusterfs rpc api xlators glusterfsd \ $(FUSERMOUNT_SUBDIR) doc extras cli heal @SYNCDAEMON_SUBDIR@ pkgconfigdir = @pkgconfigdir@ @@ -19,10 +20,13 @@ gitclean: distclean find . -name mount.glusterfs -exec rm -f {} \; rm -fr autom4te.cache rm -f missing aclocal.m4 config.h.in config.guess config.sub ltmain.sh install-sh configure depcomp - rm -fr argp-standalone/autom4te.cache - rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in - rm -f argp-standalone/configure argp-standalone/depcomp - rm -f argp-standalone/install-sh argp-standalone/missing + -rm -fr argp-standalone/autom4te.cache + -rm -f argp-standalone/aclocal.m4 + -rm -f argp-standalone/config.h.in + -rm -f argp-standalone/configure + -rm -f argp-standalone/depcomp + -rm -f argp-standalone/install-sh + -rm -f argp-standalone/missing dist-hook: (cd $(srcdir) && git diff && echo ===== git log ==== && git log) > $(distdir)/ChangeLog diff --git a/configure.ac b/configure.ac index f2d0dbf3b7d..e1a207016de 100644 --- a/configure.ac +++ b/configure.ac @@ -623,6 +623,7 @@ if test "x${ac_cv_header_argp_h}" = "xno"; then BUILD_ARGP_STANDALONE=yes ARGP_STANDALONE_CPPFLAGS='-I${top_srcdir}/argp-standalone' ARGP_STANDALONE_LDADD='${top_builddir}/argp-standalone/libargp.a' + ARGP_STANDALONE_DIR='${top_builddir}/argp-standalone' fi AC_SUBST(ARGP_STANDALONE_CPPFLAGS) |