From: Frank Lichtenheld <[email protected]> Removes some ugly compat code. automake 1.16 is in EOL distros like Ubuntu 20.04 and Debian 11, so this should be fine on all our current distros.
Change-Id: Ib92282b5a4c3c8da7b5818d3ce78e91660a13cbf Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Razvan Cojocaru <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2024 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2024 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Razvan Cojocaru <[email protected]> diff --git a/configure.ac b/configure.ac index e83aba7..52b0d20 100644 --- a/configure.ac +++ b/configure.ac @@ -40,21 +40,9 @@ AC_CONFIG_SRCDIR([src/openvpn/syshead.h]) AC_CONFIG_MACRO_DIR([m4]) -dnl Automake 1.14+ warns if sources are in sub-directories but subdir-objects -dnl options is not enabled. However, automake before 1.15a has a bug that causes -dnl variable expansion to fail in foo_SOURCES when this option is used. -dnl As most of our build systems are now likely to use automake 1.16+ add a -dnl work around to conditionally add subdir-objects option. -m4_define([subdir_objects], [ - m4_esyscmd([automake --version | - head -1 | - awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 16) { print "subdir-objects" }}' - ]) -]) - # This foreign option prevents autoreconf from overriding our COPYING and # INSTALL targets: -AM_INIT_AUTOMAKE(foreign subdir_objects 1.9) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(foreign subdir-objects 1.16) dnl NB: Do not [quote] this parameter. AM_SILENT_RULES([yes]) AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
