Browse code
Make argv unit tests obey {MBEDTLS, OPENSSL}_{LIBS, CFLAGS}
Fixes builds that use MBEDTLS_CFLAGS and friends to tell the build where
the header files and libraries are. Also alphabetically orders some of
the listed files in relates Makefile.am files.
Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1479152603-5103-1-git-send-email-steffan@karger.me>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13050.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Steffan Karger authored on 2016/11/15 04:43:23Showing 3 changed files
| ... | ... |
@@ -1298,10 +1298,10 @@ AC_CONFIG_FILES([ |
| 1298 | 1298 |
src/plugins/down-root/Makefile |
| 1299 | 1299 |
tests/Makefile |
| 1300 | 1300 |
tests/unit_tests/Makefile |
| 1301 |
- tests/unit_tests/plugins/Makefile |
|
| 1302 |
- tests/unit_tests/plugins/auth-pam/Makefile |
|
| 1303 | 1301 |
tests/unit_tests/example_test/Makefile |
| 1304 | 1302 |
tests/unit_tests/openvpn/Makefile |
| 1303 |
+ tests/unit_tests/plugins/Makefile |
|
| 1304 |
+ tests/unit_tests/plugins/auth-pam/Makefile |
|
| 1305 | 1305 |
vendor/Makefile |
| 1306 | 1306 |
sample/Makefile |
| 1307 | 1307 |
doc/Makefile |
| ... | ... |
@@ -7,8 +7,10 @@ TESTS = $(check_PROGRAMS) |
| 7 | 7 |
openvpn_srcdir = $(top_srcdir)/src/openvpn |
| 8 | 8 |
compat_srcdir = $(top_srcdir)/src/compat |
| 9 | 9 |
|
| 10 |
-argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) |
|
| 11 |
-argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line |
|
| 10 |
+argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) \ |
|
| 11 |
+ $(OPTIONAL_CRYPTO_CFLAGS) |
|
| 12 |
+argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line \ |
|
| 13 |
+ $(OPTIONAL_CRYPTO_LIBS) |
|
| 12 | 14 |
argv_testdriver_SOURCES = test_argv.c \ |
| 13 | 15 |
$(openvpn_srcdir)/platform.c \ |
| 14 | 16 |
$(openvpn_srcdir)/buffer.c \ |