diff --git a/Makefile b/Makefile index 20f40ee9..acbf86b8 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ LDFLAGS += -lrt -ldl -lpthread # Binaries/Scripts # -MKBUNDLE = $(CURDIR)/support/mkbundle +MKBUNDLE = $(PYTHON) $(CURDIR)/support/mkbundle # # Debug/Output diff --git a/configure b/configure index d84198aa..140ff8f4 100755 --- a/configure +++ b/configure @@ -39,7 +39,7 @@ parse_args $* # # Compiler # -check_cc || die +check_cc || die 'No C compiler found' check_cc_header execinfo check_cc_option mmx check_cc_option sse2 @@ -47,9 +47,10 @@ check_cc_option sse2 # # Python # -check_py || die -check_py_import zlib pyzlib || die -check_py_import tarfile pytar || die +check_py || die 'No PYTHON binary found' +check_py_import zlib pyzlib || die "Python module missing: zlib" +check_py_import tarfile pytar || die "Python module missing: tarfile" +# Note: the above could/should be made optional # # SSL @@ -99,7 +100,7 @@ fi if enabled linuxdvb && enabled dvbscan; then if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then echo -n "Fetching dvb-scan files... " - ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)" + ${PYTHON} ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)" echo "done" fi fi diff --git a/support/configure.inc b/support/configure.inc index 7e61d35e..581ade4d 100644 --- a/support/configure.inc +++ b/support/configure.inc @@ -183,7 +183,7 @@ function parse_args *dir|prefix) eval "$opt=$val" ;; - cc|arch|cpu|platform) + cc|arch|cpu|platform|python) eval "`toupper $opt`=$val" ;; enable-*) @@ -337,6 +337,10 @@ function print_config echo -e " Build for arch:${TAB}${ARCH}" echo "" + echo "Binaries:" + echo -e " Using PYTHON:${TAB}${PYTHON}" + echo "" + # Options echo "Options:" for opt in ${OPTIONS[*]}; do @@ -383,7 +387,9 @@ function write_config ROOTDIR ?= ${ROOTDIR} BUILDDIR ?= ${ROOTDIR}/build.${PLATFORM} OSENV ?= ${OSENV} -ARCH = ${ARCH} +ARCH ?= ${ARCH} +CC ?= ${CC} +PYTHON ?= ${PYTHON} CFLAGS += ${CFLAGS} LDFLAGS += ${LDFLAGS} prefix = ${prefix}