From patchwork Sat Feb 4 00:45:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 3046 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp1545502dyk; Fri, 3 Feb 2023 16:45:46 -0800 (PST) X-Google-Smtp-Source: AK7set9lRmHGAI42QDzOZ3MoCx2DOpciI5Z6XHMj+LpAz/708G2tCRWdYw8NkcouHAKiKMoZQcAi X-Received: by 2002:a17:902:f355:b0:196:8cd2:15b1 with SMTP id q21-20020a170902f35500b001968cd215b1mr9411430ple.37.1675471546284; Fri, 03 Feb 2023 16:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675471546; cv=none; d=google.com; s=arc-20160816; b=J2W8uiWKyENT6uBKQyvTtVVAI7M9AkAe+bARnI8Y4iYQUgQaRdAi4mwWSdn/FoOQoA Oz7azEmyEAYC0X2aGeyzGHsJSOjZaAgvinDZWXg2NRTKoHBcV8hRdRoCEuTPhFAl0jHi JGFtr4dI6mVsxmM3i0Djof0Xbq1dy/AMdbq5HqSdIdu36zMzZ4i0XTRYt0xVqIqP0TGM MtkcrJ/9FeiDhkpahtB5Zp05MnNQxI9bd+owd2TWYc0in5SZVmTVSXpskjZu5FmYZZAD WQ8qyFh566t33Gnwp0u+CGf2gVfAkWVkrjVzx03Fv5yWyan9TdXMXNvBu6i9WpRNNgt1 Kfyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=Iz08y+sTVtPsuhEm/Oux3Fx/BmHl4Q61I3wFRvpIY0g=; b=fgF7fJO4BaTUbffReMve7kNkl6UTcTRlWs2a91DdzZA8YZWgsxtAk5NEqSjn7TvZdV x7EMej9xLO03BCmsYghIP5mtC2pO0Ujns3Toz1wi9KIAA7XOsQoyHNMEkDeYwSQIkEQw RKAWscdtOMoChUb4Ia+qvxb/unuD6ofdKqTVqc2vFGY8ANVmvPoCrHKgs9fPidYSqGP0 jb0wAqq1yw20QSsL2dlVwDEki6mY7+qbbsJ/7+R8sg8SKjIyth+q8mRUP7jPUHMMTQ6i OtpmDg5cgtydU3jCZIpu2VELNlwfZRS/nuBr7XbjXbvtaWlNjEOa/cvPZwrCuCIZiX4K BRcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=nKQP+cOV; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=R8tsiJwa; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mBiq6c0C; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id d10-20020a056a00198a00b0058de2a3162esi4959897pfl.273.2023.02.03.16.45.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2023 16:45:46 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=nKQP+cOV; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=R8tsiJwa; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mBiq6c0C; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pO6gH-0007z6-UJ; Sat, 04 Feb 2023 00:45:25 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pO6gG-0007yz-UB for openvpn-devel@lists.sourceforge.net; Sat, 04 Feb 2023 00:45:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6A6kd/QkkSX9CvHfLkpNqmxA08k6LLAWbGAPkD4UkQE=; b=nKQP+cOVbRh9TNlQubDVl2FIOt H8TQSACd0qGF1n6E73zlnxJpVVtDDuUtIXfSHtXO+bygTRGhvfwAHacZEE+VERm/dkFk2PMDhrBxB Uqsa9M768ZW534AaVEnwIrsJJ+mvLxFD5gi3nD68H+Z1w0JW668Zy6QMd81YaHXkkEUU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=6A6kd/QkkSX9CvHfLkpNqmxA08k6LLAWbGAPkD4UkQE=; b=R 8tsiJwaqidl2OEtIUAeA4pwjG6SMgjNquasZHgmsfOmdXxSH4YSUvt9zIekZk4b6VTbMVS2jfU6cA XuKH3vodbdquXd5lv6MLyc2tlPIk9YCm82jZyP0F4cNfrVea+/vGyem6n4AsES9dtE0NOpEQh/krD 64gahHCEYlmZM1mw=; Received: from mail-il1-f173.google.com ([209.85.166.173]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pO6gF-00Afcu-Gl for openvpn-devel@lists.sourceforge.net; Sat, 04 Feb 2023 00:45:24 +0000 Received: by mail-il1-f173.google.com with SMTP id k12so2774240ilv.10 for ; Fri, 03 Feb 2023 16:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6A6kd/QkkSX9CvHfLkpNqmxA08k6LLAWbGAPkD4UkQE=; b=mBiq6c0CarlgzB6p5Ilh/xA/QTOiwLMPmeVNaiefyQrRDnZfBClxXx+f0qdodeiX12 xTWp7YmCWI6LM2JH0PvuIg579YKbAQxfolJFt8u1KyWHb5780xNqDGwsk7EJilXmnclW 6H3DAQpO3njDyt40zYh96M7QOqG+CId4NfvMoDB4czlvTKgNciw5oiqXKjB1ZQzuEGrx IvXbv8OwgWIFg7u0vFNpFwNWDAJCuBFJsrTvu8PzZC82yWQ/kPH1x4HDMOFpfkNGWxnx Lgz3DfmJ1AbtayoH1ABKgqwxmAh4sjIAAJB6jRajpvNejPXv+FlL4lsGAAH0qlUAy0SN Ze5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6A6kd/QkkSX9CvHfLkpNqmxA08k6LLAWbGAPkD4UkQE=; b=o2jQUF5q2z8NugjglkURK/lvjsmR5DcE0x56U5kfdYCgNUK6w8sQZquCbD+OKKBqd6 8hRg23v0rQQjLVRzjdzxuRBAVnAB/yfmQDGjaFUn6mrWIfb/krT8es2Zdd4aWOADa0VV An+3pPDCCPi5wHsqPwJaXNIidmucSZ56Izc3AiLIdEg328E/fjCzZNEO7KhypZIM9eXI Rip/cjbPTBQm1BgjAMf/KzG2C3ARnUIBrehSFuSpRp4HCkgPI/SVJmkXyaaOW6fPifn2 Opzf/zIVQYv2av0PaRATrBhPU+quCjAjwOFll8dS5q+qBCfAoQmSnVk/h8GtJ4am5EwV dK+w== X-Gm-Message-State: AO0yUKWHn/kDI67GLE+oXK9ug8FjenZdVyKsxLiOcr+Ghty5bz3ik8g7 ksbnfk3WCpwMGI8PxzyRAF70SRUZMP0= X-Received: by 2002:a05:6e02:1746:b0:30d:bf1a:b174 with SMTP id y6-20020a056e02174600b0030dbf1ab174mr10112350ill.1.1675471517654; Fri, 03 Feb 2023 16:45:17 -0800 (PST) Received: from uranus.sansel.ca (bras-vprn-tnhlon4053w-lp130-01-70-51-222-66.dsl.bell.ca. [70.51.222.66]) by smtp.gmail.com with ESMTPSA id l3-20020a056e021c0300b0031109a23893sm1222745ilh.23.2023.02.03.16.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 16:45:17 -0800 (PST) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Fri, 3 Feb 2023 19:45:10 -0500 Message-Id: <20230204004512.250271-1-selva.nair@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Selva Nair - Eliminates repeated warnings such as warning: source file '$(openvpn_srcdir)/env_set.c' is in a subdirectory, but option 'subdir-objects' is disabled - Enabled only for automake >= 1.16 as older ver [...] Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [selva.nair[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.166.173 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.173 listed in wl.mailspike.net] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1pO6gF-00Afcu-Gl Subject: [Openvpn-devel] [PATCH 1/3] Conditionally add subdir-objects option to automake X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1756859251887118167?= X-GMAIL-MSGID: =?utf-8?q?1756859251887118167?= From: Selva Nair - Eliminates repeated warnings such as warning: source file '$(openvpn_srcdir)/env_set.c' is in a subdirectory, but option 'subdir-objects' is disabled - Enabled only for automake >= 1.16 as older versions have a buggy implementation of this option Main side effect of this option is that object files like openvpnserv-blockdns.o are now created in src/openvpn where block-dns.c resides instead of in src/openvpnserv. Same for object files for sources from $(openvpn_srcdir) compiled into test executables. See also past discussion on this topic: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg00013.html Signed-off-by: Selva Nair Acked-By: Arne Schwabe --- configure.ac | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 91500087..95d795c3 100644 --- a/configure.ac +++ b/configure.ac @@ -54,9 +54,22 @@ m4_define([serial_tests], [ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' ]) ]) + +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 serial_tests 1.9) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(foreign serial_tests subdir_objects 1.9) dnl NB: Do not [quote] this parameter. AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS