Commit graph

10 commits

Author SHA1 Message Date
Jon Siwek
1442af616f Merge branch 'master' into topic/cmake-port
Resolved Conflicts:
	CMakeLists.txt
	INSTALL
	aux/binpac
	aux/bro-aux
	aux/broccoli
	aux/broctl
	cmake/CheckTypes.cmake
	cmake/FindBIND.cmake
	cmake/OSSpecific.cmake
	cmake/OpenSSLTests.cmake
	cmake/PCAPTests.cmake
	src/CMakeLists.txt
2010-11-30 15:07:29 -06:00
Robin Sommer
a2a7ee8679 Reinserting an accidentally deleted line. 2010-11-27 19:54:58 -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
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
Jon Siwek
7a10ccfb89 Revisions to INSTALL directions
And updated submodules to newer commits
2010-11-17 20:38:35 -06:00
Jon Siwek
02e17e949b Added configure script to wrap cmake functionality 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
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
Robin Sommer
61757ac78b Initial import of svn+ssh:://svn.icir.org/bro/trunk/bro as of r7088 2010-09-27 20:42:30 -07:00