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 <fr...@lichtenheld.com>
---
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}"
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/556?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693
Gerrit-Change-Number: 556
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
