Renaming config.h to bro-config.h.

A couple times now I had this conflicting with files of the same name
in other projects.

CMakeLists.txt

@@ -170,8 +170,8 @@ include(RequireCXX11)
 # Tell the plugin code that we're building as part of the main tree.
 set(BRO_PLUGIN_INTERNAL_BUILD true CACHE INTERNAL "" FORCE)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+               ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 

aux/plugins

@@ -1 +1 @@
-Subproject commit 98ad8a5b97f601a3ec9a773d87582438212b8290
+Subproject commit 9abf68366e91eaf5a30c82930a4e906006d6eea9

config.h.in

@@ -1,225 +0,0 @@
-/* Old libpcap versions (< 0.6.1) need defining pcap_freecode and
-   pcap_compile_nopcap */
-#cmakedefine DONT_HAVE_LIBPCAP_PCAP_FREECODE
-
-/* should explicitly declare socket() and friends */
-#cmakedefine DO_SOCK_DECL
-
-/* Define if you have the <getopt.h> header file. */
-#cmakedefine HAVE_GETOPT_H
-
-/* Define if you have the `getopt_long' function. */
-#cmakedefine HAVE_GETOPT_LONG
-
-/* We are on a Linux system */
-#cmakedefine HAVE_LINUX
-
-/* Define if you have the `mallinfo' function. */
-#cmakedefine HAVE_MALLINFO
-
-/* Define if you have the <memory.h> header file. */
-#cmakedefine HAVE_MEMORY_H
-
-/* Define if you have the <netinet/if_ether.h> header file. */
-#cmakedefine HAVE_NETINET_IF_ETHER_H
-
-/* Define if you have the <netinet/ip6.h> header file. */
-#cmakedefine HAVE_NETINET_IP6_H
-
-/* Define if you have the <net/ethernet.h> header file. */
-#cmakedefine HAVE_NET_ETHERNET_H
-
-/* Define if you have the <net/ethertypes.h> header file. */
-#cmakedefine HAVE_NET_ETHERTYPES_H
-
-/* have os-proto.h */
-#cmakedefine HAVE_OS_PROTO_H
-
-/* Define if you have the <pcap-int.h> header file. */
-#cmakedefine HAVE_PCAP_INT_H
-
-/* line editing & history powers */
-#cmakedefine HAVE_READLINE
-
-/* Define if you have the `sigaction' function, but not `sigset'. */
-#cmakedefine HAVE_SIGACTION
-
-/* Define if you have the `sigset' function. */
-#cmakedefine HAVE_SIGSET
-
-/* Define if you have the `strcasestr' function. */
-#cmakedefine HAVE_STRCASESTR
-
-/* Define if you have the `strerror' function. */
-#cmakedefine HAVE_STRERROR
-
-/* Define if you have the `strsep' function. */
-#cmakedefine HAVE_STRSEP
-
-/* Define if you have the <sys/ethernet.h> header file. */
-#cmakedefine HAVE_SYS_ETHERNET_H
-
-/* Some libpcap versions use an extra parameter (error) in pcap_compile_nopcap
-   */
-#cmakedefine LIBPCAP_PCAP_COMPILE_NOPCAP_HAS_ERROR_PARAMETER
-
-/* Include krb5.h */
-#cmakedefine NEED_KRB5_H
-
-/* Compatibility for Darwin */
-#cmakedefine NEED_NAMESER_COMPAT_H
-
-/* d2i_x509 uses const char** */
-#cmakedefine OPENSSL_D2I_X509_USES_CONST_CHAR
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE @RETSIGTYPE@
-
-/* signal function return value */
-#define RETSIGVAL @RETSIGVAL@
-
-/* have sin_len field in sockaddr_in */
-#cmakedefine SIN_LEN
-
-/* The size of `long int', as computed by sizeof. */
-#define SIZEOF_LONG_INT @SIZEOF_LONG_INT@
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
-
-/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P @SIZEOF_VOID_P@
-
-/* should we declare syslog() and openlog() */
-#cmakedefine SYSLOG_INT
-
-/* Define if you have <sys/time.h> */
-#cmakedefine HAVE_SYS_TIME_H
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#cmakedefine TIME_WITH_SYS_TIME
-
-/* GeoIP geographic lookup functionality */
-#cmakedefine USE_GEOIP
-
-/* Whether the found GeoIP API supports IPv6 Country Edition */
-#cmakedefine HAVE_GEOIP_COUNTRY_EDITION_V6
-
-/* Whether the found GeoIP API supports IPv6 City Edition */
-#cmakedefine HAVE_GEOIP_CITY_EDITION_REV0_V6
-
-/* Use Google's perftools */
-#cmakedefine USE_PERFTOOLS_DEBUG
-
-/* Analyze Mobile IPv6 traffic */
-#cmakedefine ENABLE_MOBILE_IPV6
-
-/* Use libCurl. */
-#cmakedefine USE_CURL
-
-/* Use the DataSeries writer. */
-#cmakedefine USE_DATASERIES
-
-/* Use the ElasticSearch writer. */
-#cmakedefine USE_ELASTICSEARCH
-
-/* Version number of package */
-#define VERSION "@VERSION@"
-
-/* whether words are stored with the most significant byte first */
-#cmakedefine WORDS_BIGENDIAN
-
-/* whether htonll/ntohll is defined in <arpa/inet.h> */
-#cmakedefine HAVE_BYTEORDER_64
-
-/* ultrix can't hack const */
-#cmakedefine NEED_ULTRIX_CONST_HACK
-#ifdef NEED_ULTRIX_CONST_HACK
-#define const
-#endif
-
-/* Define int32_t */
-#cmakedefine int32_t @int32_t@
-
-/* use sigset() instead of signal() */
-#ifdef HAVE_SIGSET
-#define signal sigset
-#endif
-
-/* define to int if socklen_t not available */
-#cmakedefine socklen_t @socklen_t@
-
-/* Define u_int16_t */
-#cmakedefine u_int16_t @u_int16_t@
-
-/* Define u_int32_t */
-#cmakedefine u_int32_t @u_int32_t@
-
-/* Define u_int8_t */
-#cmakedefine u_int8_t @u_int8_t@
-
-/* OpenBSD's bpf.h may not declare this data link type, but it's supposed to be
-   used consistently for the same purpose on all platforms. */
-#cmakedefine HAVE_DLT_PPP_SERIAL
-#ifndef HAVE_DLT_PPP_SERIAL
-#define DLT_PPP_SERIAL @DLT_PPP_SERIAL@
-#endif
-
-/* IPv6 Next Header values defined by RFC 3542 */
-#cmakedefine HAVE_IPPROTO_HOPOPTS
-#ifndef HAVE_IPPROTO_HOPOPTS
-#define IPPROTO_HOPOPTS 0
-#endif
-#cmakedefine HAVE_IPPROTO_IPV6
-#ifndef HAVE_IPPROTO_IPV6
-#define IPPROTO_IPV6 41
-#endif
-#cmakedefine HAVE_IPPROTO_IPV4
-#ifndef HAVE_IPPROTO_IPV4
-#define IPPROTO_IPV4 4
-#endif
-#cmakedefine HAVE_IPPROTO_ROUTING
-#ifndef HAVE_IPPROTO_ROUTING
-#define IPPROTO_ROUTING 43
-#endif
-#cmakedefine HAVE_IPPROTO_FRAGMENT
-#ifndef HAVE_IPPROTO_FRAGMENT
-#define IPPROTO_FRAGMENT 44
-#endif
-#cmakedefine HAVE_IPPROTO_ESP
-#ifndef HAVE_IPPROTO_ESP
-#define IPPROTO_ESP 50
-#endif
-#cmakedefine HAVE_IPPROTO_AH
-#ifndef HAVE_IPPROTO_AH
-#define IPPROTO_AH 51
-#endif
-#cmakedefine HAVE_IPPROTO_ICMPV6
-#ifndef HAVE_IPPROTO_ICMPV6
-#define IPPROTO_ICMPV6 58
-#endif
-#cmakedefine HAVE_IPPROTO_NONE
-#ifndef HAVE_IPPROTO_NONE
-#define IPPROTO_NONE 59
-#endif
-#cmakedefine HAVE_IPPROTO_DSTOPTS
-#ifndef HAVE_IPPROTO_DSTOPTS
-#define IPPROTO_DSTOPTS 60
-#endif
-
-/* IPv6 options structure defined by RFC 3542 */
-#cmakedefine HAVE_IP6_OPT
-
-/* Common IPv6 extension structure */
-#cmakedefine HAVE_IP6_EXT
-
-/* String with host architecture (e.g., "linux-x86_64") */
-#define HOST_ARCHITECTURE "@HOST_ARCHITECTURE@"
-
-/* String with extension of dynamic libraries (e.g., ".so") */
-#define DYNAMIC_PLUGIN_SUFFIX "@CMAKE_SHARED_MODULE_SUFFIX@"
-
-/* True if we're building outside of the main Bro source code tree. */
-#ifndef BRO_PLUGIN_INTERNAL_BUILD
-#define BRO_PLUGIN_INTERNAL_BUILD @BRO_PLUGIN_INTERNAL_BUILD@
-#endif

