From: "flichtenheld (Code Review)" Date: Wed, 26 Jun 2024 13:48:27 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, gert@...1296... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="2a+pBSbPHC8="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: configure: Try to detect LZO with pkg-config List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , cron2 Cc: openvpn-devel --2a+pBSbPHC8= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, plaisthos. Hello cron2, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/556?usp=3Demail to look at the new patch set (#8). The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: configure: Try to detect LZO with pkg-config ...................................................................... configure: Try to detect LZO with pkg-config On most systems this should work just fine. v2: - simplify code by removing -llzo special handling v3: - reintroduce support for autodetection without pkg-config, no need to break backwards compatibility right now v7: - Handle case correctly where lzo/lzo1x.h can not be included at all. On most distros this works even though the .pc file suggests to use it without. We had some partly solution for that but it wasn't really working. v8: - Handle systems that do not implicitly include limits.h in configure test builds. lzodefs.h usually relies on lzoconf.h to include it. Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693 Signed-off-by: Frank Lichtenheld --- M config.h.cmake.in M configure.ac M src/openvpn/lzo.h 3 files changed, 23 insertions(+), 12 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/56/556/8 diff --git a/config.h.cmake.in b/config.h.cmake.in index effca2a..720d679 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -178,9 +178,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LINUX_TYPES_H -/* Define to 1 if you have the header file. */ -#define HAVE_LZO_CONF_H - /* Define to 1 if you have the header file. */ #define HAVE_LZO1X_H 1 diff --git a/configure.ac b/configure.ac index c01ad09..555c97e 100644 --- a/configure.ac +++ b/configure.ac @@ -1143,8 +1143,17 @@ AC_ARG_VAR([LZO_CFLAGS], [C compiler flags for lzo]) AC_ARG_VAR([LZO_LIBS], [linker flags for lzo]) -have_lzo=3D"yes" -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], + [have_lzo=3D"yes"], + [] + ) + + if test "${have_lzo}" !=3D "yes"; then + # try to detect without pkg-config + have_lzo=3D"yes" AC_CHECK_LIB( [lzo2], [lzo1x_1_15_compress], @@ -1156,6 +1165,10 @@ [have_lzo=3D"no"] )] ) + fi +else + # assume the user configured it correctly + have_lzo=3D"yes" fi if test "${have_lzo}" =3D "yes"; then saved_CFLAGS=3D"${CFLAGS}" @@ -1166,8 +1179,11 @@ [AC_CHECK_HEADERS( [lzo1x.h], , - [AC_MSG_ERROR([lzo1x.h is missing])] - )] + [AC_MSG_ERROR([lzo1x.h is missing])], + [#include + #include + #include ] + )], ) CFLAGS=3D"${saved_CFLAGS}" fi diff --git a/src/openvpn/lzo.h b/src/openvpn/lzo.h index 62d73a1..c271527 100644 --- a/src/openvpn/lzo.h +++ b/src/openvpn/lzo.h @@ -37,17 +37,15 @@ * @addtogroup compression * @{ */ -#if defined(HAVE_LZO_CONF_H) +#if defined(HAVE_LZO_LZO1X_H) +#include +#elif defined(HAVE_LZO1X_H) /* The lzo.h magic gets confused and still wants * to include lzo/lzoconf.h even if our include paths * are setup to include the paths without lzo/ */ #include #include -#endif -#if defined(HAVE_LZO_LZO1X_H) -#include -#elif defined(HAVE_LZO1X_H) #include #endif -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/556?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693 Gerrit-Change-Number: 556 Gerrit-PatchSet: 8 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --2a+pBSbPHC8= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, flichtenheld, plaisthos. <= /p>

flichtenheld uploaded patch set #8 to this change.

<= p>View Ch= ange

The following approvals got outdated and were removed: Code-Review+2 by cron2

configure: Try to detect LZO with pkg-config

= On most systems this should work just fine.

v2:
- simplify code = by removing -llzo special handling
v3:
- reintroduce support for aut= odetection without pkg-config,
no need to break backwards compatibili= ty right now
v7:
- Handle case correctly where lzo/lzo1x.h can not b= e included
at all. On most distros this works even though the .pc
= file suggests to use it without. We had some partly
solution for t= hat but it wasn't really working.
v8:
- Handle systems that do n= ot implicitly include limits.h
in configure test builds.
lzodef= s.h usually relies on lzoconf.h to include it.

Change-Id: I1c038dc4e= c80d3499582d81eee61fee74f26e693
Signed-off-by: Frank Lichtenheld <fra= nk@...2641...>
---
M config.h.cmake.in
M configure.ac
M src/= openvpn/lzo.h
3 files changed, 23 insertions(+), 12 deletions(-)

=
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/56/556/8
=
diff --git a/config.h.cmake.in b/config.h.cmake.in
in= dex effca2a..720d679 100644
--- a/config.h.cmake.in<= br>+++ b/config.h.cmake.in
@@ -178,9 +178,6 @@=
/* Define to 1 if you have the <linux/types.h> header file= . */
#cmakedefine HAVE_LINUX_TYPES_H

-/* Define to 1 if you hav= e the <lzoconf.h> header file. */
-#define HAVE_LZO_CONF_H
-
/* Define to 1 if you have the <lz= o1x.h> header file. */
#define HAVE_LZO1X_H 1
diff --git a/configure.ac b/configure.acindex c01ad09..555c97e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1143,8 +1143,17 @@

AC_ARG_VAR([LZO_CFLAGS], [C compiler flags f= or lzo])
AC_ARG_VAR([LZO_LIBS], [linker flags for lzo])
-have_lzo=3D"yes&quo= t;
-if test -z "${= LZO_LIBS}"; then
+if test -z "${LZO_CFLAGS}" -a -z "${LZO_LIBS}"; then<= /span>
+ # if the user di= d not explicitly specify flags, try to autodetect
+ PKG_CHECK_MODULES([LZO],
+ [lzo2],
+ [have_lzo=3D"yes"],
+ []

+ )
+
+ if = test "${have_lzo}" !=3D "yes"; then
+ # try to detect without pkg-config
+ have_lzo=3D"yes&q= uot;
AC_CHECK_LIB(
[lzo2],
<= span> [lzo1x_1_15_compress],

@@ -1156,6 +1165,10 @@
[have_lzo=3D"no"]
)]
= )
+ fi
+else
+ # assume the user configured it co= rrectly
+ have_lzo= =3D"yes"
fi
if test "${hav= e_lzo}" =3D "yes"; then
saved_CFLAGS=3D&qu= ot;${CFLAGS}"
@@ -1166,8 +1179,11 @@
= [AC_CHECK_HEADERS(
[lzo1x.h],
,
- [AC_MSG_ERROR([lzo1x= .h is missing])]
- )]<= /span>
+ [AC_MSG_ERROR([lz= o1x.h is missing])],
= + [#include <limits.h>
+ #include <lzo= defs.h>
+ = #include <lzoconf.h>]
+ )],
)
CFLAGS= =3D"${saved_CFLAGS}"
fi
diff --g= it a/src/openvpn/lzo.h b/src/openvpn/lzo.h
index 62d73a1..c= 271527 100644
--- a/src/openvpn/lzo.h
+++ b= /src/openvpn/lzo.h
@@ -37,17 +37,15 @@
* = @addtogroup compression
* @{
*/<= br>-#if defined(HAVE_LZO_CONF_H)<= /span>
+#if defined(HAVE_LZO= _LZO1X_H)
+#include &= lt;lzo/lzo1x.h>
+#= elif defined(HAVE_LZO1X_H)
/* The lzo.h magic gets confuse= d and still wants
* to include lzo/lzoconf.h even if our = include paths
* are setup to include the paths without lz= o/
*/
#include <lzodefs.h><= br> #include <lzoconf.h>
-#endif
-= #if defined(HAVE_LZO_LZO1X_H)
-#include <lzo/lzo1x.h>
-#elif defined(HAVE_LZO1X_H)
#include <lz= o1x.h>
#endif

=

To view, visit change 556. To unsubscribe, or for help writing mail= filters, visit settings= .

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1c038dc4ec80d3499582d81eee6= 1fee74f26e693
Gerrit-Change-Number: 556
Gerrit-PatchSet: 8
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--2a+pBSbPHC8=--