plugins: config.h: move into src and rename to autoconf.h

While fixing files that include config.h, just remove the
include if possible.

diff --git a/.gitignore b/.gitignore
index b3828bfb92781faed9951c1af9d2f094b5a1b38b..4bdfb76e2f60caebac1e164ff7fbbc1404d100fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ Makefile
 m4/
 TAGS
 aclocal.m4
+autoconf.h
 autom4te.cache/
 build/*
 compile

diff --git a/configure.ac b/configure.ac
index b79efa200d74a9ec974827ca18edd9c1cbb270a5..4fc1b559fcf317bf8004c7018d410b17a3a9ad65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
     AC_INIT([suricata],[6.0.0-dev])
     m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes])
-    AC_CONFIG_HEADERS([config.h])
+    AC_CONFIG_HEADERS([src/autoconf.h])
     AC_CONFIG_SRCDIR([src/suricata.c])
     AC_CONFIG_MACRO_DIR(m4)
     AM_INIT_AUTOMAKE([tar-ustar subdir-objects])

diff --git a/src/runmode-af-packet.c b/src/runmode-af-packet.c
index ee50e06ffe06485bf571fde47506b641bc320844..09f47f6e8001ac1d3b975dd364f4556f3eed332c 100644 (file)
--- a/src/runmode-af-packet.c
+++ b/src/runmode-af-packet.c
@@ -31,7 +31,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "tm-threads.h"
 #include "conf.h"
 #include "runmodes.h"

diff --git a/src/runmode-netmap.c b/src/runmode-netmap.c
index 12636934a1fad747cda7af22d8e7f35e046307f8..27bb845ad18beed1bac26bba40552d04c454d9f0 100644 (file)
--- a/src/runmode-netmap.c
+++ b/src/runmode-netmap.c
@@ -31,7 +31,6 @@
 */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "tm-threads.h"
 #include "conf.h"
 #include "runmodes.h"

diff --git a/src/runmode-nflog.c b/src/runmode-nflog.c
index 56e242aed1467cd58a54f8451fe76f7c007c6525..48a9177ca2e44176d96cf193bd71ee2df565b792 100644 (file)
--- a/src/runmode-nflog.c
+++ b/src/runmode-nflog.c
@@ -21,7 +21,6 @@
  * \author Giuseppe Longo <giuseppelng@gmail.com>
  */
 #include "suricata-common.h"
-#include "config.h"
 #include "tm-threads.h"
 #include "conf.h"
 #include "runmodes.h"

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index 67c504cc4356ca61e1d442b398d704498445dd8e..a8d8c1ef739072c605d22ee47f85c1cdb2523c5a 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -21,7 +21,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "util-unittest.h"
 #include "runmode-unittests.h"
 

diff --git a/src/source-af-packet.c b/src/source-af-packet.c
index 4ef99dc341e9fb909f668fd3e2613fdc33eaf985..fdf7647d42db4224bc37de97b98abd3988313f4d 100644 (file)
--- a/src/source-af-packet.c
+++ b/src/source-af-packet.c
@@ -33,7 +33,6 @@
 #define PCAP_DONT_INCLUDE_PCAP_BPF_H 1
 #define SC_PCAP_DONT_INCLUDE_PCAP_H 1
 #include "suricata-common.h"
-#include "config.h"
 #include "suricata.h"
 #include "decode.h"
 #include "packet-queue.h"

diff --git a/src/source-nfq.c b/src/source-nfq.c
index e07c7c27f0e95795e56727e8017b6763ec71acf9..bb04aa322682da2c5bd7ed0ca185d6ab22b9f3c1 100644 (file)
--- a/src/source-nfq.c
+++ b/src/source-nfq.c
@@ -37,7 +37,6 @@
 #include "tmqh-packetpool.h"
 
 #include "conf.h"
-#include "config.h"
 #include "conf-yaml-loader.h"
 #include "source-nfq-prototypes.h"
 #include "action-globals.h"

diff --git a/src/source-pfring.h b/src/source-pfring.h
index da173cea794049d4161b6865b7a285e17b8909ec..31fb745c90315636dcd509b596b41a2800bcfb24 100644 (file)
--- a/src/source-pfring.h
+++ b/src/source-pfring.h
@@ -26,8 +26,6 @@
 
 #define PFRING_IFACE_NAME_LENGTH 48
 
-#include <config.h>
-
 typedef struct PfringThreadVars_ PfringThreadVars;
 
 /* PfringIfaceConfig flags */

