On 17/07/2020 19:19, Matthias Andree wrote: > Else one location overwrites options from the other. > > Signed-off-by: Matthias Andree <matthias.and...@gmx.de> > --- > Makefile.am | 3 --- > configure.ac | 4 +++- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 439120e4..d1c10fc5 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -23,9 +23,6 @@ > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > # > > -# This option prevents autoreconf from overriding our COPYING and > -# INSTALL targets: > -AUTOMAKE_OPTIONS = foreign 1.9 > ACLOCAL_AMFLAGS = -I m4 > > MAINTAINERCLEANFILES = \ > diff --git a/configure.ac b/configure.ac > index 45148892..8ed83bc2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -54,7 +54,9 @@ m4_define([serial_tests], [ > awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { > print "serial-tests" }}' > ]) > ]) > -AM_INIT_AUTOMAKE(foreign serial_tests) dnl NB: Do not [quote] this parameter. > +# This foreign option prevents autoreconf from overriding our COPYING and > +# INSTALL targets: > +AM_INIT_AUTOMAKE(foreign serial_tests 1.9) dnl NB: Do not [quote] this > parameter. > AC_CANONICAL_HOST > AC_USE_SYSTEM_EXTENSIONS >
Acked-By: David Sommerseth <dav...@openvpn.net> This works better than the previous attempt, this also passes 'make distcheck'. I see this patch does not have the subdir-objects flag in the automake options; which seems to be the reason why it failed on my RHEL-7 box last round. I'll try to see if I can better understand why. -- kind regards, David Sommerseth OpenVPN Inc
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel