Attention is currently required from: cron2, plaisthos.
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 (#7).
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.
Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693
Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com>
---
M config.h.cmake.in
M configure.ac
M src/openvpn/lzo.h
3 files changed, 22 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/56/556/7
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 <linux/types.h> header file. */
#cmakedefine HAVE_LINUX_TYPES_H
-/* Define to 1 if you have the <lzoconf.h> header file. */
-#define HAVE_LZO_CONF_H
-
/* Define to 1 if you have the <lzo1x.h> header file. */
#define HAVE_LZO1X_H 1
diff --git a/configure.ac b/configure.ac
index c01ad09..d7d1b18 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="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="yes"],
+ []
+ )
+
+ if test "${have_lzo}" != "yes"; then
+ # try to detect without pkg-config
+ have_lzo="yes"
AC_CHECK_LIB(
[lzo2],
[lzo1x_1_15_compress],
@@ -1156,6 +1165,10 @@
[have_lzo="no"]
)]
)
+ fi
+else
+ # assume the user configured it correctly
+ have_lzo="yes"
fi
if test "${have_lzo}" = "yes"; then
saved_CFLAGS="${CFLAGS}"
@@ -1166,8 +1179,10 @@
[AC_CHECK_HEADERS(
[lzo1x.h],
,
- [AC_MSG_ERROR([lzo1x.h is missing])]
- )]
+ [AC_MSG_ERROR([lzo1x.h is missing])],
+ [#include <lzodefs.h>
+ #include <lzoconf.h>]
+ )],
)
CFLAGS="${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 <lzo/lzo1x.h>
+#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 <lzodefs.h>
#include <lzoconf.h>
-#endif
-#if defined(HAVE_LZO_LZO1X_H)
-#include <lzo/lzo1x.h>
-#elif defined(HAVE_LZO1X_H)
#include <lzo1x.h>
#endif
--
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: 7
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: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: cron2 <g...@greenie.muc.de>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
