From f66c0c3d630aaff1c4d589bc4d884067f00b6529 Mon Sep 17 00:00:00 2001 From: Martin Johansson Date: Fri, 8 Aug 2014 08:37:03 +0200 Subject: [PATCH] Update Changelog and README --- ChangeLog | 5 +++++ README.md | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31ca353..b665ea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +0.2.15: +IPv6 dual-stack support (fmorgner). +CMake build system added alongside Autotools (fmorgner). +Update to use Protobuf-C 1.0.0. + 0.2.14: Add 'silent' option to channel configuration. Add 'position' option to channel configuration. diff --git a/README.md b/README.md index e451571..5f4a0d4 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,19 @@ Instructions for building from source 1. Requirements * [OpenSSL](http://www.openssl.org/) or [PolarSSL](http://polarssl.org/) library. For PolarSSL version 1.0.0 and above is required. * [libconfig](http://www.hyperrealm.com/libconfig/) - * [libprotoc-c](http://code.google.com/p/protobuf-c/) version 0.14 or 0.15 (use --disable-protoc option in its ./configure to build only the library). If you for some reason have to run an earlier version you need to recompile the protocol file `Mumble.proto` using the protobuf compiler for the corresponding version. - * [CMake](http://cmake.org) + * [libprotoc-c](http://code.google.com/p/protobuf-c/) version 1.0.0 (use --disable-protoc option in its ./configure to build only the library). If you for some reason have to run an earlier version you need to recompile the protocol file `Mumble.proto` using the protobuf compiler for the corresponding version. + * [CMake](http://cmake.org) (optional) -2. Build +2. Build - CMake * Create a build folder and cd into it * `cmake ../` to use default settings (polarssl, no test-cert and /dev/urandom as source for randomness). * `make` +2. Build - Autotools + * Run `./autogen.sh` + * Run `./configure` for default settings + * `make` + 3. Install * `make install` * Edit the umurmur.conf found in the 'etc' folder in the prefix (eg. /usr/local) you installed to. -- 2.30.2