Commit graph

44 commits

Author SHA1 Message Date
Jon Siwek
abd92115f4 Add alternative way to set BROPATH for running bro from build/ dir.
Adds two extra shell scripts, one to handle either the c-shell
or bourne-shell syntax for setting environment variables, that can
be sourced in order to set the BROPATH directly in the current
shell/environment in a way that's compatible with running bro
from the build/ directory.
2011-03-02 14:14:07 -06:00
Jon Siwek
4da36217b7 Fix for the --with-binpac configure option
Compiling from existing sources no longer overrides this option.
2011-01-24 11:02:16 -06:00
Jon Siwek
6ea8def6f6 MacPorts & Fink paths now prepended to default search prefixes 2011-01-19 14:57:06 -06:00
Jon Siwek
8d4f487add Changes to CMake logic for binary packaging
- pre/post install scripts now track configuration files that may
  be clobbered on package install/upgrade through the
  INSTALLED_CONFIG_FILES CMake variable and attempts to make backups
  when the distribution's file differs from the existing file.
2011-01-13 21:58:25 -06:00
Jon Siwek
5d1f1e9edb Fix package configuration macro returning from sub-project too early 2011-01-11 19:30:31 -06:00
Jon Siwek
911230b037 Add warning when building and installing are done by different users 2011-01-11 15:59:25 -06:00
Jon Siwek
fa07bcd233 Changes to allow source packaging via CPack
- Refactored all packaging related stuff into a single CMake module
- Build should no longer fail when optional sources (e.g. broctl)
  do not exist in the source directory, instead a warning is issued
- Additional configure options to change packaging behavior
2011-01-05 12:05:39 -06:00
Jon Siwek
e89182dcc0 Changes to make running bro from build dir easier.
The 'bro-path-dev' script is configured at make time to echo the
right paths to policy files.
2010-12-06 11:30:52 -06:00
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
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
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
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
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
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
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
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
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
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
1b9c041d29 Removed unused configure checks (leftover from autotools). 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
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
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
cff67b04cd Cleaned up some things with compiler flags and definitions. 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
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
Jon Siwek
2bd8f42c15 Changes to make OpenSSL a requirement.
Preprocessor conditionals dependent on definition of USE_OPENSSL have been
straightened out.
2010-11-17 20:38:33 -06:00
Jon Siwek
02808b0a92 Re-format/comment build options as we decide which ones are still relevant. 2010-11-17 20:38:32 -06:00
Jon Siwek
9d941c097c Moved custom CMake includes up one directory. 2010-11-17 20:38:32 -06:00
Jon Siwek
d1e0008999 Minimal CMake build of Bro done. 2010-11-17 20:38:32 -06:00