diff options
| author | Matthias Andree | 2020-07-17 19:19:18 +0200 |
|---|---|---|
| committer | Gert Doering | 2020-07-17 23:10:31 +0200 |
| commit | 83d6da5097f79c698500f638ee3c54309b982e03 (patch) | |
| tree | 81ad5eb045ac010c75a2d718f214afde5190780c | |
| parent | dfb40edc4acae5f17b0062ecb13ad1fa760ed529 (diff) | |
| download | openvpn-83d6da5097f79c698500f638ee3c54309b982e03.zip openvpn-83d6da5097f79c698500f638ee3c54309b982e03.tar.gz | |
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 <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>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 439120e..d1c10fc 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 4514889..8ed83bc 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 |