From d6fdf16520b6f242935ca95eeb739ec9a8eaa14c Mon Sep 17 00:00:00 2001
From: Eniz Vukovic <eniz_vukovic@hotmail.com>
Date: Sat, 10 Oct 2015 23:54:23 +0200
Subject: New Adaptive BR algorithm, cleanups and fixes

---
 configure.ac | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 2b7f3a2e..639fc20c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ BUILD_TESTS="yes"
 BUILD_AV="yes"
 BUILD_TESTING="yes"
 
-LOGGING="no"
+TOX_LOGGER="no"
 LOGGING_OUTNAM="libtoxcore.log"
 
 NCURSES_FOUND="no"
@@ -82,13 +82,13 @@ AC_ARG_ENABLE([randombytes-stir],
     ]
 )
 
-AC_ARG_ENABLE([log],
-    [AC_HELP_STRING([--enable-log], [enable logging (default: auto)]) ],
+AC_ARG_ENABLE([logger],
+    [AC_HELP_STRING([--enable-logger], [enable logging (default: auto)]) ],
     [
         if test "x$enableval" = "xyes"; then
-            LOGGING="yes"
+            TOX_LOGGER="yes"
             
-            AC_DEFINE([LOGGING], [], [If logging enabled])
+            AC_DEFINE([TOX_LOGGER], [], [If logging enabled])
             AC_DEFINE([LOGGER_LEVEL], [LOG_DEBUG], [LOG_LEVEL value])
             AC_DEFINE_UNQUOTED([LOGGER_OUTPUT_FILE], ["$LOGGING_OUTNAM"], [Output of logger])
         fi
@@ -99,7 +99,7 @@ AC_ARG_WITH(log-level,
     AC_HELP_STRING([--with-log-level=LEVEL],
                    [Logger levels: TRACE; DEBUG; INFO; WARNING; ERROR ]),
     [
-        if test "x$LOGGING" = "xno"; then
+        if test "x$TOX_LOGGER" = "xno"; then
             AC_MSG_WARN([Logging disabled!])
         else
             if test "x$withval" = "xTRACE"; then
@@ -127,7 +127,7 @@ AC_ARG_WITH(log-path,
     AC_HELP_STRING([--with-log-path=DIR],
                    [Path of logger output]),
     [
-        if test "x$LOGGING" = "xno"; then
+        if test "x$TOX_LOGGER" = "xno"; then
             AC_MSG_WARN([Logging disabled!])
         else
             AC_DEFINE_UNQUOTED([LOGGER_OUTPUT_FILE], ["$withval""/""$LOGGING_OUTNAM"], [Output of logger])
-- 
cgit v1.2.3


From 363771ea3c13e11dd2bf6f4fb6aed724652fdabb Mon Sep 17 00:00:00 2001
From: Eniz Vukovic <eniz_vukovic@hotmail.com>
Date: Tue, 13 Oct 2015 00:35:46 +0200
Subject: Fix typo and change logger config option

---
 configure.ac            | 4 ++--
 other/apidsl/toxav.in.h | 2 +-
 toxav/toxav.h           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 639fc20c..01680ac6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,8 +82,8 @@ AC_ARG_ENABLE([randombytes-stir],
     ]
 )
 
-AC_ARG_ENABLE([logger],
-    [AC_HELP_STRING([--enable-logger], [enable logging (default: auto)]) ],
+AC_ARG_ENABLE([logging],
+    [AC_HELP_STRING([--enable-logging], [enable logging (default: auto)]) ],
     [
         if test "x$enableval" = "xyes"; then
             TOX_LOGGER="yes"
diff --git a/other/apidsl/toxav.in.h b/other/apidsl/toxav.in.h
index 20efa1d1..592c3def 100644
--- a/other/apidsl/toxav.in.h
+++ b/other/apidsl/toxav.in.h
@@ -389,7 +389,7 @@ enum class CALL_CONTROL {
     /**
      * Request that the friend stops sending video. Regardless of the friend's
      * compliance, this will cause the ${event video.receive_frame} event to stop being
-     * triggered on receiving an video frame from the friend.
+     * triggered on receiving a video frame from the friend.
      */
     HIDE_VIDEO,
     /**
diff --git a/toxav/toxav.h b/toxav/toxav.h
index b36debb1..859fe9af 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -431,7 +431,7 @@ typedef enum TOXAV_CALL_CONTROL {
   /**
    * Request that the friend stops sending video. Regardless of the friend's
    * compliance, this will cause the video_receive_frame event to stop being
-   * triggered on receiving an video frame from the friend.
+   * triggered on receiving a video frame from the friend.
    */
   TOXAV_CALL_CONTROL_HIDE_VIDEO,
   /**
-- 
cgit v1.2.3