Jon Siwek
0f854e201b
CMake 2.6 compatibility changes
...
Also removed Mac specific feature of rewriting optional library
install_names.
2010-11-30 13:21:30 -06:00
Robin Sommer
4cc2419616
Updating modules to master.
2010-11-27 20:39:35 -08:00
Robin Sommer
e47e8f7913
Updating modules to master versions.
2010-11-27 20:29:50 -08:00
Robin Sommer
deacce40e9
Merge remote branch 'origin/topic/robin/cleanup'
2010-11-27 20:10:05 -08:00
Robin Sommer
a2a7ee8679
Reinserting an accidentally deleted line.
2010-11-27 19:54:58 -08:00
Robin Sommer
c925bd43d8
Portability fix for Linux: this removes the need for linux-include.
2010-11-27 17:57:04 -08:00
Robin Sommer
121ff3965c
Merge remote branch 'origin/topic/robin/svn-merge' into devel
2010-11-27 17:31:26 -08:00
Robin Sommer
ffdd469e01
Merge remote branch 'origin/topic/robin/cleanup' into devel
2010-11-27 17:30:34 -08:00
Robin Sommer
49cd330110
Merge branch 'master' into devel
2010-11-27 17:25:09 -08:00
Robin Sommer
fabc59b2cd
Deleteing aux directories in preparation for merge
2010-11-27 17:25:09 -08:00
Robin Sommer
b0cb05de64
Merge with Subversion repository as of r7098.
2010-11-27 12:50:01 -08:00
Robin Sommer
e95adb8055
Another test commit.
2010-11-27 12:00:34 -08:00
Robin Sommer
fb76d7fe26
Removing the linux-include directory from the search path.
...
I think we don't need this anymore, but still need to verify that.
2010-11-26 15:32:24 -08:00
Robin Sommer
4714af9657
New Makefile wrapper in top-level directory.
...
This wrapper has a few standard target for convinience, mostly
forwarding them build/Makefile.
Also adding a .gitignore to let git skip the build/ directory.
2010-11-26 15:31:00 -08:00
Robin Sommer
2ee218fec8
Updating CHANGES and VERSION.
...
I'm starting a new version series, 1.6-dev, to not confuse these
with further commits to SVN.
2010-11-26 15:14:00 -08:00
Robin Sommer
3f0ce359a2
Cleanup of the Bro distribution.
...
* Deleting a lot of old stuff no longer maintained or needed.
* Updating some of the top-level instructions.
2010-11-26 13:45:54 -08:00
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
