Robin Sommer
818f5f4c0a
aux/bro-aux was still pointing to the topic branch.
2010-11-26 12:07:50 -08:00
Robin Sommer
702e2ec0f1
Updating submodules.
2010-11-24 21:32:52 -08:00
Robin Sommer
610d081c4b
Merge with origin/topic/cmake-port.
...
Needed to readd the broctl/broccoli/binpac submodules manually, as
git seemed to get confused by the existing directories.
2010-11-24 21:02:08 -08:00
Robin Sommer
c1768336c4
Removing aux/{broctl,binpac,broccoli} in preparation for merge.
2010-11-24 20:33:34 -08:00
Jon Siwek
5964da43fb
Better way to get source dir of configure script
...
And updated submodules
2010-11-22 21:19:02 -06:00
Jon Siwek
8901b30236
Enable broccoli, broctl, aux tools by default
...
The configure wrapper now only provides --disable options for each
aux. package.
2010-11-22 19:42:37 -06:00
Jon Siwek
426b940b4c
Updated broctl submodule
2010-11-20 22:43:48 -06:00
Jon Siwek
1b7c6b469e
Fix to allow tilde ($HOME) in install prefix.
2010-11-20 20:40:54 -06:00
Jon Siwek
3b459c368c
Added uninstall target
2010-11-20 12:18:54 -06:00
Jon Siwek
f3f395e30e
Update to broctl submodule
2010-11-19 13:28:52 -06:00
Jon Siwek
4982c02eba
Source package excludes .git and generate only TGZ
2010-11-19 11:59:22 -06:00
Jon Siwek
0878e9b8f1
Configure wrapper fixes for Broctl
...
Made order of --enable-broctl and --enable-cluster not matter.
--enable-cluster always enables Broctl in cluster configuration even if
the other option is used.
--enable-broctl will enable Broctl in standalone configuration only if
--enable-cluster isn't present.
2010-11-19 11:28:43 -06:00
Jon Siwek
552177c33a
CPack's source package now ignores the build dir
2010-11-19 10:45:46 -06:00
Jon Siwek
e4d12ea1d3
Changed default CMAKE_BUILD_TYPE to RelWithDebInfo
...
The --enable-debug option of the configure wrapper changes it to Debug.
Removed --enable-release option of the configure wrapper.
Updated submodules
2010-11-18 11:34:29 -06:00
Jon Siwek
d9def9e7d5
Updated broccoli submodule
2010-11-17 21:08:44 -06:00
Jon Siwek
30c047274f
Updated submodules
2010-11-17 20:38:36 -06:00
Jon Siwek
efce9dbfe2
Customizable error messages for missing prereqs.
...
Adds the FindRequiredPackage() macro that wraps the functionality
of the standard find_package() macro.
2010-11-17 20:38:35 -06:00
Jon Siwek
ffdf9e7474
Configure wrapper checks if source directory moved
2010-11-17 20:38:35 -06:00
Jon Siwek
6b356d464d
Update broccoli submodule
2010-11-17 20:38:35 -06:00
Jon Siwek
90be6b5e7d
Policy dir follows prefix if not explicitly set
2010-11-17 20:38:35 -06:00
Jon Siwek
15063b73fe
Build summary output adjusted.
...
By default broccoli and broctl would not explicitly show as "false"
(meaning disabled).
2010-11-17 20:38:35 -06:00
Jon Siwek
7a10ccfb89
Revisions to INSTALL directions
...
And updated submodules to newer commits
2010-11-17 20:38:35 -06:00
Jon Siwek
1b553d7ebf
Updated broctl submodule
2010-11-17 20:38:35 -06:00
Jon Siwek
3c7c068685
Renaming of DATADIR CMake variable.
...
To POLICYDIR since that's more clear. Also decided that restricting
it to a subdirectory of prefix isn't much use as an option, so went
back to having it be an absolute path.
2010-11-17 20:38:35 -06:00
Jon Siwek
7737572aab
Allow building auxilliary projects along with Bro.
...
BinPAC, Broccoli, Broctl, and Bro auxilliary tools are included
as git submodules.
2010-11-17 20:38:35 -06:00
Jon Siwek
0221c121fc
Updated submodules
2010-11-17 20:38:35 -06:00
Jon Siwek
c147710319
configure now writes directly to CMakeCache.txt
...
The intermediate BuildOptions.cmake file is no longer needed.
2010-11-17 20:38:35 -06:00
Jon Siwek
7eb92d6a2d
Style/comment enhancements.
2010-11-17 20:38:35 -06:00
Jon Siwek
b891379e06
Updated submodules.
2010-11-17 20:38:35 -06:00
Jon Siwek
737ce489a9
Added CPack packaging and fix Linux compatibility.
...
- configure wrapper had bash syntax some places; replaced w/ sh syntax
- Added FindOpenSSL module. The one that ships with CMake does not
allow for specifying a non-standard location.
- datadir configure option changed to be relative to prefix. This
simplifies the packaging from having to consider absolute paths.
- Added macro for changing install_name of shared libs that need to
ship with precompiled Bro for OS X. This is only the optional
libmagic and libGeoIP for now.
2010-11-17 20:38:35 -06:00
Jon Siwek
521c30e9ba
Fix FindBIND to be compatible w/ Linux & FreeBSD.
2010-11-17 20:38:35 -06:00
Jon Siwek
5755d59f1d
Typo led to error on case sensitive filesystems
2010-11-17 20:38:35 -06:00
Jon Siwek
105d00b9b8
Fix ambiguous call to abs().
...
Observed on FreeBSD build that the compiler would emit an error claiming
Val(abs(val.int_val), TYPE_COUNT)
is ambiguous because it can't make a choice between cstdlib's
"int abs(int)" or "long abs(long)" signatures. And actually, since
we now always use 64 bit integers for bro_int_t, we can use
"long long llabs(long long)".
2010-11-17 20:38:35 -06:00
Jon Siwek
bea41f5c73
Fix preprocessor logic for ethernet header choice.
...
Checking for netinet/if_ether.h and netinet/ip6.h depended
on including other headers first; observed when trying to
build on FreeBSD.
ARP.h was changed to conform to CMake style config.h generation.
Definitions are not set to 1 like with autotools, so we have
to check for definition, not just that the value is true.
2010-11-17 20:38:35 -06:00
Jon Siwek
43cbe2a9fc
Added configure option to build aux. tools.
...
Also updated submodules to fix small bug in CMake module path.
2010-11-17 20:38:34 -06:00
Jon Siwek
884d6c406f
Create empty 'site' policy directory on install
2010-11-17 20:38:34 -06:00
Jon Siwek
30ad035fce
Updated submodules.
2010-11-17 20:38:34 -06:00
Jon Siwek
02e17e949b
Added configure script to wrap cmake functionality
2010-11-17 20:38:34 -06:00
Jon Siwek
c1e0b41275
Make DATADIR (policy file install path) absolute.
2010-11-17 20:38:34 -06:00
Jon Siwek
5765c93bd0
Changes to add install target.
2010-11-17 20:38:34 -06:00
Jon Siwek
4ffdf892ec
Updated binpac submodule.
2010-11-17 20:38:34 -06:00
Jon Siwek
1b9c041d29
Removed unused configure checks (leftover from autotools).
2010-11-17 20:38:34 -06:00
Jon Siwek
b0d78eab40
Removed ClamAV support.
2010-11-17 20:38:34 -06:00
Jon Siwek
049bda7078
Modified .pac file dependencies.
2010-11-17 20:38:34 -06:00
Jon Siwek
afb5bd8ce7
Moved the logic to build BinPAC locally to FindBinPAC module.
2010-11-17 20:38:34 -06:00
Jon Siwek
47de996544
Make disabled optional features show as false in build summary.
2010-11-17 20:38:34 -06:00
Jon Siwek
e22ec206ca
Added support for optional google-perftools.
2010-11-17 20:38:34 -06:00
Jon Siwek
5ea4189011
Added support for optional libGeoIP.
2010-11-17 20:38:34 -06:00
Jon Siwek
bc1a25da37
Added forgotten libz and libmagic include dirs to the search path.
...
This allows them to be located in a non-standard location.
2010-11-17 20:38:34 -06:00
Jon Siwek
d043aba54d
Added support for optional libz.
2010-11-17 20:38:34 -06:00
