diff mbox series

[Openvpn-devel,v1] configure: Require automake 1.16

Message ID 20261020131943.24892-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] configure: Require automake 1.16 |

Commit Message

Gert Doering Oct. 20, 2026, 1:19 p.m. UTC 
  From: Frank Lichtenheld <frank@lichtenheld.com>

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 <frank@lichtenheld.com>
Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
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 <razvanc@mailbox.org>

Comments

Gert Doering Oct. 20, 2026, 2:57 p.m. UTC | #1 
This makes sense, and even our older or even EOLed buildbots ("NetBSD 8.1",
"FreeBSD 13", "OpenSolaris") can handle this just fine.

mail-archive.org is having issues again, so linking to lore.kernel.org
instead.

Your patch has been applied to the master and release/2.7 branch.

commit b50d336d00c93853ad542702516c1e0b99149fde (master)
commit 52ca8f2c38a9b551aac7f472722275a14e797c6c (release/2.7)
Author: Frank Lichtenheld
Date:   Tue Oct 20 15:19:36 2026 +0200

     configure: Require automake 1.16

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2024
     Message-Id: <20261020131943.24892-1-gert@greenie.muc.de>
     URL: https://lore.kernel.org/openvpn-devel/20261020131943.24892-1-gert@greenie.muc.de/
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

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