Bunch of random changes

1 files changed, 0 insertions, 93 deletions

diff --git a/configure.ac b/configure.ac
index f82f0a19..8650e197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,6 @@ BUILD_DHT_BOOTSTRAP_DAEMON="no"
 BUILD_NTOX="no"
 BUILD_TESTS="yes"
 BUILD_AV="yes"
-BUILD_PHONE="no"
 BUILD_TESTING="yes"
 
 LOGGING="no"
@@ -135,23 +134,11 @@ AC_ARG_WITH(logger-path,
 
 PKG_PROG_PKG_CONFIG
 
-AC_ARG_ENABLE([phone],
-    [AC_HELP_STRING([--enable-phone], [build test phone (default: auto)]) ],
-    [
-        if test "x$enableval" = "xno"; then
-            BUILD_PHONE="no"
-        elif test "x$enableval" = "xyes"; then
-            BUILD_PHONE="yes"
-        fi
-    ]
-)
-
 AC_ARG_ENABLE([av],
     [AC_HELP_STRING([--disable-av], [build AV support libraries (default: auto)]) ],
     [
         if test "x$enableval" = "xno"; then
             BUILD_AV="no"
-            BUILD_PHONE="no"
         elif test "x$enableval" = "xyes"; then
             BUILD_AV="yes"
         fi
@@ -447,94 +434,16 @@ if test "x$BUILD_AV" = "xyes"; then
         [
             AC_MSG_WARN([disabling AV support: required pthread library not found])
             BUILD_AV="no"
-            BUILD_PHONE="no"
-        ]
-    )
-fi
-
-if test "x$BUILD_PHONE" = "xyes"; then
-    PKG_CHECK_MODULES([AVFORMAT], [libavformat],
-        [],
-        [
-            AC_MSG_WARN([disabling phone $AVFORMAT_PKG_ERRORS])
-            BUILD_PHONE="no"
         ]
     )
 fi
 
-if test "x$BUILD_PHONE" = "xyes"; then
-    PKG_CHECK_MODULES([AVCODEC], [libavcodec],
-        [],
-        [
-            AC_MSG_WARN([disabling phone $AVCODEC_PKG_ERRORS])
-            BUILD_PHONE="no"
-        ]
-    )
-fi
-
-if test "x$BUILD_PHONE" = "xyes"; then
-    PKG_CHECK_MODULES([AVUTIL], [libavutil],
-        [],
-        [
-            AC_MSG_WARN([disabling phone $AVUTIL_PKG_ERRORS])
-            BUILD_PHONE="no"
-        ]
-    )
-fi
-
-if test "x$BUILD_PHONE" = "xyes"; then
-    PKG_CHECK_MODULES([AVDEVICE], [libavdevice],
-        [],
-        [
-            AC_MSG_WARN([disabling phone $AVDEVICE_PKG_ERRORS])
-            BUILD_PHONE="no"
-        ]
-    )
-fi
-
-if test "x$BUILD_PHONE" = "xyes"; then
-    PKG_CHECK_MODULES([SWSCALE], [libswscale],
-        [],
-        [
-            AC_MSG_WARN([disabling phone $SWSCALE_PKG_ERRORS])
-            BUILD_PHONE="no"
-        ]
-    )
-fi
-
-if test "x$BUILD_PHONE" = "xyes"; then
-    PKG_CHECK_MODULES([SDL], [sdl],
-        [],
-        [
-            AC_MSG_WARN([disabling phone $SDL_PKG_ERRORS])
-            BUILD_PHONE="no"
-        ]
-    )
-fi
-
-if test "x$BUILD_PHONE" = "xyes"; then
-    PKG_CHECK_MODULES([OPENAL], [openal],
-        [],
-        [
-            AC_MSG_WARN([disabling phone $OPENAL_PKG_ERRORS])
-            BUILD_PHONE="no"
-        ]
-    )
-fi
-
-#If all dependencies are here add support video define for phone.c
-if test "x$BUILD_PHONE" == "xyes"; then
-    #Set FFMpeg define
-    AC_DEFINE([TOX_FFMPEG], [1], [Support video])
-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"
-            BUILD_PHONE="no"
         ]
     )
 fi
@@ -545,7 +454,6 @@ if test "x$BUILD_AV" = "xyes"; then
         [
             AC_MSG_WARN([disabling AV support $VPX_PKG_ERRORS])
             BUILD_AV="no"
-            BUILD_PHONE="no"
         ]
     )
 fi
@@ -719,7 +627,6 @@ AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" =
 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_PHONE, test "x$BUILD_PHONE" = "xyes")
 AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes")
 AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes")