Browse code
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>
Matthias Andree authored on 2020/07/18 02:19:18Showing 2 changed files
| ... | ... |
@@ -23,9 +23,6 @@ |
| 23 | 23 |
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
| 24 | 24 |
# |
| 25 | 25 |
|
| 26 |
-# This option prevents autoreconf from overriding our COPYING and |
|
| 27 |
-# INSTALL targets: |
|
| 28 |
-AUTOMAKE_OPTIONS = foreign 1.9 |
|
| 29 | 26 |
ACLOCAL_AMFLAGS = -I m4 |
| 30 | 27 |
|
| 31 | 28 |
MAINTAINERCLEANFILES = \ |
| ... | ... |
@@ -54,7 +54,9 @@ m4_define([serial_tests], [ |
| 54 | 54 |
awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
|
| 55 | 55 |
]) |
| 56 | 56 |
]) |
| 57 |
-AM_INIT_AUTOMAKE(foreign serial_tests) dnl NB: Do not [quote] this parameter. |
|
| 57 |
+# This foreign option prevents autoreconf from overriding our COPYING and |
|
| 58 |
+# INSTALL targets: |
|
| 59 |
+AM_INIT_AUTOMAKE(foreign serial_tests 1.9) dnl NB: Do not [quote] this parameter. |
|
| 58 | 60 |
AC_CANONICAL_HOST |
| 59 | 61 |
AC_USE_SYSTEM_EXTENSIONS |
| 60 | 62 |
|