1 files changed, 116 insertions, 4 deletions

diff --git a/configure.ac b/configure.ac
index 81f15eca..dba051c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,11 @@ AM_INIT_AUTOMAKE([1.10 -Wall subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
 
+EXTRA_LT_LDFLAGS=
+
 LIBTOXCORE_LT_VERSION=0:0:0
+LIBTOXMSI_LT_VERSION=0:0:0
+LIBTOXRTP_LT_VERSION=0:0:0
 dnl
 dnl            current:revision:age
 dnl
@@ -19,7 +23,13 @@ dnl revision: increment if source code has changed, set to zero if current is
 dnl           incremented
 dnl age:      increment if interfaces have been added, set to zero if
 dnl           interfaces have been removed or changed
-EXTRA_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
+TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
+TOXMSI_LT_LDFLAGS="-version-info $LIBTOXMSI_LT_VERSION"
+TOXRTP_LT_LDFLAGS="-version-info $LIBTOXMSI_LT_VERSION"
+
+AC_SUBST(TOXCORE_LT_LDFLAGS)
+AC_SUBST(TOXMSI_LT_LDFLAGS)
+AC_SUBST(TOXRTP_LT_LDFLAGS)
 
 if test "x${prefix}" = "xNONE"; then
     prefix="${ac_default_prefix}"
@@ -28,6 +38,7 @@ fi
 BUILD_DHT_BOOTSTRAP_DAEMON="yes"
 BUILD_NTOX="yes"
 BUILD_TESTS="yes"
+BUILD_AV="yes"
 BUILD_TESTING="yes"
 
 NCURSES_FOUND="no"
@@ -46,6 +57,19 @@ AC_ARG_ENABLE([nacl],
     ]
 )
 
+PKG_PROG_PKG_CONFIG
+
+AC_ARG_ENABLE([av],
+    [AC_HELP_STRING([--disable-av], [build AV support libraries (default: auto)]) ],
+    [
+        if test "x$enableval" = "xno"; then
+            BUILD_AV="no"
+        elif test "x$enableval" = "xyes"; then
+            BUILD_AV="yes"
+        fi
+    ]
+)
+
 AC_ARG_ENABLE([tests],
     [AC_HELP_STRING([--disable-tests], [build unit tests (default: auto)]) ],
     [
@@ -314,8 +338,95 @@ AC_TYPE_UINT8_T
 AC_FUNC_FORK
 AC_CHECK_FUNCS([gettimeofday memset socket strchr malloc])
 
-# pkg-config based tests
-PKG_PROG_PKG_CONFIG
+if test "x$BUILD_AV" = "xyes"; then
+    AX_PTHREAD(
+        [],
+        [
+            AC_MSG_WARN([disabling AV support: required pthread library not found])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([AVFORMAT], [libavformat],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $AVFORMAT_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([AVCODEC], [libavcodec],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $AVCODEC_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([AVUTIL], [libavutil],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $AVUTIL_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([AVDEVICE], [libavdevice],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $AVDEVICE_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([SWSCALE], [libswscale],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $SWSCALE_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([SDL], [sdl],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $SDL_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([OPENAL], [openal],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $OPENAL_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([OPUS], [opus],
+        [],
+        [
+            AC_MSG_WARN([disabling AV support $OPUS_PKG_ERRORS])
+            BUILD_AV="no"
+        ]
+    )
+fi
 
 if test -n "$PKG_CONFIG"; then
     if test "x$BUILD_TESTS" = "xyes"; then
@@ -351,7 +462,7 @@ if test -n "$PKG_CONFIG"; then
             ])
     fi
 else
-    AC_MSG_WARN([pkg-config was not found on your system])
+    AC_MSG_WARN([pkg-config was not found on your system, will search for libraries manually])
 fi
 
 if (test "x$BUILD_NTOX" = "xyes") && (test "x$NCURSES_FOUND" != "xyes"); then
@@ -474,6 +585,7 @@ fi
 AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" = "xyes")
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
 AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes")
+AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes")
 AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes")
 
 AC_CONFIG_FILES([Makefile