diff options
| author | Brent Cook <busterb@gmail.com> | 2020-05-07 06:06:19 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-05-07 06:06:19 -0500 |
| commit | 049c874d76e2579e5b36d9700423ef18b8200348 (patch) | |
| tree | 84a8d6fd8ebbc6a8239115ac2af7cbcfde78db1f | |
| parent | 388676afe4b1a1155882dc5dd6c2cec221654e9e (diff) | |
| parent | 1553d87c6cbdc01a1b3ae028492561af3ac2aa59 (diff) | |
| download | portable-049c874d76e2579e5b36d9700423ef18b8200348.tar.gz portable-049c874d76e2579e5b36d9700423ef18b8200348.tar.bz2 portable-049c874d76e2579e5b36d9700423ef18b8200348.zip | |
Land #585, add option to disable tests to autoconf
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1cf0fc6..6499f07 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | SUBDIRS = crypto ssl tls include apps tests man | 1 | SUBDIRS = crypto ssl tls include apps man |
| 2 | if ENABLE_TESTS | ||
| 3 | SUBDIRS += tests | ||
| 4 | endif | ||
| 2 | ACLOCAL_AMFLAGS = -I m4 | 5 | ACLOCAL_AMFLAGS = -I m4 |
| 3 | 6 | ||
| 4 | pkgconfigdir = $(libdir)/pkgconfig | 7 | pkgconfigdir = $(libdir)/pkgconfig |
diff --git a/configure.ac b/configure.ac index e584113..888ca19 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -66,6 +66,15 @@ AC_ARG_ENABLE([extratests], | |||
| 66 | AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms])) | 66 | AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms])) |
| 67 | AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes]) | 67 | AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes]) |
| 68 | 68 | ||
| 69 | AC_ARG_ENABLE([tests], | ||
| 70 | [AS_HELP_STRING([--disable-tests], [Disable tests @<:@default=enabled@:>@])], | ||
| 71 | [ | ||
| 72 | if ! test "x${enable_tests}" = "xyes"; then | ||
| 73 | enable_tests="no" | ||
| 74 | fi], | ||
| 75 | [enable_tests="yes"]) | ||
| 76 | AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes]) | ||
| 77 | |||
| 69 | # Add CPU-specific alignment flags | 78 | # Add CPU-specific alignment flags |
| 70 | old_cflags=$CFLAGS | 79 | old_cflags=$CFLAGS |
| 71 | CFLAGS="$CFLAGS -I$srcdir/include" | 80 | CFLAGS="$CFLAGS -I$srcdir/include" |