From patchwork Wed Feb 8 00:18:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 3060 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp4396736dyk; Tue, 7 Feb 2023 16:19:22 -0800 (PST) X-Google-Smtp-Source: AK7set/ZBl//bD9Uoe3T5sD0eJvJrMUj60f1+xw6bXH/wlBKdyM/D4z6dGsKYoqJzRA1WMqfhN7m X-Received: by 2002:aa7:9603:0:b0:593:6a2e:b96b with SMTP id q3-20020aa79603000000b005936a2eb96bmr5259028pfg.8.1675815562347; Tue, 07 Feb 2023 16:19:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675815562; cv=none; d=google.com; s=arc-20160816; b=DZrt+WDa2MYbpkFtiNvipIXAMlP4PEzLf7bapMXWlQn001ZPy7JmD7ZEiBVILj9+eZ dsMPEXbmF80et73dzfaQmQCsDEvhsDoTcQ7cmwzdWtTQb4pAiB9yZmF+dkoONDcXJuwI xk07ssp1Fu/DeXbilH6itgxwnqVxZE/FtQfkPB7Jsh8PkaicP2/i74ykcT/tEctiy3pN rrqfksQx/gpv/eRtue/s830jFqsZSodhnpLyGlL64Ry/xtJwyO6f4vMmv7vy69zpX/nv u7qBHz1LI4bYgtmYK/Ovkx6GbGVNzUlMN1rC9WUAFUs2sG2ZUVFeE04JMqSyNNUFWEJ3 E7zA== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=AOGuZrLYW6Jo80AoUZCTErOcpFrKpg1rvMGruRaJFjI=; b=AXf0SsHWYFsdxn6+LOFMvvpydVr+y2SXEb49gpdR4pnHgCJ4uTTBLcSLulpYC2Becv HybS/KYVISl/W761qkgo9TlSwshiQfLk/UnwJ1pxSqGOBCAzWkU3yC2QQPcdaxMuwunG Rfo5T8Q8tfy6K8RzvMvy3z1dOLLRSK/3mOoSShNHjz4sXhKVKmLkPrwqQ/3bY8m240Nm Bwm5hMxW1/rP6jgQIu9NUvDjJJ6d9Viq6vC7hkOF3h/DbCcsHsc8+wqn98gb2w1RCzIv /d+7mZE1QzKA7WVHFdeUKPZ0vVf0hI+R8/JaxoZ6hXC4pMUhVPuvbgifO6huR35n61Y/ vOfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=MTp6V2gG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=JE9xG6NR; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id c22-20020a621c16000000b005989f8de851si13312618pfc.149.2023.02.07.16.19.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Feb 2023 16:19:22 -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=MTp6V2gG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=JE9xG6NR; 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 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pPYAS-0008D8-CN; Wed, 08 Feb 2023 00:18:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pPYAQ-0008D2-G8 for openvpn-devel@lists.sourceforge.net; Wed, 08 Feb 2023 00:18:29 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=a0Numwa+XCL6xvo/hNFyDu+amPkruHOUm/RNdPmTT70=; b=MTp6V2gGU6cSW38+3YRNImvwgG /z6YTk++81ZJ8tLxFddJmkgN+r6fY0y2MTtOkZPAprks5aQLiz1vA3zKJTYM1VUPKqFlaEQq+pErW A68xNPAtaklZM7BxkG+3A4j8GdJU5962nzSM0GoKMe9GkvWr96M9Ppag018Iofr49zvo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=a0Numwa+XCL6xvo/hNFyDu+amPkruHOUm/RNdPmTT70=; b=JE9xG6NRsyl12kukmsSwCMdug2 5IsDn2mKswqOePMw8obGM8jEQ9iCf5JvIcdwll53wdU2hJzGJJ3Wdlkcg0q8XqFKUd7Vq8hJH2JJE jb0sWCW1rxpNJyyq0Rqn5hcJbBbHoaN6xmWvOW2+whH0PAIzMz/vPkw/j3PwZtv/+bYA=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pPYAN-00E953-94 for openvpn-devel@lists.sourceforge.net; Wed, 08 Feb 2023 00:18:29 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1pPYAF-000FIe-Uo; Wed, 08 Feb 2023 01:18:19 +0100 Received: (nullmailer pid 244743 invoked by uid 10006); Wed, 08 Feb 2023 00:18:19 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 8 Feb 2023 01:18:15 +0100 Message-Id: <20230208001819.244694-2-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230208001819.244694-1-arne@rfc2549.org> References: <20230208001819.244694-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Score: 0.3 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1pPYAN-00E953-94 Subject: [Openvpn-devel] [PATCH 1/5] 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?1757219979412959702?= X-GMAIL-MSGID: =?utf-8?q?1757219979412959702?= 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 Signed-off-by: Arne Schwabe --- configure.ac | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 915000870..95d795c33 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