On 10/18/2016 06:01 AM, Wouter Verhelst wrote: > > The reason for using $(top_srcdir) is so that VPATH builds don't go > bollocks. Did you do a "make distcheck" with this? VPATH build using automake 1.15 worked just fine (as in: $ ./autogen.sh $ mkdir ../nbd-build $ cd ../nbd-build $ ../nbd/configure $ make distcheck ) > > Also, did you check that this doesn't break on older automake versions? I ended up checking out commit 485cf84 (the last commit prior to your TLS work started), and tested that on RHEL 6 (automake 1.11.1), 'make distcheck' worked on that patch. Then I did a cherry-pick of just this patch on top. The cherry-pick wasn't quite clean (there was a context conflict in tests/run/Makefile.am); but the resolution was obvious. Sadly, your prediction was right; 'make distcheck' complained: ... make[2]: Leaving directory `/home/dummy/nbd-build/nbd-3.14-11-gf814c28/_build/man' Making distclean in . make[2]: Entering directory `/home/dummy/nbd-build/nbd-3.14-11-gf814c28/_build' Makefile:475: .deps/libcliserv_la-cliserv.Plo: No such file or directory Of course, the hard-fail during configure regarding TLS prevents testing this patch on top of current nbd.git in that environment, but I'm still working on seeing if I can make TLS support optional and default to off if the system libraries are too old. > (not critical, but I just recently cherry-picked two commits from Josef > to allow building on CentOS 6, would be silly if we lose that again...) I'll make sure it works before sending v3 of this patch. However, the other patches in this series should still be usable as-is without this one going in. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature