diff options
| author | derwinlu <derwinlu+git@gmail.com> | 2015-06-30 06:58:14 +0200 |
|---|---|---|
| committer | derwinlu <derwinlu+git@gmail.com> | 2015-06-30 08:33:45 +0200 |
| commit | d09360cd21c31323646b6df5eaf274ac845bff07 (patch) | |
| tree | 6892a5148885d2b0ef16aac627f628f2a6a1b6b5 /Makefile | |
| parent | b9e39a8df9e22622ee582945c472521afea3f3aa (diff) | |
| download | rabbitmq-server-git-d09360cd21c31323646b6df5eaf274ac845bff07.tar.gz | |
add detection for python2.7
In python2.7 simplejson has been removed from stdlib and replaced
with json. codegen.py already has a fallback import in place so no
changes needed there.
This way python2.7 can be detected if installed and rabbitmq-server
can be compiled even if python is bound to python3.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -29,6 +29,9 @@ USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes) PYTHON=python else +ifeq ($(shell python2.7 -c 'import json' 2>/dev/null && echo yes),yes) +PYTHON=python2.7 +else ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes) PYTHON=python2.6 else @@ -40,6 +43,7 @@ PYTHON=python endif endif endif +endif BASIC_PLT=basic.plt RABBIT_PLT=rabbit.plt |