From 0b8269e2d31a6aaabeae850b168cc990621dbbbd Mon Sep 17 00:00:00 2001 From: Arnaud Cornet Date: Sun, 9 Dec 2018 16:06:18 -0500 Subject: [PATCH] Fix the conditional build of tests again. Per [1], you always output the optional directory Makefile. [1] https://www.gnu.org/software/automake/manual/html_node/Subdirectories-with-AM_005fCONDITIONAL.html#Subdirectories-with-AM_005fCONDITIONAL --- configure.ac | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4409745..8344339 100644 --- a/configure.ac +++ b/configure.ac @@ -40,10 +40,7 @@ if test "$ap_cv_cc_pie" = "yes"; then enable_pie=yes fi -PKG_CHECK_MODULES([CHECK], [check >= 0.9.6], [ - AC_CONFIG_FILES([tests/Makefile]) - enable_tests=yes - ], [ enable_tests=no ]) +PKG_CHECK_MODULES([CHECK], [check >= 0.9.6], [enable_tests=yes], [enable_tests=no]) AM_CONDITIONAL([COND_WANT_TESTS], [test "$enable_tests" = yes]) AC_CHECK_FUNC(backtrace_symbols_fd, [ @@ -53,7 +50,7 @@ AC_CHECK_FUNC(backtrace_symbols_fd, [ ]) -AC_CONFIG_FILES([Makefile src/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile]) AC_OUTPUT echo OPENSSL: $with_openssl