src/Attr.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Attr.h"
 #include "Expr.h"

src/Base64.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 #include "Base64.h"
 #include <math.h>
 

src/BroString.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <algorithm>
 #include <ctype.h>

src/CCL.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "CCL.h"
 #include "RE.h"

src/ChunkedIO.cc

@@ -9,7 +9,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 #include "ChunkedIO.h"
 #include "NetVar.h"
 #include "RemoteSerializer.h"

src/ChunkedIO.h

@@ -3,7 +3,7 @@
 #ifndef CHUNKEDIO_H
 #define CHUNKEDIO_H
 
-#include "config.h"
+#include "bro-config.h"
 #include "List.h"
 #include "util.h"
 #include "Flare.h"

src/CompHash.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "CompHash.h"
 #include "Val.h"

src/Conn.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 

src/DFA.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <openssl/md5.h>
 

src/DNS_Mgr.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <openssl/md5.h>
 #include <sys/types.h>

src/DbgBreakpoint.cc

@@ -1,6 +1,6 @@
 // Implementation of breakpoints.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <assert.h>
 

src/DbgHelp.cc

@@ -1,5 +1,5 @@
 // Bro Debugger Help
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Debug.h"

src/DbgWatch.cc

@@ -1,6 +1,6 @@
 // Implementation of watches
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Debug.h"
 #include "DbgWatch.h"

