| Message ID | 20190602101831.21216-1-steffan@karger.me |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] configure.ac: add lzo CFLAGS/LIBS to the test flags | expand |
Am 02.06.19 um 12:18 schrieb Steffan Karger: > This fixes "make check" builds on systems with lzo on a non-standard > location. Does what it says and does not break on my system. Acked-By: Arne Schwabe <arne@rfc2549.org>
Your patch has been applied to the master branch.
(Unfortunately, this sabotages my just-sent v2 of the cmocka cleanup
patch, so I'll send a v3 right away)
commit 7473f326366fbceb4094d43d3c21fa6d5d0782e6
Author: Steffan Karger
Date: Sun Jun 2 12:18:31 2019 +0200
configure.ac: add lzo CFLAGS/LIBS to the test flags
Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20190602101831.21216-1-steffan@karger.me>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18482.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
Hi, On Sun, Jun 23, 2019 at 08:22:32PM +0200, Gert Doering wrote: > commit 7473f326366fbceb4094d43d3c21fa6d5d0782e6 > Author: Steffan Karger > Date: Sun Jun 2 12:18:31 2019 +0200 > > configure.ac: add lzo CFLAGS/LIBS to the test flags > > Signed-off-by: Steffan Karger <steffan@karger.me> > Acked-by: David Sommerseth <davids@openvpn.net> Oops. Misattributed - the ACK was from Arne. Just for the sake of the archives, cannot change the already-pushed commit message. gert
diff --git a/configure.ac b/configure.ac index 59673e049..56598217f 100644 --- a/configure.ac +++ b/configure.ac @@ -1353,8 +1353,13 @@ AC_SUBST([sampledir]) AC_SUBST([systemdunitdir]) AC_SUBST([tmpfilesdir]) -TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS} -lcmocka -L\$(top_builddir)/vendor/dist/lib -Wl,-rpath,\$(top_builddir)/vendor/dist/lib" -TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_HELPER_CFLAGS} -I\$(top_srcdir)/include -I\$(top_builddir)/vendor/dist/include" +TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS}" +TEST_LDFLAGS="${TEST_LDFLAGS} ${OPTIONAL_LZO_LIBS}" +TEST_LDFLAGS="${TEST_LDFLAGS} -lcmocka -L\$(top_builddir)/vendor/dist/lib" +TEST_LDFLAGS="${TEST_LDFLAGS} -Wl,-rpath,\$(top_builddir)/vendor/dist/lib" +TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_HELPER_CFLAGS}" +TEST_CFLAGS="${TEST_CFLAGS} ${OPTIONAL_LZO_CFLAGS}" +TEST_CFLAGS="${TEST_CFLAGS} -I\$(top_srcdir)/include -I\$(top_builddir)/vendor/dist/include" AC_SUBST([TEST_LDFLAGS]) AC_SUBST([TEST_CFLAGS])
This fixes "make check" builds on systems with lzo on a non-standard location. Signed-off-by: Steffan Karger <steffan@karger.me> --- configure.ac | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)