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.

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 \
 # We use make instead of RUN $MAKE here, because the autotools build will only
 # ever run natively on the Linux container, never on a Windows cross compilation
 # docker instance or an OSX machine.
-make -j`nproc`
-
-# This doesn't currently work on Travis, because the autotools build is broken.
-# It does not look up libsodium by pkg-config, so without the --with flags it
-# won't find it. We don't care that much about distcheck at this point, but we
-# do care whether it configures/builds at all, which is exercised by the make
-# call above. Tests are executed by the cmake build.
-echo "*** make distcheck currently fails; see https://github.com/TokTok/toxcore/blob/master/other/travis/autotools-script#L16 ***"
-make distcheck -j`nproc` \
-  || echo "*** make distcheck has failed as expected; don't be alarmed ***"
+make distcheck -j`nproc` -k