src/Debug.cc

@@ -1,6 +1,6 @@
 // Debugging support for Bro policy files.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdio.h>
 #include <stdarg.h>

src/DebugCmds.cc

@@ -1,7 +1,7 @@
 // Support routines to help deal with Bro debugging commands and
 // implementation of most commands.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <sys/types.h>
 

src/Desc.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 #include <errno.h>

src/Dict.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>

src/Discard.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Net.h"
 #include "Var.h"

src/EquivClass.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "EquivClass.h"
 

src/Event.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Event.h"
 #include "Func.h"

src/Expr.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Expr.h"
 #include "Event.h"

src/File.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <sys/types.h>
 #ifdef TIME_WITH_SYS_TIME

src/Frag.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "util.h"
 #include "Hash.h"

src/Frame.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Frame.h"
 #include "Stmt.h"

src/Func.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/Hash.cc

@@ -15,7 +15,7 @@
 // for the adversary to construct conflicts, though I do not know if
 // HMAC/MD5 is provably universal.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Hash.h"
 

src/ID.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "ID.h"
 #include "Expr.h"

src/IP.h

@@ -3,7 +3,7 @@
 #ifndef ip_h
 #define ip_h
 
-#include "config.h"
+#include "bro-config.h"
 #include "net_util.h"
 #include "IPAddr.h"
 #include "Reporter.h"

src/IntSet.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>

src/List.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/NFA.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "NFA.h"
 #include "EquivClass.h"

