Browse code

lz4: Fix broken builds when pkg-config is not present but system library is

In commit f91e4863bc1382 we fixed an issue where LZ4_LIBS could be
overwritten in some situations. But on systems where lz4 is installed on
the system but is lacking pkg-config information, the linker will not know
about the lz4 library when completing the build.

This fixes the issue by explicitly setting LZ4_LIBS to contain -llz4
if pkg-config test was run and failed verifying the installed lz4 version
number. This also ensures that LZ4_LIBS will not be overwritten if it
has been provided on the ./configure command line.

Signed-off-by: David Sommerseth <davids@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20171002190732.12531-1-davids@openvpn.net>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15549.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit e5b279f1b62e75569ee8d988b55e6ee0dc93464e)

David Sommerseth authored on 2017/10/03 04:07:32
Showing 1 changed files
... ...
@@ -1073,7 +1073,9 @@ if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then
1073 1073
 	PKG_CHECK_MODULES([LZ4],
1074 1074
 			  [liblz4 >= 1.7.1 liblz4 < 100],
1075 1075
 			  [have_lz4="yes"],
1076
-			  [] # If this fails, we will do another test next
1076
+			  [LZ4_LIBS="-llz4"] # If this fails, we will do another test next.
1077
+					     # We also add set LZ4_LIBS otherwise the
1078
+					     # linker will not know about the lz4 library
1077 1079
 	)
1078 1080
     fi
1079 1081