Attention is currently required from: flichtenheld.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/556?usp=email
to look at the new patch set (#3).
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.
Also remove the handling to autodetect -llzo. This
seems to be very uncommon now (we do not have examples
of it in our build farm). If you have a system that
needs -llzo just specify LZO_LIBS or configure pkg-config
correctly.
v2:
- simplify code by removing -llzo special handling
Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693
Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com>
---
M configure.ac
1 file changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/56/556/3
diff --git a/configure.ac b/configure.ac
index ce8b2b0..e5c11da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1143,19 +1143,16 @@
AC_ARG_VAR([LZO_CFLAGS], [C compiler flags for lzo])
AC_ARG_VAR([LZO_LIBS], [linker flags for lzo])
-have_lzo="yes"
-if test -z "${LZO_LIBS}"; then
- AC_CHECK_LIB(
+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],
- [lzo1x_1_15_compress],
- [LZO_LIBS="-llzo2"],
- [AC_CHECK_LIB(
- [lzo],
- [lzo1x_1_15_compress],
- [LZO_LIBS="-llzo"],
- [have_lzo="no"]
- )]
- )
+ [have_lzo="yes"],
+ [have_lzo="no"]
+ )
+else
+ # assume the user configured it correctly
+ have_lzo="yes"
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: 3
Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: cron2 <g...@greenie.muc.de>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