src/Net.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <sys/types.h>
 #ifdef TIME_WITH_SYS_TIME

src/NetVar.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Var.h"
 #include "NetVar.h"

src/Obj.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 

src/PacketDumper.cc

@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <assert.h>
 #include <stdlib.h>

src/PolicyFile.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/PriorityQueue.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/Queue.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <string.h>
 

src/RE.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 #include <utility>

src/Reassem.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Reassem.h"
 #include "Serializer.h"

src/RemoteSerializer.cc

@@ -159,7 +159,7 @@
 #include <strings.h>
 #include <stdarg.h>
 
-#include "config.h"
+#include "bro-config.h"
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>

src/Reporter.cc

@@ -4,7 +4,7 @@
 
 #include <syslog.h>
 
-#include "config.h"
+#include "bro-config.h"
 #include "Reporter.h"
 #include "Event.h"
 #include "NetVar.h"

src/Rule.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 
 #include "Rule.h"
 #include "RuleMatcher.h"

src/RuleAction.cc

@@ -1,7 +1,7 @@
 #include <string>
 using std::string;
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "RuleAction.h"
 #include "RuleMatcher.h"

src/RuleCondition.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 
 #include "RuleCondition.h"
 #include "analyzer/protocol/tcp/TCP.h"

src/RuleMatcher.cc

@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <functional>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "analyzer/Analyzer.h"
 #include "RuleMatcher.h"

src/Scope.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "ID.h"
 #include "Val.h"

src/SerialObj.h

@@ -37,7 +37,7 @@
 #include "DebugLogger.h"
 #include "Continuation.h"
 #include "SerialTypes.h"
-#include "config.h"
+#include "bro-config.h"
 
 #if SIZEOF_LONG_LONG < 8
 # error "Serialization requires that sizeof(long long) is at least 8. (Remove this message only if you know what you're doing.)"

src/Sessions.cc

@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <arpa/inet.h>
 

src/SmithWaterman.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <algorithm>
 #include <ctype.h>

src/Stmt.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Expr.h"
 #include "Event.h"

src/Tag.h

@@ -3,7 +3,7 @@
 #ifndef TAG_H
 #define TAG_H
 
-#include "config.h"
+#include "bro-config.h"
 #include "util.h"
 #include "Type.h"
 

src/Timer.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "util.h"
 #include "Timer.h"

src/TunnelEncapsulation.h

@@ -3,7 +3,7 @@
 #ifndef TUNNELS_H
 #define TUNNELS_H
 
-#include "config.h"
+#include "bro-config.h"
 #include "NetVar.h"
 #include "IPAddr.h"
 #include "Val.h"

src/Type.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Type.h"
 #include "Attr.h"

src/Val.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <sys/types.h>
 #include <sys/param.h>

src/Var.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Var.h"
 #include "Func.h"

src/analyzer/Component.h

@@ -7,7 +7,7 @@
 #include "plugin/Component.h"
 #include "plugin/TaggedComponent.h"
 
-#include "../config.h"
+#include "../bro-config.h"
 #include "../util.h"
 
 class Connection;

src/analyzer/Tag.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_TAG_H
 #define ANALYZER_TAG_H
 
-#include "config.h"
+#include "bro-config.h"
 #include "util.h"
 #include "../Tag.h"
 #include "plugin/TaggedComponent.h"

src/analyzer/protocol/arp/ARP.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_PROTOCOL_ARP_ARP_H
 #define ANALYZER_PROTOCOL_ARP_ARP_H
 
-#include "config.h"
+#include "bro-config.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

src/analyzer/protocol/backdoor/BackDoor.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "BackDoor.h"
 #include "Event.h"

src/analyzer/protocol/dce-rpc/DCE_RPC.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 #include <string>

src/analyzer/protocol/dns/DNS.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 #include <sys/types.h>

src/analyzer/protocol/finger/Finger.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 

src/analyzer/protocol/ftp/FTP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 

src/analyzer/protocol/gnutella/Gnutella.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 

