Add support for toxcore built with autotools.

autotools builds toxcore and toxav as separate libs. This adds support
for both ways of having toxcore installed.

Fixes #52.

Author: iphydf

Dockerfile

@@ -1,5 +1,5 @@
-FROM ubuntu:16.04
-MAINTAINER [email protected]
+FROM ubuntu:18.04
+LABEL maintainer="[email protected]"
 
 RUN apt-get update \
  && apt-get install --no-install-recommends -y ca-certificates cmake gcc g++ git libopus-dev libsodium-dev libvpx-dev pkg-config python-dev \
@@ -11,7 +11,7 @@ COPY pytox /build/pytox/
 
 WORKDIR /build
 RUN git clone https://github.com/TokTok/c-toxcore /build/c-toxcore \
- && cmake -B/build/c-toxcore/_build -H/build/c-toxcore -DBOOTSTRAP_DAEMON=OFF \
+ && cmake -B/build/c-toxcore/_build -H/build/c-toxcore -DBOOTSTRAP_DAEMON=OFF -DMUST_BUILD_TOXAV=ON \
  && make -C/build/c-toxcore/_build install -j"$(nproc)" \
  && python setup.py install \
  && rm -r /build/*

pytox/util.c

@@ -69,7 +69,9 @@ void PyStringUnicode_AsStringAndSize(PyObject* object, const char** str,
     Py_ssize_t* len)
 {
 #if PY_MAJOR_VERSION < 3
-    PyString_AsStringAndSize(object, str, len);
+    char *mstr;
+    PyString_AsStringAndSize(object, &mstr, len);
+    *str = mstr;
 #else
 # if PY_MINOR_VERSION == 2
     *str = (char *)PyUnicode_AS_DATA(object);

setup.py

@@ -1,13 +1,23 @@
 import os
+import shlex
+import subprocess  # nosec
 
 from distutils.core import setup, Extension
 
-def supports_av():
-    os.system("""
-    echo 'extern int toxav_new(); int (*x)() = &toxav_new; int main(){}' \\
-      | cc $LDFLAGS -xc - -ltoxcore \\
-      > /dev/null 2>&1
-    """)
+TOXAV_TEST_CODE = b"""
+extern int toxav_new();
+int (*x)() = &toxav_new;
+int main(){}
+"""
+
+def supports_av(libs):
+    ldflags = shlex.split(os.environ.get("LDFLAGS", ""))
+    proc = subprocess.Popen(  # nosec
+        ["cc", "-xc", "-"] + ldflags + libs,
+        stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    # Wait for process to terminate; ignore stdout/stderr.
+    proc.communicate(TOXAV_TEST_CODE)
+
     if os.path.exists("a.out"):
         os.remove("a.out")
         return True
@@ -30,9 +40,13 @@ def supports_av():
   "-fno-strict-aliasing",
 ]
 
-if supports_av():
+if supports_av(["-ltoxcore"]):
+    sources.append("pytox/av.c")
+    cflags.append("-DENABLE_AV")
+elif supports_av(["-ltoxcore", "-ltoxav"]):
     sources.append("pytox/av.c")
     cflags.append("-DENABLE_AV")
+    libraries.append("toxav")
 else:
     print("Warning: AV support not found, disabled.")