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
Jon Siwek
88c77fdc25
Added optional libmagic support.
2010-11-17 20:38:34 -06:00
Jon Siwek
a4231c5725
Removed Endace DAG support.
2010-11-17 20:38:34 -06:00
Jon Siwek
71df50c0a5
Fixed "Found sed" messages from displaying on every cmake.
2010-11-17 20:38:33 -06:00
Jon Siwek
79596c03d5
Added logic to find installed BinPAC or build from source.
2010-11-17 20:38:33 -06:00
Jon Siwek
f176cb905a
Updated submodules
2010-11-17 20:38:33 -06:00
Jon Siwek
27d80462da
Fix for make_dbg_constants target always being out of date.
...
It would cause the perl script to run with every `make` even if it's not
really necessary.
2010-11-17 20:38:33 -06:00
Jon Siwek
05d2c89618
Change from CMake add_definitions() to compiler flag variables.
...
May be easier for sub-projects to override flags this way.
2010-11-17 20:38:33 -06:00
Jon Siwek
626e23b39b
Cleaned up bison flags a little.
...
Verbose output should now be removed with `make clean`.
2010-11-17 20:38:33 -06:00
Jon Siwek
dab003dda6
Fixed bug in FindBISON CMake module.
...
Compile flags will no longer pile up in subsequent calls to
bison_target().
2010-11-17 20:38:33 -06:00
Jon Siwek
cff67b04cd
Cleaned up some things with compiler flags and definitions.
2010-11-17 20:38:33 -06:00
Jon Siwek
3eb9b91fc2
Updated submodules
2010-11-17 20:38:33 -06:00
Jon Siwek
8cd35b7116
Use default FindPerl CMake module and better documented sed dependency
2010-11-17 20:38:33 -06:00
Jon Siwek
4e4a18f3af
First pass at cleaning up documented dependencies.
2010-11-17 20:38:33 -06:00
Jon Siwek
87a74912b7
Minor changes to custom CMake find_package() modules.
...
- Fix typo in FindPCAP
- FindBIND is now more explicit when looking for include dir
2010-11-17 20:38:33 -06:00
Jon Siwek
1542a49fff
Simplified FindPCAP CMake module.
2010-11-17 20:38:33 -06:00
Jon Siwek
570ee48cd9
Removing the --disable-nbdns config option.
...
- Asynchronous DNS resolver support assumed by default
- HAVE_ASYNC_DNS, HAVE_NB_DNS, and USE_NB_DNS preprocessor definitions
removed
- In the process, I added FindBIND and CheckNameserCompat CMake modules
2010-11-17 20:38:33 -06:00
