diff --git a/INSTALL b/INSTALL index c4f17753c6..9fd880c242 100644 --- a/INSTALL +++ b/INSTALL @@ -1,17 +1,17 @@ Prerequisites ============= -Bro-aux relies on the following libraries and tools, which need to be installed -before you begin with the installation: +Bro relies on the following libraries and tools, which need to be installed +before you begin: * Libpcap headers and libraries Network traffic capture library - * Flex + * Flex (Fast Lexical Analyzer) Flex is already installed on most systems, so with luck you can skip having to install it yourself. - * Bison + * Bison (GNU Parser Generator) This comes with many systems, but if you get errors compiling parse.y, you will need to install it. @@ -34,7 +34,8 @@ before you begin with the installation: CMake is a cross-platform, open-source build system, typically not installed by default. See http://www.cmake.org for more information regarding CMake and the installation steps below for - how to use it to build this distribution. + how to use it to build this distribution. CMake generates native + Makefiles that depend on GNU Make by default. Bro can also make uses of some optional libraries if they are found at installation time: @@ -60,11 +61,11 @@ To build and install into /usr/local/bro: > make install This will perform an out-of-source build into the build directory using the -default build options and then install binaries into /usr/local/bro/bin +default build options and then install binaries into /usr/local/bro/bin. You can specify a different installation directory with - > ./configure --prefix=. + > ./configure --prefix= Run "./configure --help" for more options. diff --git a/aux/binpac b/aux/binpac index 7ebfe11ce2..05ed35d7db 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit 7ebfe11ce241560bc7450ebb71eb077cf1d80783 +Subproject commit 05ed35d7dbc540055927ece0751a8dc0662a1b22 diff --git a/aux/bro-aux b/aux/bro-aux index 34049cd5d9..ebb6d6b0fc 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 34049cd5d9b150fa72c35772931f2fc9d754ee08 +Subproject commit ebb6d6b0fc305b8203b36e49732ae65107e45dae diff --git a/aux/broccoli b/aux/broccoli index bdec0ca091..ee2d7ac30b 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit bdec0ca0911e4f40afd747dfc95e47609428f6f4 +Subproject commit ee2d7ac30b41058111a18b2e9fced768ed603b36 diff --git a/aux/broctl b/aux/broctl index 5b73867d1d..0d3985722b 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 5b73867d1d22e5b9bae164d7595a3cdc48359f60 +Subproject commit 0d3985722b7019e29511b9d3a9abdef7c13912b2