2 files changed, 25 insertions, 0 deletions

diff --git a/other/travis/autotools-script b/other/travis/autotools-script
index d97b15b3..d47dc717 100755
--- a/other/travis/autotools-script
+++ b/other/travis/autotools-script
@@ -1,5 +1,16 @@
 #!/bin/sh
 
+if perl -e '
+    use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK);
+
+    socket(S, PF_INET6, SOCK_STREAM, 0) || exit 1;
+    bind(S, pack_sockaddr_in6(0, IN6ADDR_LOOPBACK)) || exit 1;
+'; then
+    IPV6_FLAG="--enable-ipv6"
+else
+    IPV6_FLAG="--disable-ipv6"
+fi
+
 # Build toxcore with some custom flags here. Note that this does *not* run the
 # tests, so any flags passed here are irrelevant to testing. This only checks
 # that we can build toxcore with the specified flags. Tests run with default
@@ -12,6 +23,7 @@
   --enable-daemon \
   --enable-logging \
   --enable-ntox \
+  $IPV6_FLAG \
   --with-log-level=TRACE
 
 # We use make instead of RUN $MAKE here, because the autotools build will only
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index 4f5a58ea..df1462de 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -22,6 +22,18 @@ for i in `seq 0 7`; do
   RUN rm -rf $BUILD_DIR
 done
 
+if perl -e '
+    use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK);
+
+    socket(S, PF_INET6, SOCK_STREAM, 0) || exit 1;
+    bind(S, pack_sockaddr_in6(0, IN6ADDR_LOOPBACK)) || exit 1;
+'; then
+    USE_IPV6=yes
+else
+    USE_IPV6=no
+fi
+
+
 # Build toxcore and run tests.
 RUN $CMAKE                                      \
   -B$BUILD_DIR                                  \
@@ -32,6 +44,7 @@ RUN $CMAKE                                      \
   -DSTRICT_ABI=ON                               \
   -DTEST_TIMEOUT_SECONDS=120                    \
   -DTRACE=ON                                    \
+  -DUSE_IPV6=$USE_IPV6                          \
   $CMAKE_EXTRA_FLAGS
 
 export CTEST_OUTPUT_ON_FAILURE=1