Revision c886edfb

b/Makefile
168 168

  
169 169
$(qapi-dir)/test-qapi-types.c: $(qapi-dir)/test-qapi-types.h
170 170
$(qapi-dir)/test-qapi-types.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
171
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
171
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
172 172
$(qapi-dir)/test-qapi-visit.c: $(qapi-dir)/test-qapi-visit.h
173 173
$(qapi-dir)/test-qapi-visit.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py
174
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
174
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
175 175
$(qapi-dir)/test-qmp-commands.h: $(qapi-dir)/test-qmp-marshal.c
176 176
$(qapi-dir)/test-qmp-marshal.c: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py
177
	    $(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
177
	    $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
178 178

  
179 179
$(qapi-dir)/qga-qapi-types.c: $(qapi-dir)/qga-qapi-types.h
180 180
$(qapi-dir)/qga-qapi-types.h: $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py
181
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
181
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
182 182
$(qapi-dir)/qga-qapi-visit.c: $(qapi-dir)/qga-qapi-visit.h
183 183
$(qapi-dir)/qga-qapi-visit.h: $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py
184
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
184
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
185 185
$(qapi-dir)/qga-qmp-marshal.c: $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py
186
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
186
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
187 187

  
188 188
test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
189 189
test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
b/configure
475 475

  
476 476
: ${make=${MAKE-make}}
477 477
: ${install=${INSTALL-install}}
478
: ${python=${PYTHON-python}}
478 479

  
479 480
if test "$mingw32" = "yes" ; then
480 481
  EXESUF=".exe"
......
516 517
  ;;
517 518
  --install=*) install="$optarg"
518 519
  ;;
520
  --python=*) python="$optarg"
521
  ;;
519 522
  --extra-cflags=*)
520 523
  ;;
521 524
  --extra-ldflags=*)
......
924 927
echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"
925 928
echo "  --make=MAKE              use specified make [$make]"
926 929
echo "  --install=INSTALL        use specified install [$install]"
930
echo "  --python=PYTHON          use specified python [$python]"
927 931
echo "  --static                 enable static build [$static]"
928 932
echo "  --mandir=PATH            install man pages in PATH"
929 933
echo "  --datadir=PATH           install firmware in PATH"
......
1084 1088
  fi
1085 1089
fi
1086 1090

  
1091
if has $python; then
1092
  :
1093
else
1094
  echo "Python not found. Use --python=/path/to/python"
1095
  exit 1
1096
fi
1097

  
1087 1098
if test -z "$target_list" ; then
1088 1099
    target_list="$default_target_list"
1089 1100
else
......
2591 2602
echo "LDFLAGS           $LDFLAGS"
2592 2603
echo "make              $make"
2593 2604
echo "install           $install"
2605
echo "python            $python"
2594 2606
echo "host CPU          $cpu"
2595 2607
echo "host big endian   $bigendian"
2596 2608
echo "target list       $target_list"
......
3003 3015
echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
3004 3016
echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
3005 3017
echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
3018
echo "PYTHON=$python" >> $config_host_mak
3006 3019
echo "CC=$cc" >> $config_host_mak
3007 3020
echo "CC_I386=$cc_i386" >> $config_host_mak
3008 3021
echo "HOST_CC=$host_cc" >> $config_host_mak

Also available in: Unified diff