diff --git a/INSTALL.md b/INSTALL.md index 62db863..e9dab58 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -28,7 +28,7 @@ #### OS X Notes Using [Homebrew](http://brew.sh): ``` -brew install openal-soft freealut libconfig python3 +brew install openal-soft freealut libconfig brew install --HEAD https://raw.githubusercontent.com/Tox/homebrew-tox/master/Formula/libtoxcore.rb brew install libnotify ``` @@ -56,7 +56,8 @@ Run `make doc` in the build directory after editing the asciidoc files to regene * `DISABLE_AV=1` → build toxic without audio call support * `DISABLE_SOUND_NOTIFY=1` → build toxic without sound notifications support * `DISABLE_DESKTOP_NOTIFY=1` → build toxic without desktop notifications support - * `DISABLE_PYTHON=1` → build toxic without Python scripting support +* Features excluded from the default build must be explicitly enabled using special variables: + * `ENABLE_PYTHON=1` → build toxic with Python scripting support #### Packaging * For packaging purpose, you can use `DESTDIR=""` to specify a directory where to store installed files diff --git a/cfg/checks/check_features.mk b/cfg/checks/check_features.mk index aa66ad1..aa5990f 100644 --- a/cfg/checks/check_features.mk +++ b/cfg/checks/check_features.mk @@ -41,7 +41,7 @@ ifneq ($(QR_PNG), disabled) endif # Check if we want build Python scripting support -PYTHON = $(shell if [ -z "$(DISABLE_PYTHON)" ] || [ "$(DISABLE_PYTHON)" = "0" ] ; then echo enabled ; else echo disabled ; fi) +PYTHON = $(shell if [ -z "$(ENABLE_PYTHON)" ] || [ "$(ENABLE_PYTHON)" = "0" ] ; then echo disabled ; else echo enabled ; fi) ifneq ($(PYTHON), disabled) -include $(CHECKS_DIR)/python.mk endif diff --git a/cfg/targets/help.mk b/cfg/targets/help.mk index 1d09520..7a1f136 100644 --- a/cfg/targets/help.mk +++ b/cfg/targets/help.mk @@ -15,7 +15,7 @@ help: @echo " DISABLE_SOUND_NOTIFY: Set to \"1\" to force building without sound notification support" @echo " DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support" @echo " DISABLE_QRPNG: Set to \"1\" to force building without QR exported as PNG support" - @echo " DISABLE_PYTHON: Set to \"1\" to force building without Python scripting support" + @echo " ENABLE_PYTHON: Set to \"1\" to enable building with Python scripting support" @echo " USER_CFLAGS: Add custom flags to default CFLAGS" @echo " USER_LDFLAGS: Add custom flags to default LDFLAGS" @echo " PREFIX: Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"