On 10/14/2016 03:19 PM, Eric Blake wrote:
> Starting from a fresh git checkout, running ./autogen.sh gives a
> couple of warnings on my Fedora 24 build tools, one from libtool:
>
> libtoolize: Consider adding '-I support' to ACLOCAL_AMFLAGS in Makefile.am.
>
> and one from automake:
>
> tests/run/Makefile.am:4: warning: source file '$(top_srcdir)/cliserv.c' is in a subdirectory,
> tests/run/Makefile.am:4: but option 'subdir-objects' is disabled
> automake: warning: possible forward-incompatibility.
> automake: At least a source file is in a subdirectory, but the 'subdir-objects'
> automake: automake option hasn't been enabled. For now, the corresponding output
> automake: object file(s) will be placed in the top-level directory. However,
> automake: this behaviour will change in future Automake versions: they will
> automake: unconditionally cause object files to be placed in the same subdirectory
> automake: of the corresponding sources.
> automake: You are advised to start using 'subdir-objects' option throughout your
> automake: project, to avoid future incompatibilities.
>
> Following the advice doesn't break anything, so let's do it.
Except my patch did break something. NACK; this will need v2.
>
> I also noticed that the build leaves behind an untracked file.
>
> Signed-off-by: Eric Blake <eblake@...696...>
> ---
> .gitignore | 1 +
> Makefile.am | 1 +
> configure.ac | 2 +-
> 3 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/.gitignore b/.gitignore
> index b8163e0..a13897a 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -38,6 +38,7 @@ install-sh
> configure
> man/*.sh
> man/*.sh.in
> +man/manpage.log
> make-integrityhuge
> nbd-trdump
> missing
> diff --git a/Makefile.am b/Makefile.am
> index 32774e3..c1740d6 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,3 +1,4 @@
> +ACLOCAL_AMFLAGS = -I support
> SUBDIRS = . man doc tests systemd gznbd
> bin_PROGRAMS = nbd-server nbd-trdump
> sbin_PROGRAMS = @NBD_CLIENT_NAME@
> diff --git a/configure.ac b/configure.ac
> index 83e4f91..ce225a6 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -11,7 +11,7 @@ m4_define([serial_tests], [
> awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
> ])
> ])
> -AM_INIT_AUTOMAKE(foreign dist-xz serial_tests)
> +AM_INIT_AUTOMAKE(foreign dist-xz serial_tests subdir-objects)
> AM_MAINTAINER_MODE([enable])
> AC_CONFIG_MACRO_DIR([support])
> LT_INIT
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature