Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE.
PATCH 1/1 Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE.
Else one location overwrites options from the other.
--- Makefile.am | 3 --- configure.ac | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-)
Makefile.am +0 -3
@@ -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 = \
configure.ac +5 -1
@@ -54,10 +54,14 @@ 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 +LT_INIT() + AC_ARG_ENABLE( [lzo], [AS_HELP_STRING([--disable-lzo], [disable LZO compression support @<:@default=yes@:>@])],
--
2.25.4
PATCH 1/1 Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE.
Else one location overwrites options from the other.
--- Makefile.am | 3 --- configure.ac | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-)
Makefile.am +0 -3
@@ -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 = \
configure.ac +3 -1
@@ -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
--
2.25.4
Quoted 27 lines · Matthias Andree
Else one location overwrites options from the other.
Signed-off-by Matthias Andree <[email protected]...>--- Makefile.am | 3 --- configure.ac | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-)Makefile.am +0
-3@@ -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 = \configure.ac +0
-0
configure.ac m4_define([serial_tests], [ · line 62
Quoted 10 lines
configure.ac +3
-1@@ -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
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.
Signature · 4 lines
kind regards, David Sommerseth OpenVPN Inc
Am 17.07.20 um 22:15 schrieb David Sommerseth:
Quoted 40 lines · Matthias Andree
Quoted 27 lines
Else one location overwrites options from the other.
Signed-off-by Matthias Andree <[email protected]...>--- Makefile.am | 3 --- configure.ac | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-)Makefile.am +0
-3@@ -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 = \configure.ac +0
-0configure.ac m4_define([serial_tests], [ · line 62
Quoted 10 lines
configure.ac +3
-1@@ -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
Quoted 5 lines
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 <[email protected]...>
Acked-by: David Sommerseth <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg20462.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Am 17.07.20 um 19:09 schrieb Matthias Andree:
configure.ac m4_define([serial_tests], [ · line 64
Quoted 2 lines
configure.ac +2
-0+LT_INIT() +
This guy escaped, so NAK on the first version of the patch.