diff --git a/src/suricata-common.h b/src/suricata-common.h
index e9d52a080e1402ad1354fe9a67aa585718bfcd72..a5468a096e6870b0ebbf2d67f1dce7bcb6bf88c1 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -37,7 +37,7 @@
 #define __USE_GNU
 
 #if HAVE_CONFIG_H
-#include <config.h>
+#include <autoconf.h>
 #endif
 
 #ifndef CLS

diff --git a/src/suricata.c b/src/suricata.c
index e771009e3f0f384519c0f785f9982b9c48a06867..335710cacbb9103cbfde221d85152533dd88cc84 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -22,7 +22,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 
 #if HAVE_GETOPT_H
 #include <getopt.h>

diff --git a/src/tests/fuzz/onefile.c b/src/tests/fuzz/onefile.c
index e5d34ab182dec23c611a168b9dfe0b203349e587..ef86d921af890644e48379bb2d431345415acb74 100644 (file)
--- a/src/tests/fuzz/onefile.c
+++ b/src/tests/fuzz/onefile.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "config.h"
+#include "autoconf.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
 

diff --git a/src/threads.h b/src/threads.h
index bca76d7365c221802c66198bac8f10afe91647ec..535622f6a7291dd5467c5c423614260c987a68a8 100644 (file)
--- a/src/threads.h
+++ b/src/threads.h
@@ -27,10 +27,6 @@
 #ifndef __THREADS_H__
 #define __THREADS_H__
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #if defined(TLS_C11)
 #define thread_local _Thread_local
 #elif defined(TLS_GNU)

diff --git a/src/util-bpf.c b/src/util-bpf.c
index a61ec7f23ce3fd64510dbb933c1fa4c7e13bca59..934aca9ad2d6e1eabc9eb260186140b758d54a7a 100644 (file)
--- a/src/util-bpf.c
+++ b/src/util-bpf.c
@@ -23,7 +23,6 @@
 
 
 #include "suricata-common.h"
-#include "config.h"
 #include "suricata.h"
 #include "util-bpf.h"
 

diff --git a/src/util-conf.c b/src/util-conf.c
index a5fc0e2c95653b743d75e8b65db7abc9197dc926..a135b4b3884ae44a728585d5124658741e054fa0 100644 (file)
--- a/src/util-conf.c
+++ b/src/util-conf.c
@@ -23,7 +23,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "conf.h"
 #include "runmodes.h"
 #include "util-conf.h"

diff --git a/src/util-ebpf.c b/src/util-ebpf.c
index 958cf75f96da5dc35950e4a15216b685e03149a6..d7c0484c927eafea1fbeccc73ddb905e06f1743d 100644 (file)
--- a/src/util-ebpf.c
+++ b/src/util-ebpf.c
@@ -54,7 +54,7 @@
 #include <bpf/libbpf.h>
 #include <bpf/bpf.h>
 #include <net/if.h>
-#include "config.h"
+#include "autoconf.h"
 
 #define BPF_MAP_MAX_COUNT 16
 

diff --git a/src/util-host-info.c b/src/util-host-info.c
index f481c41a6a773a52217468cc11e8e107de8cb8e2..0f02d98190bd4fd21ffcfeb6f4871b987f5f3d34 100644 (file)
--- a/src/util-host-info.c
+++ b/src/util-host-info.c
@@ -25,7 +25,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "util-host-info.h"
 #include "util-byte.h"
 

diff --git a/src/util-misc.c b/src/util-misc.c
index 761960b928ee1a1def35ad8d4a238bedb7bd7a2b..2190d5aae25a544291f21b6950e24180e32ee62d 100644 (file)
--- a/src/util-misc.c
+++ b/src/util-misc.c
@@ -22,7 +22,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "suricata.h"
 #include "util-byte.h"
 #include "util-debug.h"

diff --git a/src/util-runmodes.c b/src/util-runmodes.c
index 889a459ca669c9d92918214545b0968347fc8f50..c002395df0440dc7d15ffc730677b7783ddc098c 100644 (file)
--- a/src/util-runmodes.c
+++ b/src/util-runmodes.c
@@ -25,7 +25,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "tm-threads.h"
 #include "conf.h"
 #include "runmodes.h"

diff --git a/src/util-running-modes.c b/src/util-running-modes.c
index 42c91027643ea48d7a30c595245ed94e4939b453..b4f52ea6da23a78b5bc22df697576eac6fb0a101 100644 (file)
--- a/src/util-running-modes.c
+++ b/src/util-running-modes.c
@@ -21,7 +21,6 @@
  */
 
 #include "suricata-common.h"
-#include "config.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer.h"
 #include "app-layer-parser.h"