src/analyzer/protocol/http/HTTP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 #include <math.h>

src/analyzer/protocol/icmp/ICMP.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Net.h"
 #include "NetVar.h"

src/analyzer/protocol/ident/Ident.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 

src/analyzer/protocol/interconn/InterConn.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "InterConn.h"
 #include "Event.h"

src/analyzer/protocol/login/Login.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 #include <stdlib.h>

src/analyzer/protocol/login/NVT.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 

src/analyzer/protocol/login/RSH.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "NetVar.h"
 #include "Event.h"

src/analyzer/protocol/login/Rlogin.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "NetVar.h"
 #include "Event.h"

src/analyzer/protocol/login/Telnet.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Telnet.h"
 #include "NVT.h"

src/analyzer/protocol/mime/MIME.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 
 #include "NetVar.h"
 #include "MIME.h"

src/analyzer/protocol/ncp/NCP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 #include <string>

src/analyzer/protocol/netbios/NetbiosSSN.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <ctype.h>
 

src/analyzer/protocol/ntp/NTP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "NetVar.h"
 #include "NTP.h"

src/analyzer/protocol/pop3/POP3.cc

@@ -1,7 +1,7 @@
 // This code contributed to Bro by Florian Schimandl, Hugh Dollman and
 // Robin Sommer.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 #include <iostream>

src/analyzer/protocol/rpc/NFS.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "NetVar.h"
 #include "XDR.h"

src/analyzer/protocol/rpc/Portmap.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "NetVar.h"
 #include "XDR.h"

src/analyzer/protocol/rpc/RPC.cc

@@ -4,7 +4,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "NetVar.h"
 #include "XDR.h"

src/analyzer/protocol/rpc/XDR.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "XDR.h"
 

src/analyzer/protocol/smtp/SMTP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 

src/analyzer/protocol/stepping-stone/SteppingStone.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <stdlib.h>
 

src/analyzer/protocol/udp/UDP.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "Net.h"
 #include "NetVar.h"

src/analyzer/protocol/zip/ZIP.h

@@ -3,7 +3,7 @@
 #ifndef ANALYZER_PROTOCOL_ZIP_ZIP_H
 #define ANALYZER_PROTOCOL_ZIP_ZIP_H
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "zlib.h"
 #include "analyzer/protocol/tcp/TCP.h"

src/bif_arg.cc

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "bro-config.h"
 
 #include <set>
 #include <string>

src/bsd-getopt-long.c

@@ -54,7 +54,7 @@
 
 #define IN_GETOPT_LONG_C 1
 
-#include <config.h>
+#include <bro-config.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>

src/file_analysis/Component.h

@@ -9,7 +9,7 @@
 
 #include "Val.h"
 
-#include "../config.h"
+#include "../bro-config.h"
 #include "../util.h"
 
 namespace file_analysis {

src/file_analysis/Tag.h

@@ -3,7 +3,7 @@
 #ifndef FILE_ANALYZER_TAG_H
 #define FILE_ANALYZER_TAG_H
 
-#include "config.h"
+#include "bro-config.h"
 #include "util.h"
 #include "../Tag.h"
 #include "plugin/TaggedComponent.h"

src/input/Tag.h

@@ -3,7 +3,7 @@
 #ifndef INPUT_TAG_H
 #define INPUT_TAG_H
 
-#include "config.h"
+#include "bro-config.h"
 #include "util.h"
 #include "../Tag.h"
 #include "plugin/TaggedComponent.h"

src/input/readers/sqlite/SQLite.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <fstream>
 #include <sstream>

src/input/readers/sqlite/SQLite.h

@@ -3,7 +3,7 @@
 #ifndef INPUT_READERS_SQLITE_H
 #define INPUT_READERS_SQLITE_H
 
-#include "config.h"
+#include "bro-config.h"
 
 #include <iostream>
 #include <vector>

src/iosource/BPF_Program.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "util.h"
 #include "BPF_Program.h"

src/iosource/PktDumper.cc

@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "config.h"
+#include "bro-config.h"
 
 #include "PktDumper.h"