| Message ID | 20190411074519.9982-2-chipitsine@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | fix unit tests build when LZO installed to custom folder | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> Tested on FreeBSD 12, fixes the problem. Thanks. (For the record, this needs a setup where *lzo* needs extra -L/-I flags, but OpenSSL does *not*. If you have your local OpenSSL in the same place as your local lzo, the "OpenSSL cflags" will bring in all the build needs, so I had a bit of trouble to figure this out) Your patch has been applied to the master branch. commit aa830e1217ddce8fdcf9995a13a8907124508e36 Author: Ilya Shipitsin Date: Thu Apr 11 12:45:19 2019 +0500 configure.ac: fix compile-time error in argv_testdriver Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20190411074519.9982-2-chipitsine@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18357.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/configure.ac b/configure.ac index dfb268ca..bcc74c32 100644 --- a/configure.ac +++ b/configure.ac @@ -1360,8 +1360,8 @@ AC_SUBST([VENDOR_SRC_ROOT]) AC_SUBST([VENDOR_BUILD_ROOT]) AC_SUBST([VENDOR_DIST_ROOT]) -TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib" -TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include" +TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} ${OPTIONAL_LZO_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib" +TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} ${OPTIONAL_LZO_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include" AC_SUBST([TEST_LDFLAGS]) AC_SUBST([TEST_CFLAGS])
From: Ilya Shipitsin <chipitsine@gmail.com> allow run tests when lzo is installed to non default directory --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)