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>

diff --git a/configure.ac b/configure.ac
index 8ea9de8a700a3364305d74863c92c23d3ae24eae..4a45f057cad4e911bec5a1e239b564f221b66ca4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1298,10 +1298,10 @@ AC_CONFIG_FILES([
        src/plugins/down-root/Makefile
        tests/Makefile
         tests/unit_tests/Makefile
-        tests/unit_tests/plugins/Makefile
-        tests/unit_tests/plugins/auth-pam/Makefile
         tests/unit_tests/example_test/Makefile
         tests/unit_tests/openvpn/Makefile
+        tests/unit_tests/plugins/Makefile
+        tests/unit_tests/plugins/auth-pam/Makefile
         vendor/Makefile
        sample/Makefile
        doc/Makefile

diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am
index 44ab26bd82dfd2bf667ae407dcce5bf8bab22e8b..31d37b891b2f40d41aa9d18adf79b910b24c84db 100644 (file)
--- a/tests/unit_tests/Makefile.am
+++ b/tests/unit_tests/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
 
 if CMOCKA_INITIALIZED
-SUBDIRS = example_test plugins openvpn
+SUBDIRS = example_test openvpn plugins
 endif

diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/Makefile.am
index af7f12f192e67d68b2660c31a420e72ce3b9e1d7..b706faed02cb78f620a3e08ecc33ce49c1df731d 100644 (file)
--- a/tests/unit_tests/openvpn/Makefile.am
+++ b/tests/unit_tests/openvpn/Makefile.am
@@ -7,8 +7,10 @@ TESTS = $(check_PROGRAMS)
 openvpn_srcdir = $(top_srcdir)/src/openvpn
 compat_srcdir = $(top_srcdir)/src/compat
 
-argv_testdriver_CFLAGS  = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir)
-argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line
+argv_testdriver_CFLAGS  = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) \
+       $(OPTIONAL_CRYPTO_CFLAGS)
+argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line \
+       $(OPTIONAL_CRYPTO_LIBS)
 argv_testdriver_SOURCES = test_argv.c \
        $(openvpn_srcdir)/platform.c \
        $(openvpn_srcdir)/buffer.c \