chore: Remove config.h.

This aligns the autotools build with the cmake build, which doesn't have
a config.h file. It also removes the ambiguity of config.h and
other/bootstrap_daemon/src/config.h.

auto_tests/TCP_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 

auto_tests/bootstrap_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 
 #include "../testing/misc_tools.h"

auto_tests/conference_av_test.c

@@ -1,10 +1,6 @@
 /* Auto Tests: Conferences AV.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

auto_tests/conference_double_invite_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdbool.h>
 #include <stdint.h>
 

auto_tests/conference_invite_merge_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>

auto_tests/conference_peer_nick_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdbool.h>
 #include <stdint.h>
 

auto_tests/conference_simple_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 

auto_tests/conference_test.c

@@ -1,10 +1,6 @@
 /* Auto Tests: Conferences.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

auto_tests/conference_two_test.c

@@ -3,10 +3,6 @@
 // This test triggers a different code path than if we only allocate a single
 // conference. This is the simplest test possible that triggers it.
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "../testing/misc_tools.h"
 #include "../toxcore/tox.h"
 #include "check_compat.h"

auto_tests/crypto_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/dht_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "check_compat.h"
 #include "../testing/misc_tools.h"
 #include "../toxcore/crypto_core.h"

auto_tests/encryptsave_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/file_saving_test.c

@@ -8,10 +8,6 @@
  * works correctly.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

auto_tests/file_transfer_test.c

@@ -1,10 +1,6 @@
 /* File transfer test.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/friend_connection_test.c

@@ -5,10 +5,6 @@
  * features.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 
 typedef struct State {

auto_tests/friend_request_test.c

@@ -1,10 +1,6 @@
 /* Tests that we can add friends.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/invalid_tcp_proxy_test.c

@@ -1,10 +1,6 @@
 // Test to make sure that when UDP is disabled, and we set an invalid proxy,
 // i.e. one that doesn't run a proxy server, then we don't get any connection.
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 
 #include "../testing/misc_tools.h"

auto_tests/invalid_udp_proxy_test.c

@@ -1,10 +1,6 @@
 // Test that if UDP is enabled, and a proxy is provided that does not support
 // UDP proxying, we disable UDP.
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 
 #include "../testing/misc_tools.h"

auto_tests/lan_discovery_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <string.h>
 

auto_tests/lossless_packet_test.c

@@ -1,10 +1,6 @@
 /* Tests that we can send lossless packets.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/lossy_packet_test.c

@@ -1,10 +1,6 @@
 /* Tests that we can send lossy packets.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/messenger_test.c

@@ -10,10 +10,6 @@
  *      checking that status changes are received, messages can be sent, etc.
  *      All of that is done in a separate test, with two local clients running. */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <string.h>
 
 #ifdef VANILLA_NACL

auto_tests/network_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 

auto_tests/onion_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 

auto_tests/overflow_recvq_test.c

@@ -1,10 +1,6 @@
 /* Try to overflow the net_crypto packet buffer.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 
 typedef struct State {

auto_tests/overflow_sendq_test.c

@@ -1,10 +1,6 @@
 /* Try to overflow the net_crypto packet buffer.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 
 typedef struct State {

auto_tests/reconnect_test.c

@@ -5,10 +5,6 @@
  * re-established when the instance is resumed.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

auto_tests/save_friend_test.c

@@ -1,10 +1,6 @@
 /* Auto Tests: Save and load friends.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/save_load_test.c

@@ -1,10 +1,6 @@
 /* Tests that we can save and load Tox data.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/send_message_test.c

@@ -1,10 +1,6 @@
 /* Tests that we can send messages to friends.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>

auto_tests/set_name_test.c

@@ -1,10 +1,6 @@
 /* Tests that we can set our name.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/set_status_message_test.c

@@ -1,10 +1,6 @@
 /* Tests that we can set our status message
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/skeleton_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 
 #include "../testing/misc_tools.h"

auto_tests/tcp_relay_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 
 #include "../testing/misc_tools.h"

auto_tests/tox_many_tcp_test.c

@@ -1,10 +1,6 @@
 /* Auto Tests: Many TCP.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/tox_many_test.c

@@ -1,10 +1,6 @@
 /* Auto Tests: Many clients.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/tox_one_test.c

@@ -1,10 +1,6 @@
 /* Auto Tests: One instance.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 

auto_tests/tox_strncasecmp_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 

auto_tests/toxav_basic_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

auto_tests/toxav_many_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

auto_tests/typing_test.c

@@ -1,10 +1,6 @@
 /* Tests that our typing notifications work.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>

auto_tests/version_test.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "../toxcore/tox.h"
 #include "check_compat.h"
 

configure.ac

@@ -5,7 +5,6 @@ AC_PREREQ([2.65])
 AC_INIT([tox], [0.2.13])
 AC_CONFIG_AUX_DIR(configure_aux)
 AC_CONFIG_SRCDIR([toxcore/net_crypto.c])
-AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.10 -Wall subdir-objects tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])

testing/misc_tools.c

@@ -6,10 +6,6 @@
 /*
  * Miscellaneous functions and data structures for doing random things.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifndef _POSIX_C_SOURCE
 // For nanosleep().
 #define _POSIX_C_SOURCE 200112L

toxcore/crypto_core.c

@@ -3,12 +3,6 @@
  * Copyright © 2013 Tox project.
  */
 
-//!TOKSTYLE-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-//!TOKSTYLE+
-
 /*
  * Functions for the core crypto.
  *

toxcore/crypto_core_mem.c

@@ -16,11 +16,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-//!TOKSTYLE-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-//!TOKSTYLE+
 
 // For explicit_bzero.
 #ifndef _DEFAULT_SOURCE

toxcore/network.c

@@ -2,11 +2,6 @@
  * Copyright © 2016-2018 The TokTok team.
  * Copyright © 2013 Tox project.
  */
-//!TOKSTYLE-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-//!TOKSTYLE+
 
 /*
  * Functions for the core networking.

toxencryptsave/toxencryptsave.c

@@ -6,12 +6,6 @@
 /*
  * Batch encryption functions.
  */
-//!TOKSTYLE-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-//!TOKSTYLE+
-
 #include "../toxcore/ccompat.h"
 #include "../toxcore/crypto_core.h"
 #include "defines.h"