diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 187bfd5ed16..43926119fc0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,10 +29,15 @@ gitclean: distclean -rm -f $(CONTRIBDIR)/argp-standalone/config.h.in -rm -f $(CONTRIBDIR)/argp-standalone/configure -rm -f $(CONTRIBDIR)/argp-standalone/depcomp + -rm -fr $(CONTRIBDIR)/argp-standalone/.deps -rm -f $(CONTRIBDIR)/argp-standalone/install-sh -rm -f $(CONTRIBDIR)/argp-standalone/missing dist-hook: gen-VERSION gen-ChangeLog + -rm -fr $(distdir)/contrib/argp-standalone/autom4te.cache + -rm -fr $(distdir)/contrib/argp-standalone/.deps + -rm -fr $(distdir)/contrib/umountd/.deps + .PHONY: gen-VERSION gen-ChangeLog gen-ChangeLog: 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]) |