From: Matthias Andree Date: Fri, 17 Jul 2020 17:19:18 +0000 (+0200) Subject: Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE. X-Git-Tag: v2.5_beta1~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83d6da5097f79c698500f638ee3c54309b982e03;p=thirdparty%2Fopenvpn.git Merge Makefile.am's AUTOMAKE_OPTIONS into configure.ac's AM_INIT_AUTOMAKE. Else one location overwrites options from the other. Signed-off-by: Matthias Andree Acked-by: David Sommerseth 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 --- diff --git a/Makefile.am b/Makefile.am index 439120e41..d1c10fc57 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 451488926..8ed83bc22 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