| Message ID | 20200717171918.230727-1-matthias.andree@gmx.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE. | expand |
On 17/07/2020 19:19, Matthias Andree wrote: > Else one location overwrites options from the other. > > Signed-off-by: Matthias Andree <matthias.andree@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 <davids@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.
Am 17.07.20 um 22:15 schrieb David Sommerseth: > On 17/07/2020 19:19, Matthias Andree wrote: >> Else one location overwrites options from the other. >> >> Signed-off-by: Matthias Andree <matthias.andree@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 <davids@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. Without digging too deeply, to me it seems that subdir-objects doesn't cope too well with the various places that code absolute source file paths into Makefile.am, and I am always testing out-of-source builds but figured that I received tons of .deps in the source directory even if the build directory was outside... so I'll leave subdir-objects rest for openvpn for now.
Your patch has been applied to the master branch.
commit 83d6da5097f79c698500f638ee3c54309b982e03
Author: Matthias Andree
Date: Fri Jul 17 19:19:18 2020 +0200
Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE.
Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20200717171918.230727-1-matthias.andree@gmx.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20462.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
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
Else one location overwrites options from the other. Signed-off-by: Matthias Andree <matthias.andree@gmx.de> --- Makefile.am | 3 --- configure.ac | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.25.4