[Openvpn-devel] Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE.

Message ID 20200717170942.227701-1-matthias.andree@gmx.de
State Rejected
Headers show
Series
  • [Openvpn-devel] Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE.
Related show

Commit Message

Matthias Andree July 17, 2020, 5:09 p.m.
Else one location overwrites options from the other.

Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
---
 Makefile.am  | 3 ---
 configure.ac | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

--
2.25.4

Comments

Matthias Andree July 17, 2020, 5:21 p.m. | #1
Am 17.07.20 um 19:09 schrieb Matthias Andree:
> +LT_INIT()
> +

This guy escaped, so NAK on the first version of the patch.

Patch

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..717b374a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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@:>@])],