Merge remote-tracking branch 'origin/topic/johanna/os-x-openssl'

* origin/topic/johanna/os-x-openssl:
  Update installation instructions to add os-x openssl dependency.

BIT-1506 #merged
This commit is contained in:
Robin Sommer 2015-12-18 11:27:10 -08:00
commit 677f1172d9

View file

@ -82,11 +82,14 @@ To install the required dependencies, you can use:
"Preferences..." -> "Downloads" menus to install the "Command Line Tools" "Preferences..." -> "Downloads" menus to install the "Command Line Tools"
component). component).
OS X comes with all required dependencies except for CMake_, SWIG_, and CAF. OS X comes with all required dependencies except for CMake_, SWIG_,
Distributions of these dependencies can likely be obtained from your OpenSSL, and CAF. (OpenSSL used to be part of OS X versions 10.10
preferred Mac OS X package management system (e.g. Homebrew_, MacPorts_, and older, for which it does not need to be installed manually. It
or Fink_). Specifically for Homebrew, the ``cmake``, ``swig``, was removed in OS X 10.11). Distributions of these dependencies can
and ``caf`` packages provide the required dependencies. likely be obtained from your preferred Mac OS X package management
system (e.g. Homebrew_, MacPorts_, or Fink_). Specifically for
Homebrew, the ``cmake``, ``swig``, ``openssl`` and ``caf`` packages
provide the required dependencies.
Optional Dependencies Optional Dependencies
@ -126,14 +129,8 @@ platforms for binary releases and for installation instructions.
Linux based binary installations are usually performed by adding Linux based binary installations are usually performed by adding
information about the Bro packages to the respective system packaging information about the Bro packages to the respective system packaging
tool. Then the usual system utilities such as ``apt``, ``yum`` tool. Then the usual system utilities such as ``apt``, ``dnf``, ``yum``,
or ``zypper`` are used to perform the installation. By default, or ``zypper`` are used to perform the installation.
installations of binary packages will go into ``/opt/bro``.
* MacOS Disk Image with Installer
Just open the ``Bro-*.dmg`` and then run the ``.pkg`` installer.
Everything installed by the package will go into ``/opt/bro``.
The primary install prefix for binary packages is ``/opt/bro``. The primary install prefix for binary packages is ``/opt/bro``.