From patchwork Mon Apr 22 15:43:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3687 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6bca:b0:576:af48:25c3 with SMTP id c10csp53324max; Mon, 22 Apr 2024 08:44:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXApUby6RQyJfH8DVBn68a2EZyHyI+hupXoIacE6BxUrCxbxtN4MH00VsbWxjjIvLzJlH08mgHGoGKMM947XaTvDvxvaho= X-Google-Smtp-Source: AGHT+IE8PT0qpYfoXxg9NWFB/rUERuvL0FVrQRgT2SV/+SNzQ3vVoPfKlJoS7EY62meE+IxfXguv X-Received: by 2002:a17:90a:a093:b0:2a5:3f1f:a1d1 with SMTP id r19-20020a17090aa09300b002a53f1fa1d1mr10289105pjp.0.1713800674231; Mon, 22 Apr 2024 08:44:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713800674; cv=none; d=google.com; s=arc-20160816; b=jh7QjecoHeGy209QXFaVUgmLaYwZzp8X1m3b5xURn74vklzYnimCIywsTkiEYGFE2P sQn/gBftLkJxw2mncop/k4hTZqQG/NgM03QsKCjwB3hqElUAPBDvNHguhj74lLk8Ubcn KQxeqEY9TpYM3kJYY63L5RSHBfRfqoSpWOoeEBvywrytjJWLVdvBSAvZ9xitlErlW50c Kp0RhyBFOoYn/oWZxYBk96KL2QDwjPmbjCUyzExURV51PhrekCgSmn4c4+Oogzm1CxcI V6K1tL/t5kJFya7/5WuJycG/XMHEzsh+kKRxC5QqFPRxgo6yduH9zeBJ+KDvNTEiomIl voew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=YNPWt9R6n9K29kmuWNd16HmNE0duKCt97fwNK7Pub+8=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=VdUvEXCoK09PfL7yQwL7SuTy+qwWVMzCThp8rzIY2afjx9n6aSsti9I288tTGjXykG 0wmIooIYW0I8W8ALf29fFJU+3UZ1NRhvXpMObxLrMSEoeuCSK6bzLTVkVqTE1HVU72XU ocbiOT8n3amTmz7lgto8z6hg9CUHrcFOhKkXBovbbDWF7X4nvVYmNl72Na4RbQO05SRj 3Mt44f17zIMsdZS8VkC+5lrgh8ef91E9g+0oyxMOM4nCa/WRairYzlpVXbVtJOASguLW FZVzgXVnRbkpkSqEIi3MPEKd0KkpKrkR6YbbjE6Rkgq9uGVmlnkTsyOWDN4WeZVqAXTV 75/g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=m046VqRC; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Ds4ESOwN; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=KaHFe++Y; 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=NONE dis=NONE) header.from=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id g2-20020a6544c2000000b005dcbb6b4bffsi8152970pgs.335.2024.04.22.08.44.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Apr 2024 08:44:34 -0700 (PDT) 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=m046VqRC; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Ds4ESOwN; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=KaHFe++Y; 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=NONE dis=NONE) header.from=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1ryvpt-0007Ts-Or; Mon, 22 Apr 2024 15:44:06 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1ryvps-0007Ti-TB for openvpn-devel@lists.sourceforge.net; Mon, 22 Apr 2024 15:44:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BYHzPJZV1H/R/2lYAmlRRXGBdZ/p/Z7qm0BOMuinuh0=; b=m046VqRC3K9+BaKfCzNdI+eQb4 LAf1We6AZKRtpNkFCrzZg1stLLrppnyVcPCJIlrzRAVIkQ6PMvO+4+Sw3NFrY5EGDIjDxUkMUyjkE x1juATRTXz2RvHnJRnEdx32F9j8AnaTxsP4xbIKamtLeE/HSPY6Y/ncgvKOXrJqt5wgY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=BYHzPJZV1H/R/2lYAmlRRXGBdZ/p/Z7qm0BOMuinuh0=; b=D s4ESOwNIdUzu5qsDg5AEkKc5BWiChbPFkP6RLArHY7OCtBL8uOC7sxCVQ3ZQJOIZki/hongr5sOs6 ZrhK1GtobW0g7kcmXrPljiULITt42KgZ8zn5udcpamz0YDZC9TgRWAzqqhKyH82kBS68XEEyCt/vR V03h6m985XWJWLPQ=; Received: from mail-wm1-f50.google.com ([209.85.128.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1ryvps-0005QH-6p for openvpn-devel@lists.sourceforge.net; Mon, 22 Apr 2024 15:44:05 +0000 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4155819f710so37848905e9.2 for ; Mon, 22 Apr 2024 08:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1713800633; x=1714405433; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=BYHzPJZV1H/R/2lYAmlRRXGBdZ/p/Z7qm0BOMuinuh0=; b=KaHFe++YAZIH5aan8nT6CV94n8+QH+m68dbGryjHXK1MI7XJn4HsCULJIT63tEp7QE r+aQ6/mFym4Fr6xuMF7ZC0dtXuap88e/F5JzmBb7YypNVh7YAQondKXu99aAonGTj+IY JtWrGEkuQRgxbTkTgSrHWwakJbXdMSp5xOyRlpzdF5ZeYAN+7t0vxkb9NEA+YZHz0C3B LpWNQoP9U1bcyjZJ/7uUUQiulZxyep8EwvZ+tpoLvwkIAcxkbaKu8LpJd4VhAqXXeFFf Y6seOhkSGWqa51IlTFbk91o6XogfuOuyFKhY7mafZjUeo6JMAkAlzJkRKZ7QSHNELEnO DoHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713800633; x=1714405433; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BYHzPJZV1H/R/2lYAmlRRXGBdZ/p/Z7qm0BOMuinuh0=; b=CuM0e0I3zxY/jdoK0yD4K2OGHh0glPEN08iENMKw7s87/jiRSRVVdO747IfXjY/mt4 b4Rt/xhagsltVd5eZJJzM5WNddxcI7jgDIn3iTmXoBygECKHaS6WUPfJ5B7uLg1nLUJH C7l+Q4kpDxroXP9+g0HA2turQD+dS7+WllTOcF+1ze8PtPOBpJoGezmhMMFQgRYnzpTS wDoKQojJMZP4nXr4AlitkCXi0pD67+7/b05RubapMBy8tDOxm0waUtIfNZCcl8QVNsDM yGnBZPkLNRDHIPGbe75vQ+4v0KYTpk+OAxUjKGnR4ESus8Qy+GPBAA0XpPVsH1bF2T9F zDPA== X-Gm-Message-State: AOJu0YxSH47UTc48Iosu6Q5OMdg0EZd2/ec8ZoA8f1MIdTjfd2r7RfOT 6fyQsmbcPzCo3P1vvLbkKH2KJ7dWVe9J6/JRnRQmF4KS/MRQM5OjLC+TJaIIoQhlVHu5un0rrgz q X-Received: by 2002:a05:600c:3549:b0:419:87ab:f6db with SMTP id i9-20020a05600c354900b0041987abf6dbmr7764446wmq.23.1713800632920; Mon, 22 Apr 2024 08:43:52 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id h14-20020a05600c314e00b0041a81cd9e94sm2108978wmo.13.2024.04.22.08.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 08:43:52 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Mon, 22 Apr 2024 15:43:51 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693 X-Gerrit-Change-Number: 556 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: a7738cfe70c0ddefac77ed219db6b3c6a910c13c References: Message-ID: <7bb7024258ddc0adf342620e9bafebd19d0ea135-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) 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: Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: configure.ac] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.50 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message 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 -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.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1ryvps-0005QH-6p Subject: [Openvpn-devel] [S] Change in openvpn[master]: configure: Try to detect LZO with pkg-config first 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: , Reply-To: frank@lichtenheld.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1797050255354877001?= X-GMAIL-MSGID: =?utf-8?q?1797050255354877001?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/556?usp=email to review the following change. Change subject: configure: Try to detect LZO with pkg-config first ...................................................................... configure: Try to detect LZO with pkg-config first On most systems this should work just fine. Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693 Signed-off-by: Frank Lichtenheld --- M configure.ac 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/56/556/1 diff --git a/configure.ac b/configure.ac index ce8b2b0..159d47c 100644 --- a/configure.ac +++ b/configure.ac @@ -1143,8 +1143,18 @@ AC_ARG_VAR([LZO_CFLAGS], [C compiler flags for lzo]) AC_ARG_VAR([LZO_LIBS], [linker flags for lzo]) -have_lzo="yes" +have_lzo="no" if test -z "${LZO_LIBS}"; then + if test -z "${LZO_CFLAGS}" -a -z "${LZO_LIBS}"; then + # if the user did not explicitly specify flags, try to autodetect + PKG_CHECK_MODULES([LZO], + [lzo2], + [AC_CHECK_LIB([lzo2], [lzo1x_1_15_compress], [have_lzo="yes"], [LZO_CFLAGS="" LZO_LIBS=""])] + [] + ) + fi + if test "${have_lzo}" = "no"; then + have_lzo="yes" AC_CHECK_LIB( [lzo2], [lzo1x_1_15_compress], @@ -1156,6 +1166,7 @@ [have_lzo="no"] )] ) + fi fi if test "${have_lzo}" = "yes"; then saved_CFLAGS="${CFLAGS}"