diff options
author | iphydf <iphydf@users.noreply.github.com> | 2016-08-17 18:05:27 +0100 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2016-08-17 21:28:44 +0100 |
commit | 2fc54498709f7721fc749383389f3d274e26058a (patch) | |
tree | 467641b23f016bbe246092a0abc383e4ae45d2d0 /other/travis/autotools-script | |
parent | c603c8c9e79fb01aab40701c568570b496adaeb2 (diff) |
Try searching for libsodium with pkg-config in ./configure.
If libsodium can't be found with PKG_CHECK_MODULES, try AC_CHECK_LIB. If that
also fails, abort configure. If a user passes --with-libsodium-libs explicitly,
that overrides the pkg-config found location.
Diffstat (limited to 'other/travis/autotools-script')
-rwxr-xr-x | other/travis/autotools-script | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/other/travis/autotools-script b/other/travis/autotools-script index 735229fb..18cb2d26 100755 --- a/other/travis/autotools-script +++ b/other/travis/autotools-script | |||
@@ -15,13 +15,4 @@ RUN ./configure \ | |||
15 | # We use make instead of RUN $MAKE here, because the autotools build will only | 15 | # We use make instead of RUN $MAKE here, because the autotools build will only |
16 | # ever run natively on the Linux container, never on a Windows cross compilation | 16 | # ever run natively on the Linux container, never on a Windows cross compilation |
17 | # docker instance or an OSX machine. | 17 | # docker instance or an OSX machine. |
18 | make -j`nproc` | 18 | make distcheck -j`nproc` -k |
19 | |||
20 | # This doesn't currently work on Travis, because the autotools build is broken. | ||
21 | # It does not look up libsodium by pkg-config, so without the --with flags it | ||
22 | # won't find it. We don't care that much about distcheck at this point, but we | ||
23 | # do care whether it configures/builds at all, which is exercised by the make | ||
24 | # call above. Tests are executed by the cmake build. | ||
25 | echo "*** make distcheck currently fails; see https://github.com/TokTok/toxcore/blob/master/other/travis/autotools-script#L16 ***" | ||
26 | make distcheck -j`nproc` \ | ||
27 | || echo "*** make distcheck has failed as expected; don't be alarmed ***